v118

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

.gitignore

@@ -148,3 +148,5 @@ fabric.properties
 
 /app/app-release.apk
 Automation_settings.xml
+/app/googlePlayFlavor/
+/.idea/deploymentTargetDropDown.xml

.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\jens\.android\avd\Android_11.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-09-24T23:07:53.935197300Z" />
-  </component>
-</project>

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 113
-        versionName "1.6.43"
+        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": 113,
-      "versionName": "1.6.43-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,32 +129,42 @@
         <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.AlarmListener" />
+        <receiver android:name=".receivers.DateTimeListener" />
         <receiver android:name=".receivers.ConnectivityReceiver" />
         <receiver android:name=".receivers.TimeZoneListener" />
 
+        <receiver
+            android:name=".DeviceAdmin"
+            android:description="@string/app_name"
+            android:label="@string/app_name"
+            android:permission= "android.permission.BIND_DEVICE_ADMIN" >
+            <meta-data
+                android:name="android.app.device_admin"
+                android:resource="@xml/policies" />
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name=".ActivityManageRule" />
         <activity android:name=".ActivityManageActionTriggerUrl" />
         <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">
@@ -186,6 +204,7 @@
         <activity android:name=".ActivityManageActionStartActivity" />
         <activity android:name=".ActivityManageTriggerNfc" />
         <activity android:name=".ActivityManageActionSpeakText" />
+        <activity android:name=".ActivityManageActionPlaySound" />
         <activity android:name=".ActivityManageTriggerBluetooth" />
         <activity android:name=".ActivityMainProfiles" />
         <activity android:name=".ActivityManageProfile" />
@@ -204,6 +223,7 @@
 
         </service>
 
+        <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/apkFlavor/java/com/jens/automation2/receivers/ActivityDetectionReceiver.java

@@ -291,10 +291,10 @@ public class ActivityDetectionReceiver extends IntentService implements Automati
 			 			 * and some activities are hierarchical (ON_FOOT is a generalization of WALKING and RUNNING).
 						*/
 
-						ArrayList<Rule> allRulesWithActivityDetection = Rule.findRuleCandidatesByActivityDetection();
+						ArrayList<Rule> allRulesWithActivityDetection = Rule.findRuleCandidates(Trigger_Enum.activityDetection);
 						for(int i=0; i<allRulesWithActivityDetection.size(); i++)
 						{
-							if(allRulesWithActivityDetection.get(i).applies(Miscellaneous.getAnyContext()))
+							if(allRulesWithActivityDetection.get(i).getsGreenLight(Miscellaneous.getAnyContext()))
 								allRulesWithActivityDetection.get(i).activate(AutomationService.getInstance(), false);
 						}
 					}

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,32 +127,42 @@
         <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.AlarmListener" />
+        <receiver android:name=".receivers.DateTimeListener" />
         <receiver android:name=".receivers.ConnectivityReceiver" />
         <receiver android:name=".receivers.TimeZoneListener" />
 
+        <receiver
+            android:name=".DeviceAdmin"
+            android:description="@string/app_name"
+            android:label="@string/app_name"
+            android:permission= "android.permission.BIND_DEVICE_ADMIN" >
+            <meta-data
+                android:name="android.app.device_admin"
+                android:resource="@xml/policies" />
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name=".ActivityManageRule" />
         <activity android:name=".ActivityManageActionTriggerUrl" />
         <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">
@@ -170,6 +189,7 @@
 			</intent-filter>
             -->
 
+
             <!--
                  <meta-data
 		        android:name="android.nfc.action.TECH_DISCOVERED"
@@ -203,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/googlePlayFlavor/AndroidManifest.xml

@@ -50,6 +50,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" />
@@ -63,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"
@@ -112,32 +115,42 @@
         <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.AlarmListener" />
+        <receiver android:name=".receivers.DateTimeListener" />
         <receiver android:name=".receivers.ConnectivityReceiver" />
         <receiver android:name=".receivers.TimeZoneListener" />
 
+        <receiver
+            android:name=".DeviceAdmin"
+            android:description="@string/app_name"
+            android:label="@string/app_name"
+            android:permission= "android.permission.BIND_DEVICE_ADMIN" >
+            <meta-data
+                android:name="android.app.device_admin"
+                android:resource="@xml/policies" />
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name=".ActivityManageRule" />
         <activity android:name=".ActivityManageActionTriggerUrl" />
         <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">
@@ -198,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/receivers/ActivityDetectionReceiver.java

@@ -301,7 +301,7 @@ public class ActivityDetectionReceiver extends IntentService implements Automati
 			 			 * and some activities are hierarchical (ON_FOOT is a generalization of WALKING and RUNNING).
 						*/
 
-						ArrayList<Rule> allRulesWithActivityDetection = Rule.findRuleCandidatesByActivityDetection();
+						ArrayList<Rule> allRulesWithActivityDetection = Rule.findRuleCandidates(Trigger_Enum.activityDetection);
 						for(int i=0; i<allRulesWithActivityDetection.size(); i++)
 						{
 							if(allRulesWithActivityDetection.get(i).applies(Miscellaneous.getAnyContext()))

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

@@ -2,9 +2,11 @@ package com.jens.automation2;
 
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.util.Log;
 import android.widget.Toast;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.HttpGet;
 
 import java.util.ArrayList;
@@ -13,8 +15,10 @@ import java.util.Locale;
 
 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 {	
@@ -22,6 +26,7 @@ public class Action
 								setBluetooth,
 								setUsbTethering,
 								setWifiTethering,
+								setBluetoothTethering,
 								setDisplayRotation,
 								turnWifiOn,turnWifiOff,
 								turnBluetoothOn,turnBluetoothOff,
@@ -29,17 +34,20 @@ public class Action
 								changeSoundProfile,
 								turnUsbTetheringOn,turnUsbTetheringOff,
 								turnWifiTetheringOn,turnWifiTetheringOff,
-								enableScreenRotation, disableScreenRotation,
+								enableScreenRotation,disableScreenRotation,
 								startOtherActivity,
 								waitBeforeNextAction,
-								wakeupDevice,
+								turnScreenOnOrOff,
 								setAirplaneMode,
 								setDataConnection,
 								speakText,
 								playMusic,
+								controlMediaPlayback,
 								setScreenBrightness,
 								playSound,
 								vibrate,
+								createNotification,
+								closeNotification,
 								sendTextMessage;
 								
 								public String getFullName(Context context)
@@ -52,6 +60,8 @@ public class Action
 											return context.getResources().getString(R.string.actionSetBluetooth);
 										case setWifiTethering:
 											return context.getResources().getString(R.string.actionSetWifiTethering);
+										case setBluetoothTethering:
+											return context.getResources().getString(R.string.actionSetBluetoothTethering);
 										case setUsbTethering:
 											return context.getResources().getString(R.string.actionSetUsbTethering);
 										case setDisplayRotation:
@@ -84,8 +94,8 @@ public class Action
 											return context.getResources().getString(R.string.startOtherActivity);
 										case waitBeforeNextAction:
 											return context.getResources().getString(R.string.waitBeforeNextAction);
-										case wakeupDevice:
-											return context.getResources().getString(R.string.wakeupDevice);
+										case turnScreenOnOrOff:
+											return context.getResources().getString(R.string.turnScreenOnOrOff);
 										case vibrate:
 											return context.getResources().getString(R.string.vibrate);
 										case setAirplaneMode:
@@ -96,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";
 									}
@@ -147,132 +163,209 @@ 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.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.wakeupDevice))
-		{
-			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.wakeupDevice));
-		}
-		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();
 	}
 
+	public Rule getParentRule()
+	{
+		return parentRule;
+	}
+
+	public void setParentRule(Rule parentRule)
+	{
+		this.parentRule = parentRule;
+	}
+
 	public static CharSequence[] getActionTypesAsArray()
 	{
 		ArrayList<String> actionTypesList = new ArrayList<String>();
@@ -370,6 +463,9 @@ public class Action
 				case setWifiTethering:
 					Actions.setWifiTethering(context, getParameter1(), toggleActionIfPossible);
 					break;
+				case setBluetoothTethering:
+					Actions.BluetoothTetheringClass.setBluetoothTethering(context, getParameter1(), toggleActionIfPossible);
+					break;
 				case setDisplayRotation:
 					Actions.setDisplayRotation(context, getParameter1(), toggleActionIfPossible);
 					break;
@@ -379,16 +475,26 @@ public class Action
 				case waitBeforeNextAction:
 					Actions.waitBeforeNextAction(Long.parseLong(this.getParameter2()));
 					break;
-				case wakeupDevice:
-					Actions.wakeupDevice(Long.parseLong(this.getParameter2()));
-					// wakeupDevice() will create a separate thread. That'll take some time, we wait 100ms.
-					try
+				case turnScreenOnOrOff:
+					if(getParameter1())
 					{
-						Thread.sleep(100);
+						if(StringUtils.isNumeric(this.getParameter2()))
+							Actions.wakeupDevice(Long.parseLong(this.getParameter2()));
+						else
+							Actions.wakeupDevice((long)1000);
+						// wakeupDevice() will create a separate thread. That'll take some time, we wait 100ms.
+						try
+						{
+							Thread.sleep(100);
+						}
+						catch (InterruptedException e)
+						{
+							e.printStackTrace();
+						}
 					}
-					catch (InterruptedException e)
+					else
 					{
-						e.printStackTrace();
+						Actions.turnOffScreen();
 					}
 					break;
 				case setAirplaneMode:
@@ -403,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;
@@ -415,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

@@ -5,12 +5,18 @@ import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.admin.DevicePolicyManager;
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+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;
@@ -20,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;
@@ -33,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;
@@ -43,13 +53,17 @@ import org.apache.http.conn.util.InetAddressUtils;
 import org.apache.http.impl.client.DefaultHttpClient;
 
 import java.io.File;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 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;
 
 import javax.net.ssl.SSLContext;
 
@@ -57,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;
@@ -72,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)
@@ -113,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);
 
@@ -304,6 +417,149 @@ public class Actions
 		return true;
 	}
 
+	public static class BluetoothTetheringClass
+	{
+		static Object instance = null;
+		static Method setTetheringOn = null;
+		static Method isTetheringOn = null;
+		static Object mutex = new Object();
+
+		public static Boolean setBluetoothTethering(Context context, Boolean desiredState, boolean toggleActionIfPossible)
+		{
+			Miscellaneous.logEvent("i", "Bluetooth Tethering", "Changing Bluetooth Tethering to " + String.valueOf(desiredState), 4);
+
+//			boolean state = isTetheringOn(context);
+
+//			if (toggleActionIfPossible)
+//			{
+//				Miscellaneous.logEvent("i", "Bluetooth Tethering", context.getResources().getString(R.string.toggling), 2);
+//				desiredState = !state;
+//			}
+
+//			if (((state && !desiredState) || (!state && desiredState)))
+//			{
+			BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+			Class<?> classBluetoothPan = null;
+			Constructor<?> BTPanCtor = null;
+			Object BTSrvInstance = null;
+			Method mBTPanConnect = null;
+
+			String sClassName = "android.bluetooth.BluetoothPan";
+			try
+			{
+				classBluetoothPan = Class.forName(sClassName);
+				Constructor<?> ctor = classBluetoothPan.getDeclaredConstructor(Context.class, BluetoothProfile.ServiceListener.class);
+
+				ctor.setAccessible(true);
+				//  Set Tethering ON
+
+				Class[] paramSet = new Class[1];
+				paramSet[0] = boolean.class;
+
+				synchronized (mutex)
+				{
+					setTetheringOn = classBluetoothPan.getDeclaredMethod("setBluetoothTethering", paramSet);
+					isTetheringOn = classBluetoothPan.getDeclaredMethod("isTetheringOn", null);
+					instance = ctor.newInstance(context, new BTPanServiceListener(context));
+				}
+
+				classBluetoothPan = Class.forName("android.bluetooth.BluetoothPan");
+				mBTPanConnect = classBluetoothPan.getDeclaredMethod("connect", BluetoothDevice.class);
+				BTPanCtor = classBluetoothPan.getDeclaredConstructor(Context.class, BluetoothProfile.ServiceListener.class);
+				BTPanCtor.setAccessible(true);
+				BTSrvInstance = BTPanCtor.newInstance(context, new BTPanServiceListener(context));
+
+				Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();
+
+				// If there are paired devices
+				if (pairedDevices.size() > 0)
+				{
+					// Loop through paired devices
+					for (BluetoothDevice device : pairedDevices)
+					{
+						try
+						{
+							mBTPanConnect.invoke(BTSrvInstance, device);
+						}
+						catch (Exception e)
+						{
+							Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+						}
+					}
+				}
+				return true;
+			}
+			catch (NoSuchMethodException e)
+			{
+				Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+			}
+			catch (ClassNotFoundException e)
+			{
+				Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+			}
+			catch(InvocationTargetException e)
+			{
+				/*
+					Exact error message: "Bluetooth binder is null"
+					This means this device doesn't have bluetooth.
+				 */
+				Miscellaneous.logEvent("e", "Bluetooth Tethering", "Device probably doesn't have bluetooth. " + Log.getStackTraceString(e), 1);
+				Toast.makeText(context, context.getResources().getString(R.string.deviceDoesNotHaveBluetooth), Toast.LENGTH_SHORT).show();
+			}
+			catch (Exception e)
+			{
+				Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+			}
+
+			return false;
+		}
+
+		public static class BTPanServiceListener implements BluetoothProfile.ServiceListener
+		{
+			private final Context context;
+
+			public BTPanServiceListener(final Context context)
+			{
+				this.context = context;
+			}
+
+			@Override
+			public void onServiceConnected(final int profile, final BluetoothProfile proxy)
+			{
+				//Some code must be here or the compiler will optimize away this callback.
+
+				try
+				{
+					synchronized (mutex)
+					{
+						setTetheringOn.invoke(instance, true);
+						if ((Boolean) isTetheringOn.invoke(instance, null))
+						{
+							Miscellaneous.logEvent("e", "Bluetooth Tethering", "BT Tethering is on", 1);
+						}
+						else
+						{
+							Miscellaneous.logEvent("e", "Bluetooth Tethering", "BT Tethering is off", 1);
+						}
+					}
+				}
+				catch (InvocationTargetException e)
+				{
+					Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+				}
+				catch (IllegalAccessException e)
+				{
+					Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+				}
+			}
+
+			@Override
+			public void onServiceDisconnected(final int profile)
+			{
+			}
+		}
+	}
+
 	public static boolean setUsbTethering(Context context2, Boolean desiredState, boolean toggleActionIfPossible)
 	{
 		//TODO:toggle not really implemented, yet
@@ -537,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)
@@ -780,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())
@@ -860,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();
 		}
 	}
 
@@ -924,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)
 		{
@@ -945,23 +1201,96 @@ public class Actions
 		@Override
 		public void run()
 		{
-			PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-			WakeLock wakeLock = pm.newWakeLock((WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON | PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), "Automation:Wakelock");
-			wakeLock.acquire();
-
 			try
 			{
-				Thread.sleep(awakeTime);
-			}
-			catch (InterruptedException e)
-			{
-				Miscellaneous.logEvent("w", context.getResources().getString(R.string.wakeupDevice), "Error keeping device awake: " + Log.getStackTraceString(e), 4);
-			}
+				PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+				WakeLock wakeLock = pm.newWakeLock((PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), "Automation:Wakelock");
+				wakeLock.acquire();
 
-			wakeLock.release();
+				try
+				{
+					Thread.sleep(awakeTime);
+				}
+				catch (InterruptedException e)
+				{
+					Miscellaneous.logEvent("w", context.getResources().getString(R.string.wakeupDevice), "Error keeping device awake: " + Log.getStackTraceString(e), 4);
+				}
+
+				wakeLock.release();
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Wakeup device action", "Error while waking up device: " + Log.getStackTraceString(e), 1);
+			}
 		}
 	}
 
+	/*public static void turnOnScreen()
+	{
+		// turn on screen
+		Miscellaneous.logEvent("i", "Actions", "Turning screen on.", 3);
+		PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+		WakeLock wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, AutomationService.NOTIFICATION_CHANNEL_ID + ":turnOffScreen");
+		wakeLock.acquire();
+	}*/
+
+	@TargetApi(21) //Suppress lint error for PROXIMITY_SCREEN_OFF_WAKE_LOCK
+	public static void turnOffScreen()
+	{
+		Miscellaneous.logEvent("i", "Actions", "Turning screen off.", 3);
+
+
+		/*params.flags |= LayoutParams.FLAG_KEEP_SCREEN_ON;
+		params.screenBrightness = 0;
+		getWindow().setAttributes(params);*/
+
+//		PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+//		WakeLock wakeLock = pm.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,AutomationService.NOTIFICATION_CHANNEL_ID + ":turnOffScreen");
+//		WakeLock wakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK , AutomationService.NOTIFICATION_CHANNEL_ID + ":turnOffScreen");
+//		wakeLock.acquire();
+
+//		WakeLock wakeLock = pm.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, "tag");
+//		WakeLock wakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK , "tag");
+//		wakeLock.acquire();
+
+//		wakeLock.release();
+		lockScreen();
+	}
+
+	public static void lockScreen()
+	{
+		Miscellaneous.logEvent("i", "Actions", "Locking screen.", 3);
+
+		// Works, but requires Manifest.permission.BIND_DEVICE_ADMIN
+//		https://stackoverflow.com/questions/23898406/java-lang-securityexception-no-active-admin-owned-by-uid-10047-for-policy-4-on
+		DevicePolicyManager deviceManager = (DevicePolicyManager)Miscellaneous.getAnyContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
+		deviceManager.lockNow();
+	}
+
+	// using root
+	/*private void turnOffScreen()
+	{
+		try
+		{
+			Class c = Class.forName("android.os.PowerManager");
+			PowerManager  mPowerManager = (PowerManager) this.getSystemService(Context.POWER_SERVICE);
+			for(Method m : c.getDeclaredMethods())
+			{
+				if(m.getName().equals("goToSleep"))
+				{
+					m.setAccessible(true);
+					if(m.getParameterTypes().length == 1)
+					{
+						m.invoke(mPowerManager,SystemClock.uptimeMillis()-2);
+					}
+				}
+			}
+		}
+		catch (Exception e)
+		{
+		}
+	}*/
+
 	@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
 	@SuppressLint("NewApi")
 	public static boolean setAirplaneMode(boolean desiredState, boolean toggleActionIfPossible)
@@ -978,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);
@@ -1092,7 +1421,7 @@ public class Actions
 		try
 		{
 			String textToSpeak = Miscellaneous.replaceVariablesInText(parameter2, context);
-			autoMationServerRef.speak(textToSpeak, true);
+			automationServerRef.speak(textToSpeak, true);
 		}
 		catch (Exception e)
 		{
@@ -1122,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)
 		{
@@ -1154,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
@@ -1267,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;
@@ -1280,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;
@@ -1293,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,33 +201,36 @@ 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
                     {
                         XmlFileInterface.readFile();
+                        ActivityMainPoi.getInstance().updateListView();
+                        ActivityMainRules.getInstance().updateListView();
+                        ActivityMainProfiles.getInstance().updateListView();
                     }
                     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)
@@ -249,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)
@@ -293,47 +306,69 @@ 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";
 
-                StringBuilder emailBody = new StringBuilder();
-                emailBody.append("Device details" + Miscellaneous.lineSeparator);
-                emailBody.append("OS version: " + System.getProperty("os.version") + Miscellaneous.lineSeparator);
-                emailBody.append("API Level: " + android.os.Build.VERSION.SDK + Miscellaneous.lineSeparator);
-                emailBody.append("Device: " + android.os.Build.DEVICE + Miscellaneous.lineSeparator);
-                emailBody.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
-                emailBody.append("Product: " + android.os.Build.PRODUCT);
-                emailBody.append("Flavor: " + BuildConfig.FLAVOR);
-
                 Uri uri = Uri.parse("content://com.jens.automation2/" + Settings.zipFileName);
 
-                Miscellaneous.sendEmail(ActivityMaintenance.this, "android-development@gmx.de", "Automation logs", emailBody.toString(), 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();
 
         return alertDialog;
     }
 
+    public static String getSystemInfo()
+    {
+        StringBuilder systemInfoText = new StringBuilder();
+        systemInfoText.append("Device details" + Miscellaneous.lineSeparator);
+        systemInfoText.append("OS version: " + System.getProperty("os.version") + Miscellaneous.lineSeparator);
+        systemInfoText.append("API Level: " + android.os.Build.VERSION.SDK + Miscellaneous.lineSeparator);
+        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 + 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();
+    }
+
     @Override
     protected void onResume()
     {
@@ -360,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/ActivityHelp.java

@@ -9,7 +9,6 @@ import com.jens.automation2.R.layout;
 
 public class ActivityHelp extends Activity
 {
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
@@ -19,5 +18,4 @@ public class ActivityHelp extends Activity
 		TextView tvHelpTextEnergySaving = (TextView) findViewById(R.id.tvHelpTextEnergySaving);
 		tvHelpTextEnergySaving.setMovementMethod(LinkMovementMethod.getInstance());
 	}
-
-}
+}

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

@@ -19,7 +19,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.jens.automation2.AutomationService.serviceCommands;
-import com.jens.automation2.receivers.AlarmListener;
+import com.jens.automation2.receivers.DateTimeListener;
 
 import java.util.ArrayList;
 
@@ -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;
 							}
@@ -254,7 +255,7 @@ public class ActivityMainRules extends ActivityGeneric
 		try
 		{
 			if(AutomationService.isMyServiceRunning(this))
-				AlarmListener.reloadAlarms();
+				DateTimeListener.reloadAlarms();
 		}
 		catch(NullPointerException e)
 		{

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;
-	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,14 +68,21 @@ 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);
+
+		bDonate = (Button)findViewById(R.id.bDonate);
+
+		if(!BuildConfig.FLAVOR.equalsIgnoreCase("googlePlayFlavor"))
+			bDonate.setVisibility(View.VISIBLE);
+
 		toggleService.setChecked(AutomationService.isMyServiceRunning(this));
 		toggleService.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{
@@ -93,7 +94,8 @@ public class ActivityMainScreen extends ActivityGeneric
 					if (toggleService.isChecked())
 					{
 						startAutomationService(getBaseContext(), false);
-					} else
+					}
+					else
 					{
 						stopAutomationService();
 					}
@@ -111,6 +113,18 @@ public class ActivityMainScreen extends ActivityGeneric
 			}
 		});
 
+		bDonate.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				String privacyPolicyUrl = "https://server47.de/donate";
+
+				Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(privacyPolicyUrl));
+				startActivity(browserIntent);
+			}
+		});
+
 		tbLockSound.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{
 			@Override
@@ -129,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);
 			}
 		});
@@ -352,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
 			{
@@ -360,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;
@@ -377,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/ActivityMainTabLayout.java

@@ -72,4 +72,4 @@ public class ActivityMainTabLayout extends TabActivity
 //	    setIntent(intent);
 		NfcReceiver.checkIntentForNFC(this, intent);
 	}	
-}
+}

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;
@@ -59,7 +60,7 @@ public class ActivityManageActionSendTextMessage extends Activity
 					backToRuleManager();
 				}
 				else
-					Toast.makeText(getBaseContext(), getResources().getString(R.string.textTooShort), Toast.LENGTH_LONG).show();
+					Toast.makeText(getBaseContext(), getResources().getString(R.string.enterPhoneNumberAndText), Toast.LENGTH_LONG).show();
 			}
 		});
 
@@ -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/ActivityManageActionSpeakText.java

@@ -44,7 +44,7 @@ public class ActivityManageActionSpeakText extends Activity
 					backToRuleManager();
 				}
 				else
-					Toast.makeText(getBaseContext(), getResources().getString(R.string.textTooShort), Toast.LENGTH_LONG).show();
+					Toast.makeText(getBaseContext(), getResources().getString(R.string.enterPhoneNumberAndText), Toast.LENGTH_LONG).show();
 			}
 		});
 		

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/ActivityManageTriggerDeviceOrientation.java

@@ -0,0 +1,297 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import com.jens.automation2.receivers.DeviceOrientationListener;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class ActivityManageTriggerDeviceOrientation extends Activity
+{
+    TextView currentAzimuth, currentPitch, currentRoll, tvAppliesAzimuth, tvAppliesPitch, tvAppliesRoll;
+    Button bApplyPositionValues, bSavePositionValues;
+    EditText etDesiredAzimuth, etDesiredAzimuthTolerance, etDesiredPitch, etDesiredPitchTolerance, etDesiredRoll, etDesiredRollTolerance;
+    CheckBox chkDevicePositionApplies;
+
+    public static String vectorFieldName = "deviceVector";
+
+    boolean editMode = false;
+
+    float desiredAzimuth, desiredPitch, desiredRoll, desiredAzimuthTolerance, desiredPitchTolerance, desiredRollTolerance;
+
+    public void updateFields(float azimuth, float pitch, float roll)
+    {
+        currentAzimuth.setText(Float.toString(azimuth));
+        currentPitch.setText(Float.toString(pitch));
+        currentRoll.setText(Float.toString(roll));
+
+        try
+        {
+            desiredAzimuth = Float.parseFloat(etDesiredAzimuth.getText().toString());
+            desiredAzimuthTolerance = Float.parseFloat(etDesiredAzimuthTolerance.getText().toString());
+            if (desiredAzimuthTolerance == 180 || (desiredAzimuth - desiredAzimuthTolerance <= azimuth && azimuth <= desiredAzimuth + desiredAzimuthTolerance))
+            {
+                tvAppliesAzimuth.setText(getResources().getString(R.string.yes));
+                tvAppliesAzimuth.setTextColor(Color.GREEN);
+            }
+            else
+            {
+                tvAppliesAzimuth.setText(getResources().getString(R.string.no));
+                tvAppliesAzimuth.setTextColor(Color.RED);
+            }
+        }
+        catch(Exception e)
+        {
+            tvAppliesAzimuth.setText("");
+        }
+
+        try
+        {
+            desiredPitch = Float.parseFloat(etDesiredPitch.getText().toString());
+            desiredPitchTolerance = Float.parseFloat(etDesiredPitchTolerance.getText().toString());
+            if (desiredPitchTolerance == 180 || (desiredPitch - desiredPitchTolerance <= pitch && pitch <= desiredPitch + desiredPitchTolerance))
+            {
+                tvAppliesPitch.setText(getResources().getString(R.string.yes));
+                tvAppliesPitch.setTextColor(Color.GREEN);
+            }
+            else
+            {
+                tvAppliesPitch.setText(getResources().getString(R.string.no));
+                tvAppliesPitch.setTextColor(Color.RED);
+            }
+        }
+        catch(Exception e)
+        {
+            tvAppliesPitch.setText("");
+        }
+
+        try
+        {
+            desiredRoll = Float.parseFloat(etDesiredRoll.getText().toString());
+            desiredRollTolerance = Float.parseFloat(etDesiredRollTolerance.getText().toString());
+            if (desiredRollTolerance == 180 || (desiredRoll - desiredRollTolerance <= roll && roll <= desiredRoll + desiredRollTolerance))
+            {
+                tvAppliesRoll.setText(getResources().getString(R.string.yes));
+                tvAppliesRoll.setTextColor(Color.GREEN);
+            }
+            else
+            {
+                tvAppliesRoll.setText(getResources().getString(R.string.no));
+                tvAppliesRoll.setTextColor(Color.RED);
+            }
+        }
+        catch(Exception e)
+        {
+            tvAppliesRoll.setText("");
+        }
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_trigger_device_orientation);
+
+        currentAzimuth = (TextView) findViewById(R.id.tvCurrentAzimuth);
+        currentPitch = (TextView) findViewById(R.id.tvCurrentOrientationPitch);
+        currentRoll = (TextView) findViewById(R.id.tvCurrentRoll);
+        tvAppliesAzimuth = (TextView) findViewById(R.id.tvAppliesAzimuth);
+        tvAppliesPitch = (TextView) findViewById(R.id.tvAppliesPitch);
+        tvAppliesRoll = (TextView) findViewById(R.id.tvAppliesRoll);
+
+        bApplyPositionValues = (Button) findViewById(R.id.bApplyPositionValues);
+        bSavePositionValues = (Button) findViewById(R.id.bSavePositionValues);
+
+        etDesiredAzimuth = (EditText) findViewById(R.id.etDesiredAzimuth);
+        etDesiredAzimuthTolerance = (EditText) findViewById(R.id.etDesiredAzimuthTolerance);
+        etDesiredPitch = (EditText) findViewById(R.id.etDesiredPitch);
+        etDesiredPitchTolerance = (EditText) findViewById(R.id.etDesiredPitchTolerance);
+        etDesiredRoll = (EditText) findViewById(R.id.etDesiredRoll);
+        etDesiredRollTolerance = (EditText) findViewById(R.id.etDesiredRollTolerance);
+
+        chkDevicePositionApplies = (CheckBox)findViewById(R.id.chkDevicePositionApplies);
+
+//        etDesiredAzimuth.setFilters(new InputFilter[]{new InputFilterMinMax(-180, 180)});
+//        etDesiredPitch.setFilters(new InputFilter[]{new InputFilterMinMax(-180, 180)});
+//        etDesiredRoll.setFilters(new InputFilter[]{new InputFilterMinMax(-180, 180)});
+        etDesiredAzimuthTolerance.setFilters(new InputFilter[]{new InputFilterMinMax(0, 180)});
+        etDesiredPitchTolerance.setFilters(new InputFilter[]{new InputFilterMinMax(0, 180)});
+        etDesiredRollTolerance.setFilters(new InputFilter[]{new InputFilterMinMax(0, 180)});
+
+        if(getIntent().hasExtra(vectorFieldName))
+        {
+            editMode = true;
+            try
+            {
+                boolean chkValue = getIntent().getBooleanExtra(ActivityManageRule.intentNameTriggerParameter1, true);
+                chkDevicePositionApplies.setChecked(chkValue);
+                String values[] = getIntent().getStringExtra(vectorFieldName).split(Trigger.triggerParameter2Split);
+                etDesiredAzimuth.setText(values[0]);
+                etDesiredAzimuthTolerance.setText(values[1]);
+                etDesiredPitch.setText(values[2]);
+                etDesiredPitchTolerance.setText(values[3]);
+                etDesiredRoll.setText(values[4]);
+                etDesiredRollTolerance.setText(values[5]);
+            }
+            catch(Exception e)
+            {
+                Toast.makeText(ActivityManageTriggerDeviceOrientation.this, getResources().getString(R.string.triggerWrong), Toast.LENGTH_SHORT).show();
+                Miscellaneous.logEvent("e", "DevicePositionTrigger", "There\'s something wrong with a device position trigger. Content: " + getIntent().getStringExtra(vectorFieldName) + ", " + Log.getStackTraceString(e), 1);
+            }
+        }
+
+        bApplyPositionValues.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                // Round the values. Too long decimals will destroy the layout
+
+                if(!StringUtils.isEmpty(currentAzimuth.getText()))
+                    etDesiredAzimuth.setText(String.valueOf(Math.round(Float.parseFloat(currentAzimuth.getText().toString()))));
+
+                if(!StringUtils.isEmpty(currentPitch.getText()))
+                    etDesiredPitch.setText(String.valueOf(Math.round(Float.parseFloat(currentPitch.getText().toString()))));
+
+                if(!StringUtils.isEmpty(currentRoll.getText()))
+                    etDesiredRoll.setText(String.valueOf(Math.round(Float.parseFloat(currentRoll.getText().toString()))));
+            }
+        });
+
+        bSavePositionValues.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                if(!checkInputs(true))
+                {
+                    Toast.makeText(ActivityManageTriggerDeviceOrientation.this, getResources().getString(R.string.enterValidNumbersIntoAllFields), Toast.LENGTH_LONG).show();
+                }
+                else
+                {
+                    // Save
+                    Intent returnData = new Intent();
+                    returnData.putExtra(ActivityManageRule.intentNameTriggerParameter1, chkDevicePositionApplies.isChecked());
+                    returnData.putExtra(vectorFieldName,
+                                        etDesiredAzimuth.getText().toString() + Trigger.triggerParameter2Split +
+                                            etDesiredAzimuthTolerance.getText().toString() + Trigger.triggerParameter2Split +
+                                            etDesiredPitch.getText().toString() + Trigger.triggerParameter2Split +
+                                            etDesiredPitchTolerance.getText().toString() + Trigger.triggerParameter2Split +
+                                            etDesiredRoll.getText().toString() + Trigger.triggerParameter2Split +
+                                            etDesiredRollTolerance.getText().toString());
+
+                    setResult(RESULT_OK, returnData);
+                    finish();
+                }
+            }
+        });
+    }
+
+    boolean checkInputs(boolean showMessages)
+    {
+        if(
+                !StringUtils.isEmpty(etDesiredAzimuth.getText().toString()) && Miscellaneous.isNumeric(etDesiredAzimuth.getText().toString())
+                        &&
+                !StringUtils.isEmpty(etDesiredAzimuthTolerance.getText().toString()) && Miscellaneous.isNumeric(etDesiredAzimuthTolerance.getText().toString())
+                        &&
+                !StringUtils.isEmpty(etDesiredPitch.getText().toString()) && Miscellaneous.isNumeric(etDesiredPitch.getText().toString())
+                        &&
+                !StringUtils.isEmpty(etDesiredPitchTolerance.getText().toString()) && Miscellaneous.isNumeric(etDesiredPitchTolerance.getText().toString())
+                        &&
+                !StringUtils.isEmpty(etDesiredRoll.getText().toString()) && Miscellaneous.isNumeric(etDesiredRoll.getText().toString())
+                        &&
+                !StringUtils.isEmpty(etDesiredRollTolerance.getText().toString()) && Miscellaneous.isNumeric(etDesiredRollTolerance.getText().toString())
+        )
+        {
+            float da = Float.parseFloat(etDesiredAzimuth.getText().toString());
+            float dp = Float.parseFloat(etDesiredPitch.getText().toString());
+            float dr = Float.parseFloat(etDesiredRoll.getText().toString());
+
+            if(Math.abs(da) > 180 || Math.abs(dp) > 180 || Math.abs(dr) > 180)
+            {
+                return false;
+            }
+
+            if(showMessages)
+            {
+                float dat = Float.parseFloat(etDesiredAzimuthTolerance.getText().toString());
+                float dpt = Float.parseFloat(etDesiredPitchTolerance.getText().toString());
+                float drt = Float.parseFloat(etDesiredRollTolerance.getText().toString());
+
+            /*
+                The user may enter a tolerance of 180° for two directions, but not all three.
+                Otherwise this trigger would always apply.
+             */
+                if (Math.abs(dat) >= 180 && Math.abs(dpt) >= 180 && Math.abs(drt) >= 180)
+                {
+                    Miscellaneous.messageBox(getResources().getString(R.string.warning), getResources().getString(R.string.toleranceOf180OnlyAllowedIn2Fields), ActivityManageTriggerDeviceOrientation.this).show();
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void onResume()
+    {
+        super.onResume();
+        DeviceOrientationListener.getInstance().startSensorFromConfigActivity(ActivityManageTriggerDeviceOrientation.this, this);
+    }
+
+    @Override
+    protected void onPause()
+    {
+        super.onPause();
+        DeviceOrientationListener.getInstance().stopSensorFromConfigActivity();
+    }
+
+    public class InputFilterMinMax implements InputFilter
+    {
+        private float minimumValue;
+        private float maximumValue;
+
+        public InputFilterMinMax(float minimumValue, float maximumValue)
+        {
+            this.minimumValue = minimumValue;
+            this.maximumValue = maximumValue;
+        }
+
+        private boolean isInRange(float a, float b, float c)
+        {
+            return b > a ? c >= a && c <= b : c >= b && c <= a;
+        }
+
+        @Override
+        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend)
+        {
+            try
+            {
+                int input = Integer.parseInt(dest.subSequence(0, dstart).toString() + source + dest.subSequence(dend, dest.length()));
+                if (isInRange(minimumValue, maximumValue, input))
+                    return null;
+            }
+            catch (NumberFormatException nfe)
+            {
+            }
+            return "";
+        }
+    }
+}

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/ActivityManageTriggerTimeFrame.java

@@ -6,11 +6,16 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.sql.Time;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 
@@ -18,8 +23,9 @@ public class ActivityManageTriggerTimeFrame extends Activity
 {
 	Button bSaveTimeFrame;
 	TimePicker startPicker, stopPicker;
-	CheckBox checkMonday, checkTuesday, checkWednesday, checkThursday, checkFriday, checkSaturday, checkSunday;
+	CheckBox checkMonday, checkTuesday, checkWednesday, checkThursday, checkFriday, checkSaturday, checkSunday, chkRepeat;
 	RadioButton radioTimeFrameEntering, radioTimeFrameLeaving;
+	EditText etRepeatEvery;
 
 	public static Trigger editedTimeFrameTrigger = null;
 	
@@ -44,7 +50,9 @@ public class ActivityManageTriggerTimeFrame extends Activity
 		checkSunday = (CheckBox)findViewById(R.id.checkSunday);
 		radioTimeFrameEntering = (RadioButton)findViewById(R.id.radioTimeFrameEntering);
 		radioTimeFrameLeaving = (RadioButton)findViewById(R.id.radioTimeFrameLeaving);
-				
+		chkRepeat = (CheckBox)findViewById(R.id.chkRepeat);
+		etRepeatEvery = (EditText)findViewById(R.id.etRepeatEvery);
+
 		bSaveTimeFrame.setOnClickListener(new OnClickListener()
 		{			
 			@Override
@@ -92,11 +100,43 @@ public class ActivityManageTriggerTimeFrame extends Activity
 				{
 					Toast.makeText(getBaseContext(), getResources().getString(R.string.selectOneDay), Toast.LENGTH_LONG).show();
 					return;
-				}				
+				}
+
+				boolean goOn = false;
+				if(chkRepeat.isChecked())
+				{
+					if(!StringUtils.isEmpty(etRepeatEvery.getText().toString()))
+					{
+						try
+						{
+							long value = Long.parseLong(etRepeatEvery.getText().toString());
+							if(value > 0)
+							{
+								goOn = true;
+							}
+						}
+						catch(Exception e)
+						{
+						}
+					}
+				}
+				else
+					goOn = true;
+
+				if(!goOn)
+				{
+					Toast.makeText(getBaseContext(), getResources().getString(R.string.enterRepetitionTime), Toast.LENGTH_LONG).show();
+					return;
+				}
 
 				if(editedTimeFrameTrigger.getTimeFrame() == null)
+				{
 					// add new one
-					editedTimeFrameTrigger.setTimeFrame(new TimeFrame(startTime, stopTime, dayList));
+					if(chkRepeat.isChecked())
+						editedTimeFrameTrigger.setTimeFrame(new TimeFrame(startTime, stopTime, dayList, Long.parseLong(etRepeatEvery.getText().toString())));
+					else
+						editedTimeFrameTrigger.setTimeFrame(new TimeFrame(startTime, stopTime, dayList, 0));
+				}
 				else
 				{
 					// edit one
@@ -104,6 +144,11 @@ public class ActivityManageTriggerTimeFrame extends Activity
 					editedTimeFrameTrigger.getTimeFrame().setTriggerTimeStop(stopTime);
 					editedTimeFrameTrigger.getTimeFrame().getDayList().clear();
 					editedTimeFrameTrigger.getTimeFrame().setDayList(dayList);
+
+					if(chkRepeat.isChecked())
+						editedTimeFrameTrigger.getTimeFrame().setRepetition(Long.parseLong(etRepeatEvery.getText().toString()));
+					else
+						editedTimeFrameTrigger.getTimeFrame().setRepetition(0);
 				}
 				
 				editedTimeFrameTrigger.setTriggerParameter(radioTimeFrameEntering.isChecked());
@@ -112,6 +157,15 @@ public class ActivityManageTriggerTimeFrame extends Activity
 				finish();
 			}
 		});
+
+		chkRepeat.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+		{
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+			{
+				etRepeatEvery.setEnabled(isChecked);
+			}
+		});
 		
 		if(editedTimeFrameTrigger.getTimeFrame() != null)
 			loadVariableIntoGui();
@@ -158,6 +212,12 @@ public class ActivityManageTriggerTimeFrame extends Activity
 					break;
 			}
 		}
+
+		if(editedTimeFrameTrigger.getTimeFrame().getRepetition() > 0)
+		{
+			chkRepeat.setChecked(true);
+			etRepeatEvery.setText(String.valueOf(editedTimeFrameTrigger.getTimeFrame().getRepetition()));
+		}
 	}
 
 }

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,8 +3,8 @@ 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;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -15,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;
 
@@ -46,6 +45,8 @@ public class ActivityPermissions extends Activity
     private static final int requestCodeForPermissionsNotificationPolicy = 12044;
     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";
@@ -238,9 +239,9 @@ public class ActivityPermissions extends Activity
                 if(
                         s.equalsIgnoreCase(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
                                 ||
-                                s.equalsIgnoreCase(Manifest.permission.ACCESS_FINE_LOCATION)
+                        s.equalsIgnoreCase(Manifest.permission.ACCESS_FINE_LOCATION)
                                 ||
-                                s.equalsIgnoreCase(Manifest.permission.ACCESS_COARSE_LOCATION)
+                        s.equalsIgnoreCase(Manifest.permission.ACCESS_COARSE_LOCATION)
                 )
                 {
                     if (!Miscellaneous.googleToBlameForLocation(true))
@@ -282,6 +283,16 @@ public class ActivityPermissions extends Activity
             {
                 return verifyNotificationPermission();
             }
+            else if (s.equals(Manifest.permission.BIND_DEVICE_ADMIN))
+            {
+                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);
@@ -292,6 +303,28 @@ public class ActivityPermissions extends Activity
             return true;
     }
 
+    public static boolean haveDeviceAdmin()
+    {
+        DevicePolicyManager deviceManger = (DevicePolicyManager)Miscellaneous.getAnyContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
+        ComponentName compName = new ComponentName(Miscellaneous.getAnyContext(), DeviceAdmin.class);
+        boolean active = deviceManger.isAdminActive(compName);
+        return active;
+    }
+
+    public static void requestDeviceAdmin()
+    {
+        if(!haveDeviceAdmin())
+        {
+//            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 );
+            intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN , compName );
+            intent.putExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION , Miscellaneous.getAnyContext().getResources().getString(R.string.deviceAdminNote));
+            ActivityPermissions.getInstance().startActivityForResult(intent, requestCodeForPermissionsDeviceAdmin);
+        }
+    }
+
     public static String[] getRequiredPermissions(boolean onlyGeneral)
     {
         ArrayList<String> requiredPermissions = new ArrayList<String>();
@@ -308,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);
                         }
+                    }
                 }
             }
 
@@ -487,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);
@@ -496,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);
@@ -531,6 +577,12 @@ public class ActivityPermissions extends Activity
 //                        https://stackoverflow.com/questions/32185628/connectivitymanager-requestnetwork-in-android-6-0
 //                        addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
                         break;
+                    case setBluetoothTethering:
+                        //addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
+                        addToArrayListUnique(Manifest.permission.BLUETOOTH, requiredPermissions);
+                        addToArrayListUnique(Manifest.permission.BLUETOOTH_ADMIN, requiredPermissions);
+                        addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
+                        break;
                     case setWifi:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
 //                        https://stackoverflow.com/questions/32185628/connectivitymanager-requestnetwork-in-android-6-0
@@ -551,15 +603,15 @@ 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(
                                 action.getParameter2().contains(Actions.wireguard_tunnel_up)
                                         ||
-                                        action.getParameter2().contains(Actions.wireguard_tunnel_down)
+                                action.getParameter2().contains(Actions.wireguard_tunnel_down)
                                         ||
-                                        action.getParameter2().contains(Actions.wireguard_tunnel_refresh)
+                                action.getParameter2().contains(Actions.wireguard_tunnel_refresh)
                         )
                             addToArrayListUnique(ActivityPermissions.permissionNameWireguard, requiredPermissions);
 //                        if(
@@ -571,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);
@@ -587,40 +639,40 @@ public class ActivityPermissions extends Activity
                         break;
                     case turnUsbTetheringOff:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
-//                        addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
                         break;
                     case turnUsbTetheringOn:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
-//                        addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
                         break;
                     case turnWifiOff:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
-//                        addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
                         addToArrayListUnique(Manifest.permission.ACCESS_NETWORK_STATE, requiredPermissions);
                         break;
                     case turnWifiOn:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
-//                        addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
                         addToArrayListUnique(Manifest.permission.ACCESS_NETWORK_STATE, requiredPermissions);
                         break;
                     case turnWifiTetheringOff:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
-//                        addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
                         addToArrayListUnique(Manifest.permission.ACCESS_NETWORK_STATE, requiredPermissions);
                         break;
                     case turnWifiTetheringOn:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
-//                        addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
                         addToArrayListUnique(Manifest.permission.ACCESS_NETWORK_STATE, requiredPermissions);
                         break;
                     case waitBeforeNextAction:
                         break;
-                    case wakeupDevice:
-                        addToArrayListUnique(Manifest.permission.WAKE_LOCK, requiredPermissions);
-                        break;
                     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);
+                        else
+                            addToArrayListUnique(Manifest.permission.BIND_DEVICE_ADMIN, requiredPermissions);
+                        break;
                     default:
                         break;
                 }
@@ -696,13 +748,6 @@ public class ActivityPermissions extends Activity
                     usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
                 break;
             case Manifest.permission.ACCESS_COARSE_LOCATION:
-//                usingElements.add(getResources().getString(R.string.android_permission_ACCESS_COARSE_LOCATION));
-                usingElements.add(getResources().getString(R.string.manageLocations));
-                for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.pointOfInterest))
-                    usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
-                for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.speed))
-                    usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
-                break;
             case Manifest.permission.ACCESS_FINE_LOCATION:
                 usingElements.add(getResources().getString(R.string.manageLocations));
                 for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.pointOfInterest))
@@ -759,14 +804,6 @@ public class ActivityPermissions extends Activity
                 for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.wifiConnection))
                     usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
                 break;
-            /*case "android.permission.BATTERY_STATS":
-                for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.batteryLevel))
-                    usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
-                for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.charging))
-                    usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
-                for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.usb_host_connection))
-                    usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
-                break;*/
             case Manifest.permission.BLUETOOTH_ADMIN:
                 for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.bluetoothConnection))
                     usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
@@ -833,6 +870,39 @@ 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;
         }
 
@@ -861,6 +931,14 @@ public class ActivityPermissions extends Activity
                 }
             }
 
+            if (requestCode == requestCodeForPermissionsDeviceAdmin)
+            {
+                NotificationManager mNotificationManager = (NotificationManager) ActivityPermissions.this.getSystemService(Context.NOTIFICATION_SERVICE);
+
+                if (mNotificationManager.isNotificationPolicyAccessGranted())
+                    requestPermissions(cachedPermissionsToRequest, true);
+            }
+
             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
             {
                 if (requestCode == requestCodeForPermissionsBackgroundLocation)
@@ -873,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);
         }
     }
 
@@ -923,12 +1005,18 @@ public class ActivityPermissions extends Activity
                         startActivityForResult(intent, requestCodeForPermissionsWriteSettings);
                         return;
                     }
+                    if (s.equalsIgnoreCase(Manifest.permission.BIND_DEVICE_ADMIN))
+                    {
+                        requiredPermissions.remove(s);
+                        cachedPermissionsToRequest = requiredPermissions;
+                        requestDeviceAdmin();
+                        return;
+                    }
                     else if (s.equalsIgnoreCase(Manifest.permission.ACCESS_NOTIFICATION_POLICY))
                     {
                         requiredPermissions.remove(s);
                         cachedPermissionsToRequest = requiredPermissions;
                         Intent intent = new Intent(android.provider.Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS);
-//                        intent.setData(Uri.parse("package:" + getPackageName()));
                         startActivityForResult(intent, requestCodeForPermissionsNotificationPolicy);
                         return;
                     }
@@ -936,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);
@@ -968,7 +1066,7 @@ public class ActivityPermissions extends Activity
                 {
                     if(!ActivityPermissions.isPermissionDeclaratedInManifest(Miscellaneous.getAnyContext(), Manifest.permission.SEND_SMS)
                             &&
-                            Miscellaneous.isGooglePlayInstalled(Miscellaneous.getAnyContext())
+                        Miscellaneous.isGooglePlayInstalled(Miscellaneous.getAnyContext())
                     )
                     {
                         requiredPermissions.remove(Manifest.permission.PROCESS_OUTGOING_CALLS);
@@ -978,8 +1076,6 @@ public class ActivityPermissions extends Activity
                 if(requiredPermissions.contains(Manifest.permission.SEND_SMS))
                 {
                     if(!ActivityPermissions.isPermissionDeclaratedInManifest(Miscellaneous.getAnyContext(), Manifest.permission.SEND_SMS)
-//                            &&
-//                            Miscellaneous.isGooglePlayInstalled(Miscellaneous.getAnyContext())
                     )
                     {
                         requiredPermissions.remove(Manifest.permission.SEND_SMS);
@@ -996,11 +1092,8 @@ public class ActivityPermissions extends Activity
 
                 Miscellaneous.logEvent("i", "Permissions", "Requesting permissions: " + permissions, 2);
 
-//                Toast.makeText(ActivityPermissions.this, "Requesting permissions. Amount: " + String.valueOf(requiredPermissions.size()), Toast.LENGTH_LONG).show();
                 if(requiredPermissions.size() > 0)
                     requestPermissions(requiredPermissions.toArray(new String[requiredPermissions.size()]), requestCodeForPermissions);
-//                else
-//                    Miscellaneous.messageBox(getResources().getString(R.string.warning), getResources().getString(R.string.permissionsRequiredNotAvailable), ActivityPermissions.this).show();
             }
             else
                 setHaveAllPermissions();
@@ -1018,17 +1111,11 @@ public class ActivityPermissions extends Activity
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults)
     {
         Miscellaneous.logEvent("i", "onRequestPermissionsResult()", "onRequestPermissionsResult()", 3);
-//        Toast.makeText(ActivityPermissions.this, "onRequestPermissionsResult()", Toast.LENGTH_LONG).show();
 
-//        ArrayList<String> disabledFeatures = new ArrayList<String>();
         ArrayList<String> deniedPermissions = new ArrayList<String>();
 
         if (requestCode == requestCodeForPermissions)
         {
-            /*ArrayList<String> affectedGeneralList = new ArrayList<String>();
-            ArrayList<String> affectedTriggersList = new ArrayList<String>();
-            ArrayList<String> affectedActionList = new ArrayList<String>();*/
-
             for (int i=0; i < grantResults.length; i++)
             {
                 if(permissions[i].equalsIgnoreCase(Manifest.permission.WRITE_EXTERNAL_STORAGE) && grantResults[i] == PackageManager.PERMISSION_GRANTED)
@@ -1088,8 +1175,8 @@ public class ActivityPermissions extends Activity
             if(deniedPermissions.size() > 0)
             {
                 /*
-                    The user denied certain permissions. With the exception of write-storage we need to live with that
-                    and simply disable features while keeping the notification alive. The user may dismiss it anyway.
+                    The user denied certain permissions. We need to live with that and simply disable
+                    features while keeping the notification alive. The user may dismiss it anyway.
                  */
 
                 Miscellaneous.logEvent("w", "Denied permissions", getResources().getString(R.string.theFollowingPermissionsHaveBeenDenied) + Miscellaneous.explode(", ", deniedPermissions), 3);
@@ -1107,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]
@@ -1314,10 +1401,7 @@ public class ActivityPermissions extends Activity
         mapActionPermissions.put("setWifiTethering", Manifest.permission.WRITE_SETTINGS);
         mapActionPermissions.put("setWifiTethering", Manifest.permission.CHANGE_NETWORK_STATE);
         mapActionPermissions.put("setWifiTethering", Manifest.permission.ACCESS_NETWORK_STATE);
-//		  mapActionPermissions.put("speakText", Manifest.permission.ACCESS_NOTIFICATION_POLICY);
-//		  mapActionPermissions.put("startOtherActivity", "");
         mapActionPermissions.put("triggerUrl", Manifest.permission.INTERNET);
-//			  Hier müßte ein Hinweis kommen, daß nur die Variablen verwendet werden können, für die es Rechte gibt.
         mapActionPermissions.put("turnBluetoothOff", Manifest.permission.BLUETOOTH_ADMIN);
         mapActionPermissions.put("turnBluetoothOff", Manifest.permission.BLUETOOTH);
         mapActionPermissions.put("turnBluetoothOff", Manifest.permission.ACCESS_NETWORK_STATE);
@@ -1347,209 +1431,6 @@ public class ActivityPermissions extends Activity
         mapActionPermissions.put("wakeupDevice", Manifest.permission.WAKE_LOCK);
     }
 
-    /*
-        <string name="android.permission.SEND_SMS"></string>
-        <string name="android.permission.SEND_SMS_NO_CONFIRMATION"></string>
-        <string name="android.permission.RECEIVE_SMS"></string>
-        <string name="android.permission.RECEIVE_MMS"></string>
-        <string name="android.permission.RECEIVE_EMERGENCY_BROADCAST"></string>
-        <string name="android.permission.READ_CELL_BROADCASTS"></string>
-        <string name="android.permission.READ_SMS"></string>
-        <string name="android.permission.WRITE_SMS"></string>
-        <string name="android.permission.RECEIVE_WAP_PUSH"></string>
-        <string name="android.permission.READ_CONTACTS"></string>
-        <string name="android.permission.WRITE_CONTACTS"></string>
-        <string name="android.permission.BIND_DIRECTORY_SEARCH"></string>
-        <string name="android.permission.READ_CALL_LOG"></string>
-        <string name="android.permission.WRITE_CALL_LOG"></string>
-        <string name="android.permission.READ_SOCIAL_STREAM"></string>
-        <string name="android.permission.WRITE_SOCIAL_STREAM"></string>
-        <string name="android.permission.READ_PROFILE"></string>
-        <string name="android.permission.WRITE_PROFILE"></string>
-        <string name="android.permission.READ_CALENDAR"></string>
-        <string name="android.permission.WRITE_CALENDAR"></string>
-        <string name="android.permission.READ_USER_DICTIONARY"></string>
-        <string name="android.permission.WRITE_USER_DICTIONARY"></string>
-        <string name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"></string>
-        <string name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"></string>
-        <string name="com.android.alarm.permission.SET_ALARM"></string>
-        <string name="com.android.voicemail.permission.ADD_VOICEMAIL"></string>
-        <string name="android.permission.ACCESS_FINE_LOCATION"></string>
-        <string name="android.permission.ACCESS_COARSE_LOCATION"></string>
-        <string name="android.permission.ACCESS_MOCK_LOCATION"></string>
-        <string name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"></string>
-        <string name="android.permission.INSTALL_LOCATION_PROVIDER"></string>
-        <string name="android.permission.INTERNET"></string>
-        <string name="android.permission.ACCESS_NETWORK_STATE"></string>
-        <string name="android.permission.ACCESS_WIFI_STATE"></string>
-        <string name="android.permission.CHANGE_WIFI_STATE"></string>
-        <string name="android.permission.ACCESS_WIMAX_STATE"></string>
-        <string name="android.permission.CHANGE_WIMAX_STATE"></string>
-        <string name="android.permission.BLUETOOTH"></string>
-        <string name="android.permission.BLUETOOTH_ADMIN"></string>
-        <string name="android.permission.BLUETOOTH_STACK"></string>
-        <string name="android.permission.NFC"></string>
-        <string name="android.permission.CONNECTIVITY_INTERNAL"></string>
-        <string name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"></string>
-        <string name="android.permission.GET_ACCOUNTS"></string>
-        <string name="android.permission.AUTHENTICATE_ACCOUNTS"></string>
-        <string name="android.permission.USE_CREDENTIALS"></string>
-        <string name="android.permission.MANAGE_ACCOUNTS"></string>
-        <string name="android.permission.ACCOUNT_MANAGER"></string>
-        <string name="android.permission.CHANGE_WIFI_MULTICAST_STATE"></string>
-        <string name="android.permission.VIBRATE"></string>
-        <string name="android.permission.FLASHLIGHT"></string>
-        <string name="android.permission.WAKE_LOCK"></string>
-        <string name="android.permission.MODIFY_AUDIO_SETTINGS"></string>
-        <string name="android.permission.MANAGE_USB"></string>
-        <string name="android.permission.ACCESS_MTP"></string>
-        <string name="android.permission.HARDWARE_TEST"></string>
-        <string name="android.permission.NET_ADMIN"></string>
-        <string name="android.permission.REMOTE_AUDIO_PLAYBACK"></string>
-        <string name="android.permission.RECORD_AUDIO"></string>
-        <string name="android.permission.CAMERA"></string>
-        <string name="android.permission.PROCESS_OUTGOING_CALLS"></string>
-        <string name="android.permission.MODIFY_PHONE_STATE"></string>
-        <string name="android.permission.READ_PHONE_STATE"></string>
-        <string name="android.permission.READ_PRIVILEGED_PHONE_STATE"></string>
-        <string name="android.permission.CALL_PHONE"></string>
-        <string name="android.permission.USE_SIP"></string>
-        <string name="android.permission.READ_EXTERNAL_STORAGE"></string>
-        <string name="android.permission.WRITE_EXTERNAL_STORAGE"></string>
-        <string name="android.permission.WRITE_MEDIA_STORAGE"></string>
-        <string name="android.permission.DISABLE_KEYGUARD"></string>
-        <string name="android.permission.GET_TASKS"></string>
-        <string name="android.permission.INTERACT_ACROSS_USERS"></string>
-        <string name="android.permission.INTERACT_ACROSS_USERS_FULL"></string>
-        <string name="android.permission.MANAGE_USERS"></string>
-        <string name="android.permission.GET_DETAILED_TASKS"></string>
-        <string name="android.permission.REORDER_TASKS"></string>
-        <string name="android.permission.REMOVE_TASKS"></string>
-        <string name="android.permission.START_ANY_ACTIVITY"></string>
-        <string name="android.permission.RESTART_PACKAGES"></string>
-        <string name="android.permission.KILL_BACKGROUND_PROCESSES"></string>
-        <string name="android.permission.SYSTEM_ALERT_WINDOW"></string>
-        <string name="android.permission.SET_WALLPAPER"></string>
-        <string name="android.permission.SET_WALLPAPER_HINTS"></string>
-        <string name="android.permission.SET_TIME"></string>
-        <string name="android.permission.SET_TIME_ZONE"></string>
-        <string name="android.permission.EXPAND_STATUS_BAR"></string>
-        <string name="android.permission.READ_SYNC_SETTINGS"></string>
-        <string name="android.permission.WRITE_SYNC_SETTINGS"></string>
-        <string name="android.permission.READ_SYNC_STATS"></string>
-        <string name="android.permission.SET_SCREEN_COMPATIBILITY"></string>
-        <string name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE"></string>
-        <string name="android.permission.CHANGE_CONFIGURATION"></string>
-        <string name="android.permission.WRITE_SETTINGS"></string>
-        <string name="android.permission.WRITE_GSERVICES"></string>
-        <string name="android.permission.SET_SCREEN_COMPATIBILITY"></string>
-        <string name="android.permission.CHANGE_CONFIGURATION"></string>
-        <string name="android.permission.FORCE_STOP_PACKAGES"></string>
-        <string name="android.permission.RETRIEVE_WINDOW_CONTENT"></string>
-        <string name="android.permission.SET_ANIMATION_SCALE"></string>
-        <string name="android.permission.PERSISTENT_ACTIVITY"></string>
-        <string name="android.permission.GET_PACKAGE_SIZE"></string>
-        <string name="android.permission.SET_PREFERRED_APPLICATIONS"></string>
-        <string name="android.permission.RECEIVE_BOOT_COMPLETED"></string>
-        <string name="android.permission.BROADCAST_STICKY"></string>
-        <string name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"></string>
-        <string name="android.permission.MOUNT_FORMAT_FILESYSTEMS"></string>
-        <string name="android.permission.ASEC_ACCESS"></string>
-        <string name="android.permission.ASEC_CREATE"></string>
-        <string name="android.permission.ASEC_DESTROY"></string>
-        <string name="android.permission.ASEC_MOUNT_UNMOUNT"></string>
-        <string name="android.permission.ASEC_RENAME"></string>
-        <string name="android.permission.WRITE_APN_SETTINGS"></string>
-        <string name="android.permission.SUBSCRIBED_FEEDS_READ"></string>
-        <string name="android.permission.SUBSCRIBED_FEEDS_WRITE"></string>
-        <string name="android.permission.CHANGE_NETWORK_STATE"></string>
-        <string name="android.permission.CLEAR_APP_CACHE"></string>
-        <string name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"></string>
-        <string name="android.permission.WRITE_SECURE_SETTINGS"></string>
-        <string name="android.permission.DUMP"></string>
-        <string name="android.permission.READ_LOGS"></string>
-        <string name="android.permission.SET_DEBUG_APP"></string>
-        <string name="android.permission.SET_PROCESS_LIMIT"></string>
-        <string name="android.permission.SET_ALWAYS_FINISH"></string>
-        <string name="android.permission.SIGNAL_PERSISTENT_PROCESSES"></string>
-        <string name="android.permission.DIAGNOSTIC"></string>
-        <string name="android.permission.STATUS_BAR"></string>
-        <string name="android.permission.STATUS_BAR_SERVICE"></string>
-        <string name="android.permission.FORCE_BACK"></string>
-        <string name="android.permission.UPDATE_DEVICE_STATS"></string>
-        <string name="android.permission.INTERNAL_SYSTEM_WINDOW"></string>
-        <string name="android.permission.MANAGE_APP_TOKENS"></string>
-        <string name="android.permission.FREEZE_SCREEN"></string>
-        <string name="android.permission.INJECT_EVENTS"></string>
-        <string name="android.permission.FILTER_EVENTS"></string>
-        <string name="android.permission.RETRIEVE_WINDOW_INFO"></string>
-        <string name="android.permission.TEMPORARY_ENABLE_ACCESSIBILITY"></string>
-        <string name="android.permission.MAGNIFY_DISPLAY"></string>
-        <string name="android.permission.SET_ACTIVITY_WATCHER"></string>
-        <string name="android.permission.SHUTDOWN"></string>
-        <string name="android.permission.STOP_APP_SWITCHES"></string>
-        <string name="android.permission.READ_INPUT_STATE"></string>
-        <string name="android.permission.BIND_INPUT_METHOD"></string>
-        <string name="android.permission.BIND_ACCESSIBILITY_SERVICE"></string>
-        <string name="android.permission.BIND_TEXT_SERVICE"></string>
-        <string name="android.permission.BIND_VPN_SERVICE"></string>
-        <string name="android.permission.BIND_WALLPAPER"></string>
-        <string name="android.permission.BIND_DEVICE_ADMIN"></string>
-        <string name="android.permission.SET_ORIENTATION"></string>
-        <string name="android.permission.SET_POINTER_SPEED"></string>
-        <string name="android.permission.SET_KEYBOARD_LAYOUT"></string>
-        <string name="android.permission.INSTALL_PACKAGES"></string>
-        <string name="android.permission.CLEAR_APP_USER_DATA"></string>
-        <string name="android.permission.DELETE_CACHE_FILES"></string>
-        <string name="android.permission.DELETE_PACKAGES"></string>
-        <string name="android.permission.MOVE_PACKAGE"></string>
-        <string name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"></string>
-        <string name="android.permission.GRANT_REVOKE_PERMISSIONS"></string>
-        <string name="android.permission.ACCESS_SURFACE_FLINGER"></string>
-        <string name="android.permission.READ_FRAME_BUFFER"></string>
-        <string name="android.permission.CONFIGURE_WIFI_DISPLAY"></string>
-        <string name="android.permission.CONTROL_WIFI_DISPLAY"></string>
-        <string name="android.permission.BRICK"></string>
-        <string name="android.permission.REBOOT"></string>
-        <string name="android.permission.DEVICE_POWER"></string>
-        <string name="android.permission.NET_TUNNELING"></string>
-        <string name="android.permission.FACTORY_TEST"></string>
-        <string name="android.permission.BROADCAST_PACKAGE_REMOVED"></string>
-        <string name="android.permission.BROADCAST_SMS"></string>
-        <string name="android.permission.BROADCAST_WAP_PUSH"></string>
-        <string name="android.permission.MASTER_CLEAR"></string>
-        <string name="android.permission.CALL_PRIVILEGED"></string>
-        <string name="android.permission.PERFORM_CDMA_PROVISIONING"></string>
-        <string name="android.permission.CONTROL_LOCATION_UPDATES"></string>
-        <string name="android.permission.ACCESS_CHECKIN_PROPERTIES"></string>
-        <string name="android.permission.PACKAGE_USAGE_STATS"></string>
-        <string name="android.permission.BATTERY_STATS"></string>
-        <string name="android.permission.BACKUP"></string>
-        <string name="android.permission.CONFIRM_FULL_BACKUP"></string>
-        <string name="android.permission.BIND_REMOTEVIEWS"></string>
-        <string name="android.permission.BIND_APPWIDGET"></string>
-        <string name="android.permission.BIND_KEYGUARD_APPWIDGET"></string>
-        <string name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"></string>
-        <string name="android.permission.CHANGE_BACKGROUND_DATA_SETTING"></string>
-        <string name="android.permission.GLOBAL_SEARCH"></string>
-        <string name="android.permission.GLOBAL_SEARCH_CONTROL"></string>
-        <string name="android.permission.SET_WALLPAPER_COMPONENT"></string>
-        <string name="android.permission.READ_DREAM_STATE"></string>
-        <string name="android.permission.WRITE_DREAM_STATE"></string>
-        <string name="android.permission.ACCESS_CACHE_FILESYSTEM"></string>
-        <string name="android.permission.COPY_PROTECTED_DATA"></string>
-        <string name="android.permission.CRYPT_KEEPER"></string>
-        <string name="android.permission.READ_NETWORK_USAGE_HISTORY"></string>
-        <string name="android.permission.MANAGE_NETWORK_POLICY"></string>
-        <string name="android.permission.MODIFY_NETWORK_ACCOUNTING"></string>
-        <string name="android.intent.category.MASTER_CLEAR.permission.C2D_MESSAGE"></string>
-        <string name="android.permission.PACKAGE_VERIFICATION_AGENT"></string>
-        <string name="android.permission.BIND_PACKAGE_VERIFIER"></string>
-        <string name="android.permission.SERIAL_PORT"></string>
-        <string name="android.permission.ACCESS_CONTENT_PROVIDERS_EXTERNALLY"></string>
-        <string name="android.permission.UPDATE_LOCK"></string>
-     */
-
     public static boolean isPermissionDeclaratedInManifest(Context context, String permission)
     {
         PackageManager pm = context.getPackageManager();
@@ -1568,12 +1449,11 @@ public class ActivityPermissions extends Activity
                 ArrayList<String> requestedPermissionsArrayList = new ArrayList<String>();
                 requestedPermissionsArrayList.addAll(requestedPermissionsList);
                 return (requestedPermissionsArrayList.contains(permission));
-//                Log.i(ExConsts.TAG, ""+requestedPermissionsArrayList);
             }
         }
         catch (PackageManager.NameNotFoundException e)
         {
-            e.printStackTrace();
+            Miscellaneous.logEvent("w", "ActivityPermissions", Log.getStackTraceString(e), 2);
         }
 
         return false;

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

@@ -30,14 +30,14 @@ public class ActivityVolumeTest extends Activity
 		instance = this;
 		
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_volume_test);
+		setContentView(R.layout.activity_volume_calibration);
 		
 		tvCurrentVolume = (TextView)findViewById(R.id.tvCurrentVolume);
 		etReferenceValue = (EditText)findViewById(R.id.etReferenceValue);
 		sbReferenceValue = (SeekBar)findViewById(R.id.sbReferenceValue);
-		tvVolumeTestExplanation = (TextView)findViewById(R.id.tvVolumeTestExplanation);
+		tvVolumeTestExplanation = (TextView)findViewById(R.id.tvVolumeCalibrationExplanation);
 		
-		tvVolumeTestExplanation.setText(String.format(getResources().getString(R.string.volumeTesterExplanation), String.valueOf(volumeRefreshInterval)));
+		tvVolumeTestExplanation.setText(String.format(getResources().getString(R.string.volumeCalibrationExplanation), String.valueOf(volumeRefreshInterval)));
 		
 		etReferenceValue.setText(String.valueOf(Settings.referenceValueForNoiseLevelMeasurements));
 		

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,12 +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", ActivityControlCenter.getSystemInfo(), 1);
 
 			startUpRoutine();
 
 			Intent myIntent = new Intent(this, ActivityMainTabLayout.class);
 			myPendingIntent = PendingIntent.getActivity(this, 0, myIntent, 0);
-			notificationBuilder = createDefaultNotificationBuilder();
+			notificationBuilder = createServiceNotificationBuilder();
 
 			updateNotification();
 
@@ -219,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
 		{
@@ -273,16 +279,7 @@ public class AutomationService extends Service implements OnInitListener
 
 	public void applySettingsAndRules()
 	{
-		if (Settings.useTextToSpeechOnNormal | Settings.useTextToSpeechOnSilent | Settings.useTextToSpeechOnVibrate)
-		{
-			if (ttsEngine == null)
-				ttsEngine = new TextToSpeech(this, this);
-		}
-		else
-		{
-			if (ttsEngine != null)
-				ttsEngine.shutdown();
-		}
+		checkForTtsEngine();
 
 		startLocationProvider();
 		ReceiverCoordinator.startAllReceivers();
@@ -305,7 +302,7 @@ public class AutomationService extends Service implements OnInitListener
 
 	public void checkForTtsEngine()
 	{
-		if (Settings.useTextToSpeechOnNormal | Settings.useTextToSpeechOnSilent | Settings.useTextToSpeechOnVibrate | Rule.isAnyRuleUsing(Action.Action_Enum.speakText))
+		if (Settings.useTextToSpeechOnNormal || Settings.useTextToSpeechOnSilent || Settings.useTextToSpeechOnVibrate || Rule.isAnyRuleUsing(Action.Action_Enum.speakText))
 		{
 			if (ttsEngine == null)
 				ttsEngine = new TextToSpeech(this, this);
@@ -324,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()
@@ -352,12 +355,8 @@ public class AutomationService extends Service implements OnInitListener
 				if(r.isRuleActive())
 				{
 					if(!r.haveEnoughPermissions())
-//					for (String permission : ActivityPermissions.getPermissionsForRule(r))
 					{
-//						if (!ActivityPermissions.havePermission(permission, AutomationService.this))
 						{
-//							r.setRuleActive(false);
-//							r.change(AutomationService.this);
 							if(!displayNotification)
 							{
 								displayNotification = true;
@@ -377,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);
 			}
 		}
 	}
@@ -401,19 +400,16 @@ 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);
 			}
 		}
 	}
 
 	public void cancelNotification()
 	{
-//		stopForeground(false);
 		NotificationManagerCompat.from(AutomationService.this).cancelAll();
-//		NotificationManagerCompat.from(AutomationService.this).cancel(ActivityPermissions.notificationIdPermissions);
-//		NotificationManagerCompat.from(AutomationService.this).cancel(AutomationService.notificationIdRestrictions);
 	}
 
 	protected void checkForMissingBackgroundLocationPermission()
@@ -426,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);
 		}
 	}
 
@@ -450,7 +446,6 @@ public class AutomationService extends Service implements OnInitListener
 	private void stopRoutine()
 	{
 		Miscellaneous.logEvent("i", "Service", "Stopping service...", 3);
-//		Log.i("STOP", "Stopping");
 		try
 		{
 			myLocationProvider.stopLocationService();
@@ -479,7 +474,6 @@ public class AutomationService extends Service implements OnInitListener
 		builder.setWhen(System.currentTimeMillis());
 		builder.setContentIntent(myPendingIntent);
 
-//		Notification defaultNotification = new Notification();
 		Notification defaultNotification = builder.build();
 
 		defaultNotification.icon = R.drawable.ic_launcher;
@@ -497,34 +491,9 @@ public class AutomationService extends Service implements OnInitListener
 //		defaultNotification.ledOffMS = 1500;
 
 		return builder;
-
-		/*NotificationManager mNotificationManager = (NotificationManager) AutomationService.getInstance().getSystemService(Context.NOTIFICATION_SERVICE);
-
-		NotificationCompat.Builder builder;
-			builder = new NotificationCompat.Builder(AutomationService.getInstance());
-
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-			builder.setCategory(Notification.CATEGORY_EVENT);
-
-		builder.setWhen(System.currentTimeMillis());
-
-		builder.setContentTitle("Automation");
-		builder.setSmallIcon(R.drawable.ic_launcher);
-//		builder.setContentText(textToDisplay);
-//		builder.setSmallIcon(icon);
-//		builder.setContentIntent(pendingIntent);
-//		builder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-		{
-			NotificationChannel channel = new NotificationChannel("notify_001", "Channel human readable title", NotificationManager.IMPORTANCE_DEFAULT);
-			mNotificationManager.createNotificationChannel(channel);
-		}
-
-		return builder;*/
 	}
 	
-	protected static NotificationCompat.Builder createDefaultNotificationBuilder()
+	protected static NotificationCompat.Builder createServiceNotificationBuilder()
 	{
 		NotificationManager mNotificationManager = (NotificationManager) AutomationService.getInstance().getSystemService(Context.NOTIFICATION_SERVICE);
 
@@ -532,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());
@@ -571,79 +540,68 @@ public class AutomationService extends Service implements OnInitListener
 		
 		if(instance != null)
 		{
-//			if(Settings.showIconWhenServiceIsRunning)
-//			{
-				Miscellaneous.logEvent("i", "Notification", "Request to update notification.", 4);
-				
-				String bodyText="";
-				String lastRuleString = "";
-				
-				if(PointOfInterest.getPointOfInterestCollection() != null && PointOfInterest.getPointOfInterestCollection().size() > 0)
-				{
-					try
-					{
-						PointOfInterest activePoi = PointOfInterest.getActivePoi();
-						if(activePoi == null)
-						{
-							PointOfInterest closestPoi = PointOfInterest.getClosestPOI(instance.getLocationProvider().getCurrentLocation());
-							bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + AutomationService.getInstance().getResources().getString(R.string.none) + "\n" + AutomationService.getInstance().getResources().getString(R.string.closestPoi) + ": " + closestPoi.getName() + lastRuleString;
-						}
-						else
-						{
-							bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + activePoi.getName() + lastRuleString;
-						}
-					}
-					catch(NullPointerException e)
-					{
-						if(
-								Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest)
-										&&
-								ActivityPermissions.havePermission(Manifest.permission.ACCESS_COARSE_LOCATION, AutomationService.getInstance())
-										&&
-								ActivityPermissions.havePermission(Manifest.permission.ACCESS_FINE_LOCATION, AutomationService.getInstance())
-						  )
-							bodyText = instance.getResources().getString(R.string.stillGettingPosition);
-						else
-							bodyText = instance.getResources().getString(R.string.locationEngineNotActive);
-					}
-				}
-		
+			Miscellaneous.logEvent("i", "Notification", "Request to update notification.", 4);
+
+			String bodyText="";
+			String lastRuleString = "";
+
+			if(PointOfInterest.getPointOfInterestCollection() != null && PointOfInterest.getPointOfInterestCollection().size() > 0)
+			{
 				try
 				{
-					lastRuleString = instance.getResources().getString(R.string.lastRule) + " " + Rule.getLastActivatedRule().getName()  + " " + instance.getResources().getString(R.string.at) + " " + Rule.getLastActivatedRuleActivationTime().toLocaleString();
+					PointOfInterest activePoi = PointOfInterest.getActivePoi();
+					if(activePoi == null)
+					{
+						PointOfInterest closestPoi = PointOfInterest.getClosestPOI(instance.getLocationProvider().getCurrentLocation());
+						bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + AutomationService.getInstance().getResources().getString(R.string.none) + "\n" + AutomationService.getInstance().getResources().getString(R.string.closestPoi) + ": " + closestPoi.getName() + lastRuleString;
+					}
+					else
+					{
+						bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + activePoi.getName() + lastRuleString;
+					}
 				}
-				catch(Exception e)
+				catch(NullPointerException e)
 				{
-					lastRuleString = instance.getResources().getString(R.string.lastRule) + " n./a.";
+					if(
+							Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest)
+									&&
+							ActivityPermissions.havePermission(Manifest.permission.ACCESS_COARSE_LOCATION, AutomationService.getInstance())
+									&&
+							ActivityPermissions.havePermission(Manifest.permission.ACCESS_FINE_LOCATION, AutomationService.getInstance())
+					  )
+						bodyText = instance.getResources().getString(R.string.stillGettingPosition);
+					else
+						bodyText = instance.getResources().getString(R.string.locationEngineNotActive);
 				}
+			}
 
-				String textToDisplay = bodyText + " " + lastRuleString;
-//				if(Build.VERSION.SDK_INT < 11)
-//				{
-//					myNotification.setLatestEventInfo(instance, "Automation", textToDisplay, myPendingIntent);
-//				}
-//				else
-//				{
-					if(notificationBuilder == null)
-							notificationBuilder = createDefaultNotificationBuilder();
+			try
+			{
+				lastRuleString = instance.getResources().getString(R.string.lastRule) + " " + Rule.getLastActivatedRule().getName()  + " " + instance.getResources().getString(R.string.at) + " " + Rule.getLastActivatedRuleActivationTime().toLocaleString();
+			}
+			catch(Exception e)
+			{
+				lastRuleString = instance.getResources().getString(R.string.lastRule) + " n./a.";
+			}
 
-					notificationBuilder.setContentText(textToDisplay);
-					notificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
+			String textToDisplay = bodyText + " " + lastRuleString;
 
-					myNotification = notificationBuilder.build();
-                    myNotification.defaults = 0;
-//				}
+			if(notificationBuilder == null)
+					notificationBuilder = createServiceNotificationBuilder();
+
+			notificationBuilder.setContentText(textToDisplay);
+			notificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
+
+			myNotification = notificationBuilder.build();
+			myNotification.defaults = 0;
 
 //				NotificationManager notificationManager = (NotificationManager) instance.getSystemService(NOTIFICATION_SERVICE);
-			    // hide the notification after its selected
+			// hide the notification after its selected
 //				myNotification.flags |= Notification.FLAG_AUTO_CANCEL;
-				myNotification.flags |= Notification.FLAG_NO_CLEAR;
+			myNotification.flags |= Notification.FLAG_NO_CLEAR;
 //			    notificationManager.notify(notificationId, myNotification);
 
-				instance.startForeground(notificationId, myNotification);
-//			}
-//			else
-//				instance.startForeground(notificationId, null);		// do not show icon in task bar
+			instance.startForeground(notificationId, myNotification);
 		}
 	}
 
@@ -667,18 +625,18 @@ public class AutomationService extends Service implements OnInitListener
 	 **/
 	public void speak(String text, boolean force)
 	{
-		if(text.length() > 0 && (force | Settings.useTextToSpeechOnNormal | Settings.useTextToSpeechOnSilent | Settings.useTextToSpeechOnVibrate))
+		if(text.length() > 0 && (force || Settings.useTextToSpeechOnNormal || Settings.useTextToSpeechOnSilent || Settings.useTextToSpeechOnVibrate))
 		{
 			AudioManager myAudioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
 			int mode = myAudioManager.getRingerMode();
 			
 			if(
 					(mode == AudioManager.RINGER_MODE_NORMAL && Settings.useTextToSpeechOnNormal)
-												|
+												||
 					(mode == AudioManager.RINGER_MODE_VIBRATE && Settings.useTextToSpeechOnVibrate)
-												|
+												||
 					(mode == AudioManager.RINGER_MODE_SILENT && Settings.useTextToSpeechOnSilent)
-												|
+												||
 											  force
 				)
 			{
@@ -708,12 +666,12 @@ public class AutomationService extends Service implements OnInitListener
 								{}
 							}
 						}
+						Miscellaneous.logEvent("i", "TextToSpeech", "Speaking " + text + " in language " + ttsEngine.getLanguage().toLanguageTag(), 3);
 						this.ttsEngine.speak(text, TextToSpeech.QUEUE_ADD, null);
 					}
 					catch(Exception e)
 					{
 						Miscellaneous.logEvent("e", "TextToSpeech", Log.getStackTraceString(e), 3);
-						e.printStackTrace();
 					}
 				}
 			}
@@ -726,31 +684,6 @@ public class AutomationService extends Service implements OnInitListener
 			 return false;
 		 else
 			 return true;
-		 
-//		 boolean isActivityFound = false;
-//		 ActivityManager activityManager = (ActivityManager)context.getSystemService (Context.ACTIVITY_SERVICE); 
-//	     List<RunningTaskInfo> activitys = activityManager.getRunningTasks(Integer.MAX_VALUE); 
-//	     isActivityFound = false; 
-//	     for (int i = 0; i < activitys.size(); i++)
-//	     { 
-//	         if (activitys.get(i).topActivity.toString().equalsIgnoreCase("ComponentInfo{com.jens.automation/com.jens.automation.ActivityMainScreen}"))
-//	         {
-//	             isActivityFound = true;
-//	         }
-//	     } 
-//	     Miscellaneous.logEvent("i", "ActivityMainScreen", "Activity running status: " + String.valueOf(isActivityFound), 5);
-//	     return isActivityFound;
-		 
-//		ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-//		List<RunningTaskInfo> tasks = activityManager.getRunningTasks(Integer.MAX_VALUE);
-//		
-//		for (RunningTaskInfo task : tasks)
-//		{
-//		    if (context.getPackageName().equalsIgnoreCase(task.baseActivity.getPackageName())) 
-//		        return true;                                  
-//		}
-//		
-//		return false;
 	 }
 	
 	public static boolean isMyServiceRunning(Context context)
@@ -762,7 +695,6 @@ public class AutomationService extends Service implements OnInitListener
 		    {
 		        if(AutomationService.class.getName().equals(service.service.getClassName()))
 		        {
-//		            return AutomationService.getInstance() != null && AutomationService.getInstance().isRunning;
 		            return true;
 		        }
 		    }
@@ -771,9 +703,8 @@ public class AutomationService extends Service implements OnInitListener
 		{
 			if(Log.getStackTraceString(e).contains("activate"))	// Means that a poi has been activated/deactivated. Service is running.
 				return true;
-//			return AutomationService.getInstance() != null && AutomationService.getInstance().isRunning;
 		}
 
 	    return false;
 	}
-}
+}

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

@@ -0,0 +1,22 @@
+package com.jens.automation2;
+
+import android.app.admin.DeviceAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class DeviceAdmin extends DeviceAdminReceiver
+{
+    @Override
+    public void onEnabled (Context context , Intent intent)
+    {
+        super.onEnabled(context , intent) ;
+        Miscellaneous.logEvent("i", "DeviceAdmin", "Got permission BIND_DEVICE_ADMIN.", 3);
+    }
+
+    @Override
+    public void onDisabled (Context context , Intent intent)
+    {
+        super.onDisabled(context , intent) ;
+        Miscellaneous.logEvent("i", "DeviceAdmin", "Permission BIND_DEVICE_ADMIN taken.", 3);
+    }
+}

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

@@ -8,13 +8,16 @@ 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;
 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;
@@ -22,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;
@@ -71,16 +75,23 @@ 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;
 import java.sql.Time;
+import java.text.DateFormat;
+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;
@@ -95,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;
@@ -213,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
@@ -541,6 +557,22 @@ public class Miscellaneous extends Service
 		
 		return null;
 	}
+
+	public static boolean isDarkModeEnabled(Context context)
+	{
+		int mode = context.getResources().getConfiguration().uiMode;
+		switch(mode)
+		{
+			case 33:
+			case Configuration.UI_MODE_NIGHT_YES:
+				return true;
+			case 17:
+			case Configuration.UI_MODE_NIGHT_NO:
+			case Configuration.UI_MODE_NIGHT_UNDEFINED:
+			default:
+				return false;
+		}
+	}
 	
 	@SuppressLint("NewApi")
 	public static String replaceVariablesInText(String source, Context context) throws Exception
@@ -604,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);
 			}
 		}
 		
@@ -850,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?
@@ -876,7 +924,7 @@ public class Miscellaneous extends Service
 				catch(Exception e)
 				{}
 
-				createDismissableNotification(textToDisplay, notificationId, pendingIntent);
+				createDismissibleNotification(title, textToDisplay, notificationId, true, notificationChannelId, pendingIntent);
 
 				return null;
 			}
@@ -897,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);
 
@@ -938,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));
@@ -968,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);
 //
@@ -990,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);
 
@@ -998,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());
@@ -1046,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;
@@ -1066,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);
@@ -1078,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();
@@ -1098,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)