store descriptions

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

.gitignore

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

.idea/codeStyles/Project.xml

@@ -0,0 +1,117 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

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 102
-        versionName "1.6.30"
+        versionCode 120
+        versionName "1.7.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -28,51 +28,53 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-
     flavorDimensions "version"
 
     productFlavors
-            {
-                googlePlayFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".googlePlay"
-                            versionNameSuffix "-googlePlay"
-                            targetSdkVersion 29
-                        }
+    {
+        googlePlayFlavor
+        {
+            dimension "version"
+            versionNameSuffix "-googlePlay"
+            targetSdkVersion 30
+        }
 
-                fdroidFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".fdroid"
-//                            versionNameSuffix "-fdroid"
-                            targetSdkVersion 28
-                        }
+        fdroidFlavor
+        {
+            dimension "version"
+            targetSdkVersion 28
+        }
 
-                apkFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".apk"
-                            versionNameSuffix "-apk"
-                            targetSdkVersion 28
-                        }
-            }
+        apkFlavor
+        {
+            dimension "version"
+            versionNameSuffix "-apk"
+            targetSdkVersion 28
+        }
+    }
+    lint {
+        abortOnError false
+        checkReleaseBuilds false
+    }
+    namespace 'com.jens.automation2'
 }
 
 dependencies {
-    googlePlayFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0'
-    googlePlayFlavorImplementation 'com.google.android.gms:play-services-location:17.1.0'
+    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'
 
-    apkFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0'
-    apkFlavorImplementation 'com.google.android.gms:play-services-location:17.1.0'
+    apkFlavorImplementation 'com.google.firebase:firebase-appindexing:20.0.0'
+    apkFlavorImplementation 'com.google.android.gms:play-services-location:18.0.0'
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
+    implementation  'org.apache.commons:commons-lang3:3.0'
+
+    //implementation "androidx.security:security-crypto:1.0.0"
+    //implementation "androidx.security:security-identity-credential:1.0.0-alpha02"
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.3.0'
     testImplementation 'junit:junit:4.+'
-    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

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

app/src/apkFlavor/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jens.automation2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <supports-screens
         android:anyDensity="true"
@@ -51,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,8 +63,9 @@
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
-
-    <!-- Commented out because of Google Play policy -->
+    <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,12 +73,18 @@
     <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"
         android:allowClearUserData="true"
         android:icon="@drawable/gears"
-        android:label="@string/title_activity_main"
+        android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
 
@@ -96,15 +103,15 @@
             android:label="@string/app_name"></activity>
         <activity
             android:name=".ActivityManagePoi"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/app_name"></activity>
         <activity
             android:name=".ActivitySettings"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/app_name"></activity>
 
         <service
             android:name=".AutomationService"
             android:exported="false"
-            android:label="@string/title_activity_main" />
+            android:label="@string/app_name" />
 
         <receiver android:name=".receivers.StartupIntentReceiver" android:enabled="true" android:exported="true">
             <intent-filter>
@@ -121,29 +128,47 @@
         <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=".ActivityControlCenter" />
+        <activity android:name=".ActivityManageTriggerPhoneCall" />
+        <activity android:name=".ActivityManageTriggerBroadcast" />
         <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=".ActivityManageActionSendBroadcast" />
+        <activity android:name=".ActivityManageActionRunExecutable" />
+        <activity android:name=".ActivityManageActionWifi" />
+        <activity android:name=".ActivityManageTriggerTethering" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -183,30 +208,14 @@
         <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" />
+        <activity android:name=".ActivityManageTriggerWifi" />
         <activity android:name=".ActivityVolumeTest" />
-
-        <service
-            android:name=".receivers.ActivityDetectionReceiver"
-            android:exported="false"
-            android:label="@string/app_name"></service>
-
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
         <activity android:name=".ActivityPermissions"></activity>
-
-
-<!--        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"/>
-
-        <service android:name=".location.GeofenceIntentService"/>
-
-
-        <activity android:name=".ActivityManageTriggerNotification"></activity>
+        <activity android:name=".ActivityManageTriggerNotification" />
 
         <service
             android:name=".receivers.NotificationListener"
@@ -218,6 +227,23 @@
 
         </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"/>
+
+
+        <service
+            android:name=".receivers.ActivityDetectionReceiver"
+            android:exported="false"
+            android:label="@string/app_name"></service>
+
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+        <service android:name=".location.GeofenceIntentService"/>
+
+
         <provider
             android:name=".FileShareProvider"
             android:authorities="com.jens.automation2"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jens.automation2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <supports-screens
         android:anyDensity="true"
@@ -51,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" />
@@ -60,6 +60,10 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <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"
@@ -67,12 +71,18 @@
     <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"
         android:allowClearUserData="true"
         android:icon="@drawable/gears"
-        android:label="@string/title_activity_main"
+        android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
 
@@ -91,15 +101,15 @@
             android:label="@string/app_name"></activity>
         <activity
             android:name=".ActivityManagePoi"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/app_name"></activity>
         <activity
             android:name=".ActivitySettings"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/app_name"></activity>
 
         <service
             android:name=".AutomationService"
             android:exported="false"
-            android:label="@string/title_activity_main" />
+            android:label="@string/app_name" />
 
         <receiver android:name=".receivers.StartupIntentReceiver" android:enabled="true" android:exported="true">
             <intent-filter>
@@ -116,28 +126,47 @@
         <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=".ActivityControlCenter" />
+        <activity android:name=".ActivityManageTriggerPhoneCall" />
+        <activity android:name=".ActivityManageTriggerBroadcast" />
         <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=".ActivityManageActionSendBroadcast" />
+        <activity android:name=".ActivityManageActionRunExecutable" />
+        <activity android:name=".ActivityManageActionWifi" />
+        <activity android:name=".ActivityManageTriggerTethering" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -164,6 +193,7 @@
 			</intent-filter>
             -->
 
+
             <!--
                  <meta-data
 		        android:name="android.nfc.action.TECH_DISCOVERED"
@@ -180,6 +210,7 @@
         <activity android:name=".ActivityManageTriggerBluetooth" />
         <activity android:name=".ActivityMainProfiles" />
         <activity android:name=".ActivityManageProfile" />
+        <activity android:name=".ActivityManageTriggerWifi" />
         <activity android:name=".ActivityVolumeTest" />
         <activity android:name=".ActivityPermissions"></activity>
         <activity android:name=".ActivityManageTriggerNotification" />
@@ -194,6 +225,9 @@
 
         </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"/>
 
         <provider

app/src/googlePlayFlavor/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jens.automation2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <supports-screens
         android:anyDensity="true"
@@ -50,6 +49,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" />
@@ -61,12 +61,15 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <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"/>
 
     <application
         android:allowBackup="true"
         android:allowClearUserData="true"
         android:icon="@drawable/gears"
-        android:label="@string/title_activity_main"
+        android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
 
@@ -85,15 +88,15 @@
             android:label="@string/app_name"></activity>
         <activity
             android:name=".ActivityManagePoi"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/app_name"></activity>
         <activity
             android:name=".ActivitySettings"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/app_name"></activity>
 
         <service
             android:name=".AutomationService"
             android:exported="false"
-            android:label="@string/title_activity_main" />
+            android:label="@string/app_name" />
 
         <receiver android:name=".receivers.StartupIntentReceiver" android:enabled="true" android:exported="true">
             <intent-filter>
@@ -110,29 +113,47 @@
         <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=".ActivityControlCenter" />
+        <activity android:name=".ActivityManageTriggerPhoneCall" />
+        <activity android:name=".ActivityManageTriggerBroadcast" />
         <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=".ActivityManageActionSendBroadcast" />
+        <activity android:name=".ActivityManageActionRunExecutable" />
+        <activity android:name=".ActivityManageActionWifi" />
+        <activity android:name=".ActivityManageTriggerTethering" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -172,12 +193,14 @@
         <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" />
+        <activity android:name=".ActivityManageTriggerWifi" />
         <activity android:name=".ActivityVolumeTest" />
         <activity android:name=".ActivityPermissions"></activity>
-        <activity android:name=".ActivityManageTriggerNotification"></activity>
+        <activity android:name=".ActivityManageTriggerNotification" />
 
         <service
             android:name=".receivers.NotificationListener"
@@ -189,6 +212,12 @@
 
         </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"/>
+
+
         <service
             android:name=".receivers.ActivityDetectionReceiver"
             android:exported="false"
@@ -197,12 +226,8 @@
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
-
-        <activity android:name=".ActivityPermissions"></activity>
-
         <service android:name=".location.GeofenceIntentService"/>
 
-        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 
         <provider
             android:name=".FileShareProvider"

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/AndroidManifest.xml

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

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

@@ -2,10 +2,13 @@ package com.jens.automation2;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.text.style.TabStopSpan;
+import android.os.Build;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.RequiresApi;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.HttpGet;
 
 import java.util.ArrayList;
@@ -14,95 +17,121 @@ import java.util.Locale;
 
 public class Action
 {
-	public static final String actionParameter2Split = "ap2split";
+	Rule parentRule = null;
 
-	public enum Action_Enum {	
-								setWifi,
-								setBluetooth,
-								setUsbTethering,
-								setWifiTethering,
-								setDisplayRotation,
-								turnWifiOn,turnWifiOff,
-								turnBluetoothOn,turnBluetoothOff,
-								triggerUrl,
-								changeSoundProfile,
-								turnUsbTetheringOn,turnUsbTetheringOff,
-								turnWifiTetheringOn,turnWifiTetheringOff,
-								enableScreenRotation, disableScreenRotation,
-								startOtherActivity,
-								waitBeforeNextAction,
-								wakeupDevice,
-								setAirplaneMode,
-								setDataConnection,
-								speakText,
-								playMusic,
-								setScreenBrightness,
-								playSound,
-								sendTextMessage;
-								
-								public String getFullName(Context context)
-								{
-									switch(this)
-									{
-										case setWifi:
-											return context.getResources().getString(R.string.actionSetWifi);
-										case setBluetooth:
-											return context.getResources().getString(R.string.actionSetBluetooth);
-										case setWifiTethering:
-											return context.getResources().getString(R.string.actionSetWifiTethering);
-										case setUsbTethering:
-											return context.getResources().getString(R.string.actionSetUsbTethering);
-										case setDisplayRotation:
-											return context.getResources().getString(R.string.actionSetDisplayRotation);
-										case turnWifiOn:
-											return context.getResources().getString(R.string.actionTurnWifiOn);
-										case turnWifiOff:
-											return context.getResources().getString(R.string.actionTurnWifiOff);
-										case turnBluetoothOn:
-											return context.getResources().getString(R.string.actionTurnBluetoothOn);
-										case turnBluetoothOff:
-											return context.getResources().getString(R.string.actionTurnBluetoothOff);
-										case triggerUrl:
-											return context.getResources().getString(R.string.actionTriggerUrl);
-										case changeSoundProfile:
-											return context.getResources().getString(R.string.actionChangeSoundProfile);
-										case turnUsbTetheringOn:
-											return context.getResources().getString(R.string.actionTurnUsbTetheringOn);
-										case turnUsbTetheringOff:
-											return context.getResources().getString(R.string.actionTurnUsbTetheringOff);
-										case turnWifiTetheringOn:
-											return context.getResources().getString(R.string.actionTurnWifiTetheringOn);
-										case turnWifiTetheringOff:
-											return context.getResources().getString(R.string.actionTurnWifiTetheringOff);
-										case enableScreenRotation:
-											return context.getResources().getString(R.string.actionEnableScreenRotation);
-										case disableScreenRotation:
-											return context.getResources().getString(R.string.actionDisableScreenRotation);
-										case startOtherActivity:
-											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 setAirplaneMode:
-											return context.getResources().getString(R.string.airplaneMode);
-										case setDataConnection:
-											return context.getResources().getString(R.string.actionDataConnection);
-										case speakText:
-											return context.getResources().getString(R.string.actionSpeakText);
-										case playMusic:
-											return context.getResources().getString(R.string.actionPlayMusic);
-										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);
-										default:
-											return "Unknown";
-									}
-								}
-							};
+	public static final String actionParameter2Split = "ap2split";
+	public static final String intentPairSeparator = "intPairSplit";
+	public static final String vibrateSeparator = ",";
+
+	public enum Action_Enum
+	{
+		setWifi,
+		setBluetooth,
+		setUsbTethering,
+		setWifiTethering,
+		setBluetoothTethering,
+		setDisplayRotation,
+		turnWifiOn,turnWifiOff,
+		turnBluetoothOn,turnBluetoothOff,
+		triggerUrl,
+		changeSoundProfile,
+		turnUsbTetheringOn,turnUsbTetheringOff,
+		turnWifiTetheringOn,turnWifiTetheringOff,
+		enableScreenRotation,disableScreenRotation,
+		startOtherActivity,
+		waitBeforeNextAction,
+		turnScreenOnOrOff,
+		setAirplaneMode,
+		setDataConnection,
+		speakText,
+		playMusic,
+		controlMediaPlayback,
+		setScreenBrightness,
+		playSound,
+		vibrate,
+		createNotification,
+		closeNotification,
+		sendBroadcast,
+		runExecutable,
+		sendTextMessage;
+
+		public String getFullName(Context context)
+		{
+			switch(this)
+			{
+				case setWifi:
+					return context.getResources().getString(R.string.actionSetWifi);
+				case setBluetooth:
+					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:
+					return context.getResources().getString(R.string.actionSetDisplayRotation);
+				case turnWifiOn:
+					return context.getResources().getString(R.string.actionTurnWifiOn);
+				case turnWifiOff:
+					return context.getResources().getString(R.string.actionTurnWifiOff);
+				case turnBluetoothOn:
+					return context.getResources().getString(R.string.actionTurnBluetoothOn);
+				case turnBluetoothOff:
+					return context.getResources().getString(R.string.actionTurnBluetoothOff);
+				case triggerUrl:
+					return context.getResources().getString(R.string.actionTriggerUrl);
+				case changeSoundProfile:
+					return context.getResources().getString(R.string.actionChangeSoundProfile);
+				case turnUsbTetheringOn:
+					return context.getResources().getString(R.string.actionTurnUsbTetheringOn);
+				case turnUsbTetheringOff:
+					return context.getResources().getString(R.string.actionTurnUsbTetheringOff);
+				case turnWifiTetheringOn:
+					return context.getResources().getString(R.string.actionTurnWifiTetheringOn);
+				case turnWifiTetheringOff:
+					return context.getResources().getString(R.string.actionTurnWifiTetheringOff);
+				case enableScreenRotation:
+					return context.getResources().getString(R.string.actionEnableScreenRotation);
+				case disableScreenRotation:
+					return context.getResources().getString(R.string.actionDisableScreenRotation);
+				case startOtherActivity:
+					return context.getResources().getString(R.string.startOtherActivity);
+				case waitBeforeNextAction:
+					return context.getResources().getString(R.string.waitBeforeNextAction);
+				case turnScreenOnOrOff:
+					return context.getResources().getString(R.string.turnScreenOnOrOff);
+				case vibrate:
+					return context.getResources().getString(R.string.vibrate);
+				case setAirplaneMode:
+					return context.getResources().getString(R.string.airplaneMode);
+				case setDataConnection:
+					return context.getResources().getString(R.string.actionDataConnection);
+				case speakText:
+					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);
+				case sendBroadcast:
+					return context.getResources().getString(R.string.sendBroadcast);
+				case runExecutable:
+					return context.getResources().getString(R.string.runExecutable);
+				default:
+					return "Unknown";
+			}
+		}
+	};
 	
 	private Action_Enum action;
 	private boolean parameter1 = false;
@@ -143,128 +172,223 @@ 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;
+				case sendBroadcast:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.sendBroadcast));
+					break;
+				case runExecutable:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.runExecutable));
+					break;
+				default:
+					returnString.append(action.toString());
 			}
-			else
-				returnString.append(": " + components[0]);
-		}
-		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.setWifi))
+			{
+				if(!StringUtils.isEmpty(this.parameter2))
+				{
+					boolean useRoot = Boolean.parseBoolean(this.parameter2);
+					if(useRoot)
+						returnString.append(" " + Miscellaneous.getAnyContext().getResources().getString(R.string.usingRoot));
+				}
+			}
+			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>();
@@ -329,7 +453,7 @@ public class Action
 		
 		return (String[])actionTypesList.toArray(new String[actionTypesList.size()]);
 	}
-	
+
 	public void run(Context context, boolean toggleActionIfPossible)
 	{
 		try
@@ -341,18 +465,11 @@ public class Action
 					 * Old version. Those checks should not be necessary anymore. Also they didn't work
 					 * because profiles were created with names like silent, vibrate  and normal.
 					 */
-//				if(this.getParameter2().equals("silent"))
-//					Actions.setSound(context, AudioManager.RINGER_MODE_SILENT);
-//				else if(this.getParameter2().equals("vibrate"))
-//					Actions.setSound(context, AudioManager.RINGER_MODE_VIBRATE);
-//				else if(this.getParameter2().equals("normal"))
-//					Actions.setSound(context, AudioManager.RINGER_MODE_NORMAL);
-//				else
-//				{
+
 					Profile p = Profile.getByName(this.getParameter2());
 					if (p != null)
 						p.activate(context);
-//				}
+
 					break;
 				case triggerUrl:
 					triggerUrl(context);
@@ -364,30 +481,43 @@ public class Action
 					Actions.setUsbTethering(context, getParameter1(), toggleActionIfPossible);
 					break;
 				case setWifi:
-					Actions.setWifi(context, getParameter1(), toggleActionIfPossible);
+					Actions.WifiStuff.setWifi(context, getParameter1(), toggleActionIfPossible);
 					break;
 				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;
 				case startOtherActivity:
-					Actions.startOtherActivity(getParameter2());
+					Actions.startOtherActivity(getParameter1(), getParameter2());
 					break;
 				case waitBeforeNextAction:
 					Actions.waitBeforeNextAction(Long.parseLong(this.getParameter2()));
 					break;
-				case wakeupDevice:
-					Actions.wakeupDevice(Long.parseLong(this.getParameter2()));
-					// wakeupDevice() will create a seperate 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:
@@ -402,15 +532,40 @@ 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;
 				case setScreenBrightness:
 					Actions.setScreenBrightness(getParameter1(), Integer.parseInt(getParameter2()));
 					break;
+				case vibrate:
+					Actions.vibrate(getParameter1(), getParameter2());
+					break;
 				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;
+				case sendBroadcast:
+					Actions.sendBroadcast(context, this.getParameter2());
+					break;
+				case runExecutable:
+					String[] execParts = this.getParameter2().split(Action.actionParameter2Split);
+					if(execParts.length == 1)
+						Actions.runExecutable(context, this.getParameter1(), execParts[0], null);
+					else if(execParts.length == 2)
+						Actions.runExecutable(context, this.getParameter1(), execParts[0], execParts[1]);
+					break;
 				default:
 					Miscellaneous.logEvent("w", "Action", context.getResources().getString(R.string.unknownActionSpecified), 3);
 					break;
@@ -455,7 +610,7 @@ public class Action
 		}
 		catch(Exception e)
 		{
-			Miscellaneous.logEvent("e", "triggerUrl", context.getResources().getString(R.string.errorTriggeringUrl) + ": " + e.getMessage() + ", detailed: " + Log.getStackTraceString(e), 2);
+			Miscellaneous.logEvent("e", "triggerUrl", context.getResources().getString(R.string.logErrorTriggeringUrl) + ": " + e.getMessage() + ", detailed: " + Log.getStackTraceString(e), 2);
 		}
 	}	
 	
@@ -486,62 +641,24 @@ public class Action
 	    	while(attempts <= Settings.httpAttempts && response.equals("httpError"))
 	    	{
 	    		Miscellaneous.logEvent("i", "HTTP Request", "Attempt " + String.valueOf(attempts++) + " of " + String.valueOf(Settings.httpAttempts), 3);
-	    		
-//				try
-//				{
-					// Either thorough checking or no encryption
-					if(!Settings.httpAcceptAllCertificates | !urlString.toLowerCase(Locale.getDefault()).contains("https"))
-//					{
-//						URL url = new URL(urlString);
-//						URLConnection urlConnection = url.openConnection();
-//						urlConnection.setReadTimeout(Settings.httpAttemptsTimeout * 1000);
-//						InputStream in = urlConnection.getInputStream();
-//						response = Miscellaneous.convertStreamToString(in);
-						
-						response = Miscellaneous.downloadURL(urlString, urlUsername, urlPassword);
-//					}
-					else
-//					{
-						response = Miscellaneous.downloadURLwithoutCertificateChecking(urlString, urlUsername, urlPassword);
-//						post = new HttpGet(new URI(urlString));
-//						final HttpParams httpParams = new BasicHttpParams();
-//					    HttpConnectionParams.setConnectionTimeout(httpParams, Settings.httpAttemptsTimeout * 1000);
-//						HttpClient client = new DefaultHttpClient(httpParams);
-//
-//						client = sslClient(client);
-//						
-//						// Execute HTTP Post Request					 
-//						HttpResponse result = client.execute(post);
-//						response = EntityUtils.toString(result.getEntity());
-//					}
-//				}
-//				catch (URISyntaxException e)
-//				{
-//					Miscellaneous.logEvent("w", "HTTP RESULT", Log.getStackTraceString(e), 3);
-//				}
-//				catch (ClientProtocolException e)
-//				{
-//					Miscellaneous.logEvent("w", "HTTP RESULT", Log.getStackTraceString(e), 3);
-//				}
-//				catch (IOException e)
-//				{
-//					Miscellaneous.logEvent("w", "HTTP RESULT", Log.getStackTraceString(e), 3);
-//					e.printStackTrace();
-//				}
-//				finally
-//				{
-					try
-					{
-						Thread.sleep(Settings.httpAttemptGap * 1000);
-					}
-					catch (InterruptedException e1)
-					{
-						Miscellaneous.logEvent("w", "HTTP RESULT", "Failed to pause between HTTP requests.", 5);
-					}
-//				}
+
+				// Either thorough checking or no encryption
+				if(!Settings.httpAcceptAllCertificates || !urlString.toLowerCase(Locale.getDefault()).contains("https"))
+					response = Miscellaneous.downloadURL(urlString, urlUsername, urlPassword);
+				else
+					response = Miscellaneous.downloadURLwithoutCertificateChecking(urlString, urlUsername, urlPassword);
+
+				try
+				{
+					Thread.sleep(Settings.httpAttemptGap * 1000);
+				}
+				catch (InterruptedException e1)
+				{
+					Miscellaneous.logEvent("w", "HTTP RESULT", "Failed to pause between HTTP requests.", 5);
+				}
 	    	}
 	    	
-//	    	Miscellaneous.logEvent("i", "HTTPS RESULT", response, 3);
+	    	Miscellaneous.logEvent("i", "HTTPS RESULT", response, 5);
 			
 			return response;
 	    }
@@ -552,7 +669,7 @@ public class Action
 	        //Do something with result
 	    	//Toast.makeText(context, text, duration) result;
 	    	Miscellaneous.logEvent("i", "HTTP RESULT", result, 3);
-	    	Actions myAction=new Actions();
+	    	Actions myAction = new Actions();
 	    	myAction.useDownloadedWebpage(result);
 	    }
 	}

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

@@ -0,0 +1,416 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+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;
+
+import androidx.annotation.Nullable;
+import androidx.documentfile.provider.DocumentFile;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Locale;
+
+public class ActivityControlCenter extends Activity
+{
+    final static int requestCodeImport = 1001;
+    final static int requestCodeExport = 1002;
+    final static int requestCodeMoreSettings = 6000;
+
+    final static String prefsFileName = "com.jens.automation2_preferences.xml";
+
+    TextView tvFileStoreLocation, tvAppVersion;
+    Button bVolumeTest, bMoreSettings, bSettingsSetToDefault, bSendEmailToDev, bImportConfiguration, bExportConfiguration;
+    CheckBox chkShareConfigAndLog;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_control_center);
+
+        bVolumeTest = (Button) findViewById(R.id.bVolumeTest);
+        bVolumeTest.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent intent = new Intent(ActivityControlCenter.this, ActivityVolumeTest.class);
+                startActivity(intent);
+            }
+        });
+
+        chkShareConfigAndLog = (CheckBox)findViewById(R.id.chkShareConfigAndLog);
+        bSendEmailToDev = (Button) findViewById(R.id.bSendEmailToDev);
+        bSendEmailToDev.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                if(chkShareConfigAndLog.isChecked())
+                    getShareConfigAndLogDialogue(ActivityControlCenter.this).show();
+                else
+                {
+                    String subject = "Automation";
+                    Miscellaneous.sendEmail(ActivityControlCenter.this, "android-development@gmx.de", "Automation logs", getSystemInfo(), null);
+                }
+            }
+        });
+
+        bSettingsSetToDefault = (Button) findViewById(R.id.bSettingsSetToDefault);
+        bSettingsSetToDefault.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                getDefaultSettingsDialog(ActivityControlCenter.this).show();
+            }
+        });
+
+        bMoreSettings = (Button) findViewById(R.id.bMoreSettings);
+        bMoreSettings.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent myIntent = new Intent(ActivityControlCenter.this, ActivitySettings.class);
+                startActivityForResult(myIntent, requestCodeMoreSettings);
+            }
+        });
+
+        bImportConfiguration = (Button) findViewById(R.id.bImportConfiguration);
+        bImportConfiguration.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+                startActivityForResult(intent, requestCodeImport);
+            }
+        });
+
+        bExportConfiguration = (Button) findViewById(R.id.bExportConfiguration);
+        bExportConfiguration.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+                startActivityForResult(intent, requestCodeExport);
+            }
+        });
+
+        tvFileStoreLocation = (TextView)findViewById(R.id.tvFileStoreLocation);
+        tvAppVersion = (TextView)findViewById(R.id.tvAppVersion);
+
+        tvAppVersion.setText(
+                                "Version: " + BuildConfig.VERSION_NAME + Miscellaneous.lineSeparator +
+                                "Version code: " + String.valueOf(BuildConfig.VERSION_CODE) + Miscellaneous.lineSeparator +
+                                "Flavor: " + BuildConfig.FLAVOR
+                            );
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        switch(requestCode)
+        {
+            case requestCodeMoreSettings: //settings
+                Settings.readFromPersistentStorage(this);
+
+                if (AutomationService.isMyServiceRunning(this))
+                    AutomationService.getInstance().serviceInterface(AutomationService.serviceCommands.reloadSettings);
+
+                if (AutomationService.isMyServiceRunning(ActivityControlCenter.this))
+                    Toast.makeText(this, getResources().getString(R.string.settingsWillTakeTime), Toast.LENGTH_LONG).show();
+
+                break;
+            case requestCodeImport:
+                if(resultCode == RESULT_OK)
+                {
+                    Uri uriTree = data.getData();
+                    importFiles(uriTree);
+                }
+                break;
+            case requestCodeExport:
+                if(resultCode == RESULT_OK)
+                {
+                    Uri uriTree = data.getData();
+                    exportFiles(uriTree);
+                }
+                break;
+        }
+    }
+
+    void importFiles(Uri uriTree)
+    {
+//        https://stackoverflow.com/questions/46237558/android-strange-behavior-of-documentfile-inputstream
+
+        File dstRules = new File(Miscellaneous.getWriteableFolder() + "/" + XmlFileInterface.settingsFileName);
+        File dstPrefs = new File(Miscellaneous.getWriteableFolder() + "/../shared_prefs/" + prefsFileName);
+
+        DocumentFile directory = DocumentFile.fromTreeUri(this, uriTree);
+
+        int applicableFilesFound = 0;
+        int filesImported = 0;
+
+        if(directory.listFiles().length > 0)
+        {
+            for (DocumentFile file : directory.listFiles())
+            {
+                if (file.getName().equals(XmlFileInterface.settingsFileName))
+                {
+                    applicableFilesFound++;
+
+                    if(file.canRead())
+                    {
+                        // import rules, locations, etc.
+                        if (Miscellaneous.copyDocumentFileToFile(file, dstRules))
+                            filesImported++;
+                        else
+                            Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.rulesImportError), Toast.LENGTH_LONG).show();
+                    }
+                }
+                else if (file.getName().equals(prefsFileName))
+                {
+                    applicableFilesFound++;
+
+                    if(file.canRead())
+                    {
+                        // import rules, locations, etc.
+                        if (Miscellaneous.copyDocumentFileToFile(file, dstPrefs))
+                            filesImported++;
+                        else
+                            Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.prefsImportError), Toast.LENGTH_LONG).show();
+                    }
+                }
+            }
+
+            if(applicableFilesFound > 0)
+            {
+                if(filesImported == 0)
+                    Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
+                else if(filesImported < applicableFilesFound)
+                    Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.notAllFilesImported), Toast.LENGTH_LONG).show();
+                else if (filesImported == applicableFilesFound)
+                {
+                    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(ActivityControlCenter.this, getResources().getString(R.string.errorReadingPoisAndRulesFromFile), Toast.LENGTH_LONG).show();
+                    }
+
+                    Settings.readFromPersistentStorage(ActivityControlCenter.this);
+
+                    AutomationService service = AutomationService.getInstance();
+                    if(service != null && service.isRunning)
+                        service.applySettingsAndRules();
+                }
+                else
+                    Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
+            }
+            else
+                Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noApplicableFilesFoundInDirectory), Toast.LENGTH_LONG).show();
+        }
+        else
+            Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noApplicableFilesFoundInDirectory), Toast.LENGTH_LONG).show();
+    }
+
+    void exportFiles(Uri uriTree)
+    {
+        DocumentFile directory = DocumentFile.fromTreeUri(this, uriTree);
+
+        File srcRules = new File(Miscellaneous.getWriteableFolder() + "/" + XmlFileInterface.settingsFileName);
+        File srcPrefs = new File(Miscellaneous.getWriteableFolder() + "/../shared_prefs/" + prefsFileName);
+
+        // Clean up
+        for(DocumentFile file : directory.listFiles())
+        {
+            /*
+                On some few users' devices it seems this caused a crash because file.getName() was null.
+                The reason for that remains unknown, but we don't want the export to crash because of it.
+             */
+            if(!StringUtils.isEmpty(file.getName()))
+            {
+                if (file.getName().equals(XmlFileInterface.settingsFileName) && file.canWrite())
+                    file.delete();
+                else if (file.getName().equals(prefsFileName) && file.canWrite())
+                    file.delete();
+            }
+        }
+
+        DocumentFile dstRules = directory.createFile("text/xml", XmlFileInterface.settingsFileName);
+        DocumentFile dstPrefs = directory.createFile("text/xml", prefsFileName);
+
+        if(dstRules.canWrite() && dstPrefs.canWrite())
+        {
+            if(Miscellaneous.copyFileToDocumentFile(srcRules, dstRules) && Miscellaneous.copyFileToDocumentFile(srcPrefs, dstPrefs))
+                Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.configurationExportedSuccessfully), Toast.LENGTH_LONG).show();
+            else
+                Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.ConfigurationExportError), Toast.LENGTH_LONG).show();
+        }
+        else
+            Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.ConfigurationExportError), Toast.LENGTH_LONG).show();
+    }
+
+    private static AlertDialog getDefaultSettingsDialog(final Context context)
+    {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
+        alertDialogBuilder.setTitle(context.getResources().getString(R.string.areYouSure));
+        alertDialogBuilder.setPositiveButton(context.getResources().getString(R.string.yes), new DialogInterface.OnClickListener()
+        {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+                if (Settings.initializeSettings(context, true))
+                    Toast.makeText(context, context.getResources().getString(R.string.settingsSetToDefault), Toast.LENGTH_LONG).show();
+            }
+        });
+        alertDialogBuilder.setNegativeButton(context.getResources().getString(R.string.no), null);
+        AlertDialog alertDialog = alertDialogBuilder.create();
+
+        return alertDialog;
+    }
+
+    AlertDialog getShareConfigAndLogDialogue(final Context context)
+    {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
+        alertDialogBuilder.setTitle(context.getResources().getString(R.string.shareConfigAndLogFilesWithDev));
+        alertDialogBuilder.setMessage(context.getResources().getString(R.string.shareConfigAndLogExplanation));
+        alertDialogBuilder.setPositiveButton(context.getResources().getString(R.string.yes), new DialogInterface.OnClickListener()
+        {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+                File dstZipFile = new File(Miscellaneous.getAnyContext().getCacheDir() + "/" + Settings.zipFileName);
+
+                ArrayList<String> srcFilesList = new ArrayList<>();
+                srcFilesList.add(Miscellaneous.getWriteableFolder() + "/" + XmlFileInterface.settingsFileName);
+                srcFilesList.add(Miscellaneous.getWriteableFolder() + "/../shared_prefs/" + prefsFileName);
+
+                String logFilePath = Miscellaneous.getWriteableFolder() + "/" + Miscellaneous.logFileName;
+                if ((new File(logFilePath)).exists())
+                    srcFilesList.add(logFilePath);
+
+                String logFilePathArchive = Miscellaneous.getWriteableFolder() + "/" + Miscellaneous.logFileName + "-old";
+                if ((new File(logFilePathArchive)).exists())
+                    srcFilesList.add(logFilePathArchive);
+
+                String[] srcFiles = srcFilesList.toArray(new String[srcFilesList.size()]);
+
+                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.
+             */
+
+                String subject = "Automation logs";
+
+                Uri uri = Uri.parse("content://com.jens.automation2/" + Settings.zipFileName);
+
+                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("App details" + Miscellaneous.lineSeparator);
+        systemInfoText.append("Version name: " + BuildConfig.VERSION_NAME + Miscellaneous.lineSeparator);
+        systemInfoText.append("Version code: " + BuildConfig.VERSION_CODE + Miscellaneous.lineSeparator);
+        systemInfoText.append("Flavor: " + BuildConfig.FLAVOR + Miscellaneous.lineSeparator);
+        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("Target SDK: " + Miscellaneous.getAnyContext().getApplicationInfo().targetSdkVersion + 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("Rooted: " + String.valueOf(Miscellaneous.isPhoneRooted()) + Miscellaneous.lineSeparator);
+        systemInfoText.append("Country: " + Miscellaneous.getUserCountry(Miscellaneous.getAnyContext()) + Miscellaneous.lineSeparator);
+        systemInfoText.append("OS language: " + Locale.getDefault().getDisplayName() + Miscellaneous.lineSeparator);
+        systemInfoText.append("Logfile written: " + String.valueOf(Settings.writeLogFile) + Miscellaneous.lineSeparator);
+        systemInfoText.append("Log level: " + String.valueOf(Settings.logLevel));
+
+        /*
+            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()
+    {
+        super.onResume();
+
+        String folder = Miscellaneous.getWriteableFolder();
+        if (folder != null && folder.length() > 0)
+        {
+            tvFileStoreLocation.setText(String.format(getResources().getString(R.string.filesStoredAt), folder));
+            tvFileStoreLocation.setOnClickListener(new View.OnClickListener()
+            {
+                @Override
+                public void onClick(View v)
+                {
+                    Uri selectedUri = Uri.parse(folder);
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setDataAndType(selectedUri, "resource/folder");
+
+                    if (intent.resolveActivityInfo(getPackageManager(), 0) != null)
+                    {
+                        startActivity(intent);
+                    }
+                    else
+                    {
+                        // if you reach this place, it means there is no any file
+                        // explorer app installed on your device
+                        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/ActivityMainPoi.java

@@ -1,5 +1,6 @@
 package com.jens.automation2;
 
+import android.Manifest;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -60,11 +61,11 @@ public class ActivityMainPoi extends ActivityGeneric
 				}
 				else
 				{
-					if (!ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationCoarse, ActivityMainPoi.this) || !ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationFine, ActivityMainPoi.this))
+					if (!ActivityPermissions.havePermission(Manifest.permission.ACCESS_COARSE_LOCATION, ActivityMainPoi.this) || !ActivityPermissions.havePermission(Manifest.permission.ACCESS_FINE_LOCATION, ActivityMainPoi.this))
 					{
 						Intent permissionIntent = new Intent(ActivityMainPoi.this, ActivityPermissions.class);
 
-						permissionIntent.putExtra(ActivityPermissions.intentExtraName, new String[]{ActivityPermissions.permissionNameLocationCoarse, ActivityPermissions.permissionNameLocationFine});
+						permissionIntent.putExtra(ActivityPermissions.intentExtraName, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION});
 
 						startActivityForResult(permissionIntent, requestCodeForPermission);
 					}

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,17 +19,22 @@ 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;
 
 public class ActivityMainRules extends ActivityGeneric
 {
+	public static final String intentNameRuleName = "ruleName";
 	private ListView ruleListView;
+	ArrayList<Rule> ruleList = new ArrayList<>();
 	private ArrayAdapter<Rule> ruleListViewAdapter;
 	public static Rule ruleToEdit;
 	protected static ActivityMainRules instance = null;
 
+	public static final int requestCodeCreateRule = 3000;
+	public static final int requestCodeChangeRule = 4000;
+
 	public static ActivityMainRules getInstance()
 	{
 		if(instance == null)
@@ -52,21 +57,14 @@ public class ActivityMainRules extends ActivityGeneric
 			@Override
 			public void onClick(View v)
 			{
-//				if(!ActivityPermissions.havePermission(ActivityPermissions.writeExternalStoragePermissionName, ActivityMainRules.this))
-//				{
-//					Toast.makeText(ActivityMainRules.this, getResources().getString(R.string.appRequiresPermissiontoAccessExternalStorage), Toast.LENGTH_LONG).show();
-//					return;
-//				}
-
 				ruleToEdit = null;
 				Intent startAddRuleIntent = new Intent(ActivityMainRules.this, ActivityManageRule.class);
-				startActivityForResult(startAddRuleIntent, 3000);
+				startActivityForResult(startAddRuleIntent, requestCodeCreateRule);
 			}
 		});
-		
+
+		ruleListViewAdapter = new RuleArrayAdapter(this, R.layout.view_for_rule_listview, ruleList);
 		ruleListView = (ListView)findViewById(R.id.lvRuleList);
-		
-		ruleListViewAdapter = new RuleArrayAdapter(this, R.layout.view_for_rule_listview, Rule.getRuleCollection());
 		ruleListView.setClickable(true);
 
 		ruleListView.setOnItemLongClickListener(new OnItemLongClickListener()
@@ -112,7 +110,6 @@ public class ActivityMainRules extends ActivityGeneric
 	
 	private static class RuleArrayAdapter extends ArrayAdapter<Rule>
 	{
-
 		public RuleArrayAdapter(Context context, int resource, ArrayList<Rule> objects)
 		{
 			super(context, resource, objects);
@@ -139,7 +136,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())
@@ -163,13 +160,13 @@ public class ActivityMainRules extends ActivityGeneric
 		if(AutomationService.isMyServiceRunning(this))
 			bindToService();
 		
-		if(requestCode == 3000) //add Rule
+		if(requestCode == requestCodeCreateRule) //add Rule
 		{
 			ruleToEdit = null; //clear cache
 			updateListView();
 		}
 		
-		if(requestCode == 4000) //editRule
+		if(requestCode == requestCodeChangeRule) //editRule
 		{
 			ruleToEdit = null; //clear cache
 			updateListView();
@@ -190,7 +187,7 @@ public class ActivityMainRules extends ActivityGeneric
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
 		alertDialogBuilder.setTitle(getResources().getString(R.string.whatToDoWithRule));
-		alertDialogBuilder.setItems(new String[]{ getResources().getString(R.string.runManually), getResources().getString(R.string.edit), getResources().getString(R.string.deleteCapital) }, new DialogInterface.OnClickListener()
+		alertDialogBuilder.setItems(new String[]{ getResources().getString(R.string.runManually), getResources().getString(R.string.edit), getResources().getString(R.string.deleteCapital), getResources().getString(R.string.clone) }, new DialogInterface.OnClickListener()
 		{			
 			@Override
 			public void onClick(DialogInterface dialog, int which)
@@ -203,6 +200,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;
 							}
@@ -210,13 +208,24 @@ public class ActivityMainRules extends ActivityGeneric
 						Toast.makeText(ActivityMainRules.this, getResources().getString(R.string.serviceHasToRunForThat), Toast.LENGTH_LONG).show();
 						break;
 					case 1:
-						ruleToEdit = ruleThisIsAbout;
 						Intent manageSpecificRuleIntent = new Intent (ActivityMainRules.this, ActivityManageRule.class);
-						startActivityForResult(manageSpecificRuleIntent, 4000);
+						manageSpecificRuleIntent.putExtra(intentNameRuleName, ruleThisIsAbout.getName());
+						startActivityForResult(manageSpecificRuleIntent, requestCodeChangeRule);
 						break;
 					case 2:
 						if(ruleThisIsAbout.delete())
+						{
+							ruleToEdit = null; //clear cache
 							updateListView();
+						}
+						break;
+					case 3:
+						ruleToEdit = ruleThisIsAbout;
+						if(ruleToEdit.cloneRule(ActivityMainRules.this))
+						{
+							ruleToEdit = null; //clear cache
+							updateListView();
+						}
 						break;
 				}
 			}
@@ -229,6 +238,11 @@ public class ActivityMainRules extends ActivityGeneric
 	public void updateListView()
 	{
 		Miscellaneous.logEvent("i", "ListView", "Attempting to update RuleListView", 4);
+
+		ruleList.clear();
+		for(Rule r : Rule.getRuleCollection())
+			ruleList.add(r);
+
 		try
 		{
 			if(ruleListView.getAdapter() == null)
@@ -238,15 +252,5 @@ public class ActivityMainRules extends ActivityGeneric
 		}
 		catch(NullPointerException e)
 		{}
-		
-		try
-		{
-			if(AutomationService.isMyServiceRunning(this))
-				AlarmListener.reloadAlarms();
-		}
-		catch(NullPointerException e)
-		{
-			// AlarmManager instance not prepared, yet.
-		}
 	}
-}
+}

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

@@ -1,8 +1,8 @@
 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;
@@ -10,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;
@@ -30,25 +29,23 @@ import com.jens.automation2.AutomationService.serviceCommands;
 import com.jens.automation2.Trigger.Trigger_Enum;
 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, bSettingsSetToDefault, bVolumeTest, bAddSoundLockTIme, bShareConfigAndLog;
-	private TextView tvActivePoi, tvClosestPoi, tvLastRule, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvlockSoundDuration, tvFileStoreLocation;
+	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)
@@ -71,18 +68,20 @@ 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);
-		tvFileStoreLocation = (TextView)findViewById(R.id.tvFileStoreLocation);
+		tvLockSoundDuration = (TextView)findViewById(R.id.tvlockSoundDuration);
 		tbLockSound = (ToggleButton) findViewById(R.id.tbLockSound);
-		bVolumeTest = (Button) findViewById(R.id.bVolumeTest);
-		bSettingsSetToDefault = (Button) findViewById(R.id.bSettingsSetToDefault);
-		bShareConfigAndLog = (Button) findViewById(R.id.bShareConfigAndLog);
 		toggleService = (ToggleButton) findViewById(R.id.tbArmMastListener);
+		bDonate = (Button)findViewById(R.id.bDonate);
+
+		if(!BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_googleplay))
+			bDonate.setVisibility(View.VISIBLE);
+
 		toggleService.setChecked(AutomationService.isMyServiceRunning(this));
 		toggleService.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{
@@ -94,7 +93,8 @@ public class ActivityMainScreen extends ActivityGeneric
 					if (toggleService.isChecked())
 					{
 						startAutomationService(getBaseContext(), false);
-					} else
+					}
+					else
 					{
 						stopAutomationService();
 					}
@@ -112,6 +112,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
@@ -130,24 +142,14 @@ 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, ActivitySettings.class);
-				startActivityForResult(myIntent, 6000);
-			}
-		});
-
-		bVolumeTest.setOnClickListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				Intent intent = new Intent(ActivityMainScreen.this, ActivityVolumeTest.class);
-				startActivity(intent);
+				Intent myIntent = new Intent(ActivityMainScreen.this, ActivityControlCenter.class);
+				startActivity(myIntent);
 			}
 		});
 
@@ -183,24 +185,6 @@ public class ActivityMainScreen extends ActivityGeneric
 				builder.create().show();
 			}
 		});
-		
-		bSettingsSetToDefault.setOnClickListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				getDefaultSettingsDialog(ActivityMainScreen.this).show();
-			}
-		});
-
-		bShareConfigAndLog.setOnClickListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				getShareConfigAndLogDialogue(ActivityMainScreen.this).show();
-			}
-		});
 
 		lvRuleHistory.setOnTouchListener(new OnTouchListener()
 		{
@@ -264,81 +248,6 @@ public class ActivityMainScreen extends ActivityGeneric
 		return alertDialog;
 	}
 
-	private static AlertDialog getDefaultSettingsDialog(final Context context)
-	{
-		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
-		alertDialogBuilder.setTitle(context.getResources().getString(R.string.areYouSure));
-		alertDialogBuilder.setPositiveButton(context.getResources().getString(R.string.yes), new DialogInterface.OnClickListener()
-		{
-			@Override
-			public void onClick(DialogInterface dialog, int which)
-			{
-				if (Settings.initializeSettings(context, true))
-					Toast.makeText(context, context.getResources().getString(R.string.settingsSetToDefault), Toast.LENGTH_LONG).show();
-			}
-		});
-		alertDialogBuilder.setNegativeButton(context.getResources().getString(R.string.no), null);
-		AlertDialog alertDialog = alertDialogBuilder.create();
-
-		return alertDialog;
-	}
-
-	AlertDialog getShareConfigAndLogDialogue(final Context context)
-	{
-		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
-		alertDialogBuilder.setTitle(context.getResources().getString(R.string.shareConfigAndLogFilesWithDev));
-		alertDialogBuilder.setMessage(context.getResources().getString(R.string.shareConfigAndLogExplanation));
-		alertDialogBuilder.setPositiveButton(context.getResources().getString(R.string.yes), new DialogInterface.OnClickListener()
-		{
-			@Override
-			public void onClick(DialogInterface dialog, int which)
-			{
-				File dstZipFile = new File(Miscellaneous.getAnyContext().getCacheDir() + "/" + Settings.zipFileName);
-
-				ArrayList<String> srcFilesList = new ArrayList<>();
-				srcFilesList.add(Miscellaneous.getWriteableFolder() + "/" + XmlFileInterface.settingsFileName);
-
-				String logFilePath = Miscellaneous.getWriteableFolder() + "/" + Miscellaneous.logFileName;
-				if((new File(logFilePath)).exists())
-					srcFilesList.add(logFilePath);
-
-				String logFilePathArchive = Miscellaneous.getWriteableFolder() + "/" + Miscellaneous.logFileName + "-old";
-				if((new File(logFilePathArchive)).exists())
-					srcFilesList.add(logFilePathArchive);
-
-				String[] srcFiles = srcFilesList.toArray(new String[srcFilesList.size()]);
-
-				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.
-				 */
-
-				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);
-
-				Uri uri = Uri.parse("content://com.jens.automation2/" + Settings.zipFileName);
-
-				Miscellaneous.sendEmail(ActivityMainScreen.this, "android-development@gmx.de", "Automation logs", emailBody.toString(), uri);
-			}
-		});
-		alertDialogBuilder.setNegativeButton(context.getResources().getString(R.string.no), null);
-		AlertDialog alertDialog = alertDialogBuilder.create();
-
-		return alertDialog;
-	}
-
 	public static ActivityMainScreen getActivityMainScreenInstance()
 	{
 		return activityMainScreenInstance;
@@ -430,9 +339,9 @@ public class ActivityMainScreen extends ActivityGeneric
 						if(
 								Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest)
 										&&
-								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationCoarse, Miscellaneous.getAnyContext())
+								ActivityPermissions.havePermission(Manifest.permission.ACCESS_COARSE_LOCATION, Miscellaneous.getAnyContext())
 										&&
-								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationFine, Miscellaneous.getAnyContext())
+								ActivityPermissions.havePermission(Manifest.permission.ACCESS_FINE_LOCATION, Miscellaneous.getAnyContext())
 						  )
 							activityMainScreenInstance.tvActivePoi.setText(activityMainScreenInstance.getResources().getString(R.string.stillGettingPosition));
 						else
@@ -456,6 +365,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
 			{
@@ -464,6 +383,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;
@@ -481,21 +401,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;
@@ -513,36 +433,17 @@ public class ActivityMainScreen extends ActivityGeneric
 			else
 				activityMainScreenInstance.checkForNews();
 
+			if(BuildConfig.FLAVOR.equals("apkFlavor") && Settings.automaticUpdateCheck)
+			{
+				Calendar now = Calendar.getInstance();
+				if (Settings.lastUpdateCheck == Settings.default_lastUpdateCheck || now.getTimeInMillis() >= Settings.lastUpdateCheck + (long)(Settings.updateCheckFrequencyDays * 24 * 60 * 60 * 1000))
+				{
+					activityMainScreenInstance.checkForUpdate();
+				}
+			}
+
 			Settings.considerDone(Settings.constNewsOptInDone);
 			Settings.writeSettings(Miscellaneous.getAnyContext());
-
-			String folder = Miscellaneous.getWriteableFolder();
-			if(folder != null && folder.length() > 0)
-			{
-				activityMainScreenInstance.tvFileStoreLocation.setText(String.format(activityMainScreenInstance.getResources().getString(R.string.filesStoredAt), folder));
-				activityMainScreenInstance.tvFileStoreLocation.setOnClickListener(new OnClickListener()
-				{
-					@Override
-					public void onClick(View v)
-					{
-						Uri selectedUri = Uri.parse(folder);
-						Intent intent = new Intent(Intent.ACTION_VIEW);
-						intent.setDataAndType(selectedUri, "resource/folder");
-
-						if (intent.resolveActivityInfo(activityMainScreenInstance.getPackageManager(), 0) != null)
-						{
-							activityMainScreenInstance.startActivity(intent);
-						}
-						else
-						{
-							// if you reach this place, it means there is no any file
-							// explorer app installed on your device
-							Toast.makeText(activityMainScreenInstance, activityMainScreenInstance.getResources().getString(R.string.noFileManageInstalled), Toast.LENGTH_LONG).show();
-						}
-
-					}
-				});
-			}
 		}
 	}
 
@@ -598,16 +499,6 @@ public class ActivityMainScreen extends ActivityGeneric
 			case ActivityPermissions.requestCodeForPermissions:
 				updateMainScreen();
 				break;
-			case 6000: //settings
-				Settings.readFromPersistentStorage(this);
-
-				if (boundToService && AutomationService.isMyServiceRunning(this))
-					myAutomationService.serviceInterface(serviceCommands.reloadSettings);
-
-				if(AutomationService.isMyServiceRunning(ActivityMainScreen.this))
-					Toast.makeText(this, getResources().getString(R.string.settingsWillTakeTime), Toast.LENGTH_LONG).show();
-
-				break;
 		}
 
 		if (AutomationService.isMyServiceRunning(this))
@@ -732,6 +623,15 @@ public class ActivityMainScreen extends ActivityGeneric
 		Miscellaneous.messageBox(title, text, ActivityMainScreen.getActivityMainScreenInstance());
 	}
 
+	synchronized void checkForUpdate()
+	{
+		if(Settings.automaticUpdateCheck)
+		{
+			AsyncTasks.AsyncTaskUpdateCheck updateCheckTask = new AsyncTasks.AsyncTaskUpdateCheck();
+			updateCheckTask.execute(ActivityMainScreen.this);
+		}
+	}
+
 	synchronized void checkForNews()
 	{
 		if(Settings.displayNewsOnMainScreen)
@@ -761,4 +661,38 @@ public class ActivityMainScreen extends ActivityGeneric
 			Miscellaneous.logEvent("e", "Error displaying news", Log.getStackTraceString(e), 3);
 		}
 	}
+
+	public void processUpdateCheckResult(Boolean result)
+	{
+		if(result && !updateNoteDisplayed)
+		{
+			updateNoteDisplayed = true;
+
+			AlertDialog.Builder updateNoteBuilder = new AlertDialog.Builder(ActivityMainScreen.this);
+			updateNoteBuilder.setMessage(getResources().getString(R.string.updateAvailable));
+			updateNoteBuilder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener()
+			{
+				@Override
+				public void onClick(DialogInterface dialogInterface, int i)
+				{
+					String url = "https://server47.de/automation/";
+					Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+					startActivity(browserIntent);
+
+					updateNoteDisplayed = false;
+				}
+			});
+			updateNoteBuilder.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener()
+			{
+				@Override
+				public void onClick(DialogInterface dialogInterface, int i)
+				{
+					updateNoteDisplayed = false;
+				}
+			});
+			updateNoteBuilder.show();
+		}
+
+		AsyncTasks.AsyncTaskUpdateCheck.checkRunning = false;
+	}
 }

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

@@ -13,12 +13,17 @@ import com.jens.automation2.receivers.NfcReceiver;
 @SuppressLint("NewApi")
 public class ActivityMainTabLayout extends TabActivity
 {
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.main_tab_layout);
+
+		Settings.readFromPersistentStorage(ActivityMainTabLayout.this);
+
+		if(Settings.tabsPlacement == 1)
+			setContentView(R.layout.main_tab_layout_tabs_at_bottom);
+		else
+			setContentView(R.layout.main_tab_layout_tabs_at_top);
 		
 		TabHost tabHost = getTabHost();
 		
@@ -67,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,393 @@
+package com.jens.automation2;
+
+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.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;
+
+	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.directionStringDoesNotContain),
+									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/ActivityManageActionPlaySound.java

@@ -8,7 +8,6 @@ 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;
@@ -27,7 +26,7 @@ public class ActivityManageActionPlaySound extends Activity
     protected void onCreate(@Nullable Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_manage_play_sound);
+        setContentView(R.layout.activity_manage_action_play_sound);
 
         chkPlaySoundAlwaysPlay = (CheckBox)findViewById(R.id.chkPlaySoundAlwaysPlay);
         etSelectedSoundFile = (EditText)findViewById(R.id.etSelectedSoundFile);

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

@@ -0,0 +1,114 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+
+public class ActivityManageActionRunExecutable extends Activity
+{
+    final static int PICKFILE_RESULT_CODE = 4711;
+
+    CheckBox chkRunExecAsRoot;
+    EditText etRunExecutablePath, etRunExecutableParameters;
+    Button bChooseExecutable, bSaveActionRunExec;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_run_executable);
+
+        chkRunExecAsRoot = (CheckBox)findViewById(R.id.chkRunExecAsRoot);
+        etRunExecutablePath = (EditText) findViewById(R.id.etRunExecutablePath);
+        etRunExecutableParameters = (EditText) findViewById(R.id.etRunExecutableParameters);
+        bChooseExecutable = (Button) findViewById(R.id.bChooseExecutable);
+        bSaveActionRunExec = (Button) findViewById(R.id.bSaveActionRunExec);
+
+        bChooseExecutable.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                //Need to check for storage permissions
+                Intent chooseFile = new Intent(Intent.ACTION_GET_CONTENT);
+                chooseFile.setType("*/*");
+                chooseFile = Intent.createChooser(chooseFile, getResources().getString(R.string.selectSoundFile));
+                startActivityForResult(chooseFile, PICKFILE_RESULT_CODE);
+            }
+        });
+
+        bSaveActionRunExec.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                saveExecSettings();
+            }
+        });
+    }
+
+    void saveExecSettings()
+    {
+        if(etRunExecutablePath.getText().toString() == null || etRunExecutablePath.getText().toString().length() == 0)
+        {
+            Toast.makeText(ActivityManageActionRunExecutable.this, getResources().getString(R.string.selectValidExecutable), Toast.LENGTH_LONG).show();
+            return;
+        }
+        else
+        {
+            File executableFile = new File(etRunExecutablePath.getText().toString());
+            if(!executableFile.exists())
+            {
+                Toast.makeText(ActivityManageActionRunExecutable.this, getResources().getString(R.string.fileDoesNotExist), Toast.LENGTH_LONG).show();
+                return;
+            }
+            else
+            {
+                if(!chkRunExecAsRoot.isChecked() && !executableFile.canExecute())
+                {
+                    Toast.makeText(ActivityManageActionRunExecutable.this, getResources().getString(R.string.fileNotExecutable), Toast.LENGTH_LONG).show();
+                    return;
+                }
+            }
+        }
+
+        Intent returnData = new Intent();
+        returnData.putExtra(ActivityManageRule.intentNameActionParameter1, chkRunExecAsRoot.isChecked());
+
+        if(etRunExecutableParameters.getText() != null && !StringUtils.isEmpty(etRunExecutableParameters.getText().toString()))
+            returnData.putExtra(ActivityManageRule.intentNameActionParameter2, etRunExecutablePath.getText().toString() + Action.actionParameter2Split + etRunExecutableParameters.getText().toString());
+        else
+            returnData.putExtra(ActivityManageRule.intentNameActionParameter2, etRunExecutablePath.getText().toString());
+
+        setResult(RESULT_OK, returnData);
+        finish();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if(resultCode == RESULT_OK)
+        {
+            if(requestCode == PICKFILE_RESULT_CODE)
+            {
+                Uri fileUri = data.getData();
+                String filePath = CompensateCrappyAndroidPaths.getPath(ActivityManageActionRunExecutable.this, fileUri);
+                etRunExecutablePath.setText(filePath);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,256 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.InputType;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ActivityManageActionSendBroadcast extends Activity
+{
+    EditText etBroadcastToSend;
+    Button bBroadcastSendShowSuggestions, bSaveSendBroadcast, bAddIntentPair;
+    ListView lvIntentPairs;
+    EditText etParameterName, etParameterValue;
+    Spinner spinnerParameterType;
+    ArrayAdapter<String> intentTypeSpinnerAdapter, intentPairAdapter;
+    private static final String[] supportedIntentTypes = { "boolean", "byte", "char", "double", "float", "int", "long", "short", "String", "Uri" };
+    private ArrayList<String> intentPairList = new ArrayList<>();
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_send_broadcast);
+
+        etBroadcastToSend = (EditText)findViewById(R.id.etBroadcastToSend);
+        bBroadcastSendShowSuggestions = (Button)findViewById(R.id.bBroadcastSendShowSuggestions);
+        bSaveSendBroadcast = (Button)findViewById(R.id.bSaveSendBroadcast);
+        bAddIntentPair = (Button)findViewById(R.id.bAddIntentPair);
+        lvIntentPairs = (ListView) findViewById(R.id.lvIntentPairs);
+        etParameterName = (EditText) findViewById(R.id.etParameterName);
+        etParameterValue = (EditText) findViewById(R.id.etParameterValue);
+        spinnerParameterType = (Spinner) findViewById(R.id.spinnerParameterType);
+
+        intentTypeSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionSendBroadcast.supportedIntentTypes);
+        spinnerParameterType.setAdapter(intentTypeSpinnerAdapter);
+        intentTypeSpinnerAdapter.notifyDataSetChanged();
+        intentPairAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, intentPairList);
+
+        bSaveSendBroadcast.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                if(checkInput())
+                {
+                    Intent answer = new Intent();
+
+                    String param2 = etBroadcastToSend.getText().toString();
+
+                    if(intentPairList.size() > 0)
+                    {
+                        param2 += Action.actionParameter2Split;
+
+                        for (String s : intentPairList)
+                            param2 += s + ";";
+
+                        param2 = param2.substring(0, param2.length() - 1);
+                    }
+
+                    answer.putExtra(ActivityManageRule.intentNameActionParameter2, param2);
+                    setResult(RESULT_OK, answer);
+                    finish();
+                }
+            }
+        });
+
+        bBroadcastSendShowSuggestions.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                AlertDialog.Builder builder = new AlertDialog.Builder(ActivityManageActionSendBroadcast.this);
+                builder.setTitle(getResources().getString(R.string.selectBroadcast));
+                builder.setItems(ActivityManageTriggerBroadcast.broadcastSuggestions, new DialogInterface.OnClickListener()
+                {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int which)
+                    {
+                        etBroadcastToSend.setText(ActivityManageTriggerBroadcast.broadcastSuggestions[which]);
+                    }
+                });
+                builder.create().show();
+            }
+        });
+
+        Intent input = getIntent();
+
+        if(input.hasExtra(ActivityManageRule.intentNameActionParameter2))
+        {
+            String param2 = input.getStringExtra(ActivityManageRule.intentNameActionParameter2);
+            if(!param2.contains(Action.actionParameter2Split))
+                etBroadcastToSend.setText(input.getStringExtra(ActivityManageRule.intentNameActionParameter2));
+            else
+            {
+                String[] param2Parts = param2.split(Action.actionParameter2Split);
+                etBroadcastToSend.setText(param2Parts[0]);
+
+                String[] params = param2Parts[1].split(";");
+
+                intentPairList.clear();
+
+                for(int i = 0; i < params.length; i++)
+                {
+                    if(lvIntentPairs.getVisibility() != View.VISIBLE)
+                        lvIntentPairs.setVisibility(View.VISIBLE);
+
+                    intentPairList.add(params[i]);
+                }
+
+                updateIntentPairList();
+            }
+        }
+
+        bAddIntentPair.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                // type;name;value
+                if(spinnerParameterType.getSelectedItem().toString().length() == 0)
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                if(etParameterName.getText().toString().length() == 0)
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                else if(etParameterName.getText().toString().contains(Action.intentPairSeparator))
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                else if(etParameterName.getText().toString().contains(";"))
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                if(etParameterValue.getText().toString().length() == 0)
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                else if(etParameterValue.getText().toString().contains(Action.intentPairSeparator))
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                else if(etParameterValue.getText().toString().contains(";"))
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeparator + etParameterName.getText().toString() + Action.intentPairSeparator + etParameterValue.getText().toString();
+                intentPairList.add(param);
+
+                spinnerParameterType.setSelection(0);
+                etParameterName.setText("");
+                etParameterValue.setText("");
+
+                updateIntentPairList();
+
+                if(lvIntentPairs.getVisibility() != View.VISIBLE)
+                    lvIntentPairs.setVisibility(View.VISIBLE);
+            }
+        });
+
+        lvIntentPairs.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener()
+        {
+            @Override
+            public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2, long arg3)
+            {
+                getIntentPairDialog(arg2).show();
+                return false;
+            }
+        });
+
+        spinnerParameterType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
+        {
+            @Override
+            public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3)
+            {
+                if(supportedIntentTypes[arg2].equals("double") | supportedIntentTypes[arg2].equals("float") | supportedIntentTypes[arg2].equals("int") | supportedIntentTypes[arg2].equals("long") | supportedIntentTypes[arg2].equals("short"))
+                    ActivityManageActionSendBroadcast.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
+                else
+                    ActivityManageActionSendBroadcast.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> arg0)
+            {
+                // TODO Auto-generated method stub
+
+            }
+        });
+    }
+
+    boolean checkInput()
+    {
+        String broadcastToSend = etBroadcastToSend.getText().toString();
+        if(StringUtils.isEmpty(broadcastToSend))
+        {
+            Toast.makeText(ActivityManageActionSendBroadcast.this, getResources().getString(R.string.enterBroadcast), Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        return true;
+    }
+
+    private void updateIntentPairList()
+    {
+        if(lvIntentPairs.getAdapter() == null)
+            lvIntentPairs.setAdapter(intentPairAdapter);
+
+        intentPairAdapter.notifyDataSetChanged();
+    }
+
+    private AlertDialog getIntentPairDialog(final int itemPosition)
+    {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ActivityManageActionSendBroadcast.this);
+        alertDialogBuilder.setTitle(getResources().getString(R.string.whatToDoWithIntentPair));
+        alertDialogBuilder.setItems(new String[]{getResources().getString(R.string.delete)}, new DialogInterface.OnClickListener()
+        {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+                // Only 1 choice at the moment, no need to check
+                ActivityManageActionSendBroadcast.this.intentPairList.remove(itemPosition);
+                updateIntentPairList();
+            }
+        });
+        AlertDialog alertDialog = alertDialogBuilder.create();
+        return alertDialog;
+    }
+}

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;
@@ -25,6 +26,7 @@ public class ActivityManageActionSendTextMessage extends Activity
 	EditText etPhoneNumber, etSendTextMessage;
 
 	protected final static int requestCodeForContactsPermissions = 9876;
+	protected final static int requestCodeGetContact = 3235;
 	
 //	private String existingUrl = "";
 	
@@ -35,7 +37,7 @@ public class ActivityManageActionSendTextMessage extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		this.setContentView(R.layout.send_textmessage_editor);
+		this.setContentView(R.layout.activity_manage_action_send_textmessage);
 		
 		etSendTextMessage = (EditText)findViewById(R.id.etSendTextMessage);
 		etPhoneNumber = (EditText)findViewById(R.id.etPhoneNumber);
@@ -58,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();
 			}
 		});
 
@@ -83,20 +85,10 @@ public class ActivityManageActionSendTextMessage extends Activity
 			etPhoneNumber.setText(parameters[0]);
 			etSendTextMessage.setText(parameters[1]);
 		}
-		
-
-//		String url = getIntent().getStringExtra("urlToTrigger");
-//		if(url != null)
-//			existingUrl = url;
 	}
 	
 	private void backToRuleManager()
 	{
-//		Intent returnIntent = new Intent();
-//		returnIntent.putExtra("urlToTrigger", existingUrl);		
-		
-//		setResult(RESULT_OK, returnIntent);
-		
 		if(edit && resultingAction != null)
 		{
 			ActivityManageActionSendTextMessage.resultingAction.setParameter2(etPhoneNumber.getText().toString() + Actions.smsSeparator + etSendTextMessage.getText().toString());
@@ -132,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)
 					{
@@ -145,16 +137,14 @@ public class ActivityManageActionSendTextMessage extends Activity
 
 	private void openContactsDialogue()
 	{
-//		Toast.makeText(ActivityEditSendTextMessage.this, "Opening contacts dialogue", Toast.LENGTH_LONG).show();
-
-        Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Phone.CONTENT_URI);
-        startActivityForResult(intent, 1000);
+		Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Phone.CONTENT_URI);
+        startActivityForResult(intent, requestCodeGetContact);
 	}
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data)
     {
-        if(requestCode == 1000)
+        if(requestCode == requestCodeGetContact)
         {
             if(resultCode == Activity.RESULT_OK)
             {

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

@@ -15,8 +15,6 @@ public class ActivityManageActionSpeakText extends Activity
 	private Button bSaveSpeakText;
 	private EditText etSpeakText;
 	
-//	private String existingUrl = "";
-	
 	public static boolean edit = false;
 	public static Action resultingAction = null;
 	
@@ -24,10 +22,10 @@ public class ActivityManageActionSpeakText extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		this.setContentView(R.layout.speak_text_editor);
+		this.setContentView(R.layout.activity_manage_action_speak_text);
 		
 		etSpeakText = (EditText)findViewById(R.id.etTextToSpeak);
-		bSaveSpeakText = (Button)findViewById(R.id.bSaveTriggerUrl);
+		bSaveSpeakText = (Button)findViewById(R.id.bSaveSpeakText);
 		bSaveSpeakText.setOnClickListener(new OnClickListener()
 		{			
 			@Override
@@ -44,7 +42,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;
@@ -10,7 +11,9 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 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;
@@ -22,12 +25,15 @@ import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.RadioButton;
 import android.widget.Spinner;
-import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import com.jens.automation2.Action.Action_Enum;
 
 import java.util.ArrayList;
@@ -37,12 +43,219 @@ import java.util.List;
 
 public class ActivityManageActionStartActivity extends Activity
 {
+	/*
+		This page might qualify as a help page: https://stackoverflow.com/questions/55323947/open-url-in-firefox-for-android-using-intent
+	 */
+
 	ListView lvIntentPairs;
-	EditText etParameterName, etParameterValue, etSelectedActivity;
-	Button bSelectApp, bAddIntentPair, bSaveActionStartOtherActivity;
+	EditText etParameterName, etParameterValue, etPackageName, etActivityOrActionPath;
+	Button bSelectApp, bAddIntentPair, bSaveActionStartOtherActivity, showStartProgramExamples;
 	Spinner spinnerParameterType;
 	boolean edit = false;
 	ProgressDialog progressDialog = null;
+	RadioButton rbStartAppSelectByActivity, rbStartAppSelectByAction, rbStartAppByActivity, rbStartAppByBroadcast;
+
+	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;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_manage_action_start_activity);
+
+		lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs);
+		etParameterName = (EditText)findViewById(R.id.etParameterName);
+		etParameterValue = (EditText)findViewById(R.id.etParameterValue);
+		bSelectApp = (Button)findViewById(R.id.bSelectApp);
+		bAddIntentPair = (Button)findViewById(R.id.bAddIntentPair);
+		bSaveActionStartOtherActivity = (Button)findViewById(R.id.bSaveActionStartOtherActivity);
+		spinnerParameterType = (Spinner)findViewById(R.id.spinnerParameterType);
+		etPackageName = (EditText) findViewById(R.id.etPackageName);
+		etActivityOrActionPath = (EditText) findViewById(R.id.etActivityOrActionPath);
+		rbStartAppSelectByActivity = (RadioButton)findViewById(R.id.rbStartAppSelectByActivity);
+		rbStartAppSelectByAction = (RadioButton)findViewById(R.id.rbStartAppSelectByAction);
+		showStartProgramExamples = (Button)findViewById(R.id.showStartProgramExamples);
+		rbStartAppByActivity = (RadioButton)findViewById(R.id.rbStartAppByActivity);
+		rbStartAppByBroadcast = (RadioButton)findViewById(R.id.rbStartAppByBroadcast);
+
+		intentTypeSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionStartActivity.supportedIntentTypes);
+		spinnerParameterType.setAdapter(intentTypeSpinnerAdapter);
+		intentTypeSpinnerAdapter.notifyDataSetChanged();
+
+		intentPairAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, intentPairList);
+
+		bSelectApp.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				int targetSdkVersion = getApplicationContext().getApplicationInfo().targetSdkVersion;
+				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && targetSdkVersion >= 30 && !ActivityPermissions.havePermission(Manifest.permission.QUERY_ALL_PACKAGES, ActivityManageActionStartActivity.this))// && shouldShowRequestPermissionRationale(Manifest.permission.QUERY_ALL_PACKAGES))
+				{
+					if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
+					{
+						// This ain't possible anymore.
+						Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.featureNotInGooglePlayVersion) + Miscellaneous.lineSeparator + Miscellaneous.lineSeparator + getResources().getString(R.string.startActivityInsertManually), ActivityManageActionStartActivity.this).show();
+					}
+					else
+						requestPermissions(new String[] {Manifest.permission.QUERY_ALL_PACKAGES}, requestCodeForRequestQueryAllPackagesPermission);
+				}
+				else
+					getAppList();
+			}
+		});
+
+		bAddIntentPair.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				// type;name;value
+				if(spinnerParameterType.getSelectedItem().toString().length() == 0)
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
+					return;
+				}
+
+				if(etParameterName.getText().toString().length() == 0)
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterName.getText().toString().contains(Action.intentPairSeparator))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterName.getText().toString().contains(";"))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+					return;
+				}
+
+				if(etParameterValue.getText().toString().length() == 0)
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterValue.getText().toString().contains(Action.intentPairSeparator))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterValue.getText().toString().contains(";"))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+					return;
+				}
+
+				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeparator + etParameterName.getText().toString() + Action.intentPairSeparator + etParameterValue.getText().toString();
+				intentPairList.add(param);
+
+				spinnerParameterType.setSelection(0);
+				etParameterName.setText("");
+				etParameterValue.setText("");
+
+				updateIntentPairList();
+
+				if(lvIntentPairs.getVisibility() != View.VISIBLE)
+					lvIntentPairs.setVisibility(View.VISIBLE);
+			}
+		});
+
+		showStartProgramExamples.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlShowExamples));
+				startActivity(browserIntent);
+			}
+		});
+
+		lvIntentPairs.setOnItemLongClickListener(new OnItemLongClickListener()
+		{
+			@Override
+			public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2, long arg3)
+			{
+				getIntentPairDialog(arg2).show();
+				return false;
+			}
+		});
+
+		bSaveActionStartOtherActivity.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				if(saveAction())
+				{
+					ActivityManageActionStartActivity.this.setResult(RESULT_OK);
+					finish();
+				}
+			}
+		});
+
+		lvIntentPairs.setOnTouchListener(new OnTouchListener()
+		{
+			@Override
+			public boolean onTouch(View v, MotionEvent event)
+			{
+				v.getParent().requestDisallowInterceptTouchEvent(true);
+				return false;
+			}
+		});
+
+		spinnerParameterType.setOnItemSelectedListener(new OnItemSelectedListener()
+		{
+			@Override
+			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3)
+			{
+				if(supportedIntentTypes[arg2].equals("double") | supportedIntentTypes[arg2].equals("float") | supportedIntentTypes[arg2].equals("int") | supportedIntentTypes[arg2].equals("long") | supportedIntentTypes[arg2].equals("short"))
+					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
+				else
+					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> arg0)
+			{
+				// TODO Auto-generated method stub
+
+			}
+		});
+
+		rbStartAppSelectByActivity.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+		{
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+			{
+				if(isChecked)
+					bSelectApp.setEnabled(isChecked);
+			}
+		});
+
+		rbStartAppSelectByAction.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+		{
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+			{
+				if(isChecked)
+					bSelectApp.setEnabled(!isChecked);
+			}
+		});
+
+		Intent i = getIntent();
+		if(i.getBooleanExtra("edit", false) == true)
+		{
+			edit = true;
+			loadValuesIntoGui();
+		}
+	}
 	
 	private class CustomPackageInfo extends PackageInfo implements Comparable<CustomPackageInfo>
 	{
@@ -65,13 +278,12 @@ public class ActivityManageActionStartActivity extends Activity
 					
 			return name1.compareTo(name2);
 		}
-		
 	}
 	
 	private static List<PackageInfo> pInfos = null;
 	public static Action resultingAction;
 
-	private static final String[] supportedIntentTypes = { "boolean", "byte", "char", "double", "float", "int", "long", "short", "String" };
+	private static final String[] supportedIntentTypes = { "boolean", "byte", "char", "double", "float", "int", "long", "short", "String", "Uri" };
 	private ArrayList<String> intentPairList = new ArrayList<String>();
 
 	ArrayAdapter<String> intentTypeSpinnerAdapter, intentPairAdapter;
@@ -219,44 +431,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));
@@ -267,159 +524,63 @@ public class ActivityManageActionStartActivity extends Activity
 			public void onClick(DialogInterface dialog, int which)
 			{
 				ActivityInfo ai = ActivityManageActionStartActivity.getActivityInfoForPackageNameAndActivityName(packageName, activityArray[which]);
-				etSelectedActivity.setText(ai.packageName + ";" + ai.name);
+				etPackageName.setText(ai.packageName);
+				etActivityOrActionPath.setText(ai.name);
 			}
 		});
 		AlertDialog alertDialog = alertDialogBuilder.create();
-		
 		return alertDialog;
 	}
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState)
+	void getAppList()
 	{
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.action_start_activity);
-		
-		lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs);
-		etParameterName = (EditText)findViewById(R.id.etParameterName);
-		etParameterValue = (EditText)findViewById(R.id.etParameterValue);
-		bSelectApp = (Button)findViewById(R.id.bSelectApp);
-		bAddIntentPair = (Button)findViewById(R.id.bAddIntentPair);
-		bSaveActionStartOtherActivity = (Button)findViewById(R.id.bSaveActionStartOtherActivity);
-		spinnerParameterType = (Spinner)findViewById(R.id.spinnerParameterType);
-		etSelectedActivity = (EditText) findViewById(R.id.etSelectedApplication);
-		
-		intentTypeSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionStartActivity.supportedIntentTypes);
-		spinnerParameterType.setAdapter(intentTypeSpinnerAdapter);
-		intentTypeSpinnerAdapter.notifyDataSetChanged();
-		
-		intentPairAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, intentPairList);
-		
-		bSelectApp.setOnClickListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				GetActivityListTask getActivityListTask = new GetActivityListTask();
-				getActivityListTask.execute();
-				progressDialog = ProgressDialog.show(ActivityManageActionStartActivity.this, "", ActivityManageActionStartActivity.this.getResources().getString(R.string.gettingListOfInstalledApplications));
-			}
-		});
-		
-		bAddIntentPair.setOnClickListener(new OnClickListener()
-		{			
-			@Override
-			public void onClick(View v)
-			{
-				// type;name;value
-				if(spinnerParameterType.getSelectedItem().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-					
-				if(etParameterName.getText().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-				
-				if(etParameterValue.getText().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-				
-				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + "/" + etParameterName.getText().toString() + "/" + etParameterValue.getText().toString();
-				intentPairList.add(param);
-				
-				spinnerParameterType.setSelection(0);
-				etParameterName.setText("");
-				etParameterValue.setText("");
-				
-				updateIntentPairList();
-			}
-		});
-		
-		lvIntentPairs.setOnItemLongClickListener(new OnItemLongClickListener()
-		{
-			@Override
-			public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2, long arg3)
-			{
-				getIntentPairDialog(arg2).show();
-				return false;
-			}
-		});
-		
-		bSaveActionStartOtherActivity.setOnClickListener(new OnClickListener()
-		{		
-			@Override
-			public void onClick(View v)
-			{
-				if(saveAction())
-				{
-					ActivityManageActionStartActivity.this.setResult(RESULT_OK);
-					finish();
-				}
-			}
-		});
-
-		lvIntentPairs.setOnTouchListener(new OnTouchListener()
-		{			
-			@Override
-			public boolean onTouch(View v, MotionEvent event)
-			{
-				v.getParent().requestDisallowInterceptTouchEvent(true);
-				return false;
-			}
-		});
-		
-		spinnerParameterType.setOnItemSelectedListener(new OnItemSelectedListener()
-		{
-			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3)
-			{
-				if(supportedIntentTypes[arg2].equals("double") | supportedIntentTypes[arg2].equals("float") | supportedIntentTypes[arg2].equals("int") | supportedIntentTypes[arg2].equals("long") | supportedIntentTypes[arg2].equals("short"))
-					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
-				else
-					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> arg0)
-			{
-				// TODO Auto-generated method stub
-				
-			}
-		});
-		
-		Intent i = getIntent();
-		if(i.getBooleanExtra("edit", false) == true)
-		{
-			edit = true;
-			loadValuesIntoGui();
-		}
+		GetActivityListTask getActivityListTask = new GetActivityListTask();
+		getActivityListTask.execute();
+		progressDialog = ProgressDialog.show(ActivityManageActionStartActivity.this, "", ActivityManageActionStartActivity.this.getResources().getString(R.string.gettingListOfInstalledApplications));
 	}
 	
 	private void loadValuesIntoGui()
 	{
+		boolean selectionByAction = resultingAction.getParameter1();
+		rbStartAppSelectByActivity.setChecked(!selectionByAction);
+		rbStartAppSelectByAction.setChecked(selectionByAction);
+
 		String[] params = resultingAction.getParameter2().split(";");
-		if(params.length >= 2)
+
+		rbStartAppByActivity.setChecked(params[2].equals(startByActivityString));
+		rbStartAppByBroadcast.setChecked(params[2].equals(startByBroadcastString));
+
+		int startIndex = -1;
+
+		if(!selectionByAction)
 		{
-			etSelectedActivity.setText(params[0] + ";" + params[1]);
-			
-			if(params.length > 2)
+			etPackageName.setText(params[0]);
+			etActivityOrActionPath.setText(params[1]);
+		}
+		else
+		{
+			if(!params[0].contains(Actions.dummyPackageString))
+				etPackageName.setText(params[0]);
+
+			etActivityOrActionPath.setText(params[1]);
+		}
+
+		if (params.length >= 3)
+			startIndex = 3;
+
+		if(startIndex > -1 && params.length > startIndex)
+		{
+			intentPairList.clear();
+
+			for(int i=startIndex; i<params.length; i++)
 			{
-				intentPairList.clear();
-			
-				for(int i=2; i<params.length; i++)
-				{
-					intentPairList.add(params[i]);
-				}
-				
-				updateIntentPairList();
+				if(lvIntentPairs.getVisibility() != View.VISIBLE)
+					lvIntentPairs.setVisibility(View.VISIBLE);
+
+				intentPairList.add(params[i]);
 			}
+
+			updateIntentPairList();
 		}
 	}
 
@@ -433,39 +594,51 @@ public class ActivityManageActionStartActivity extends Activity
 	
 	private boolean saveAction()
 	{
-		if(etSelectedActivity.getText().toString().length() == 0)
+		if(rbStartAppSelectByActivity.isChecked())
 		{
-			Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.selectApplication), Toast.LENGTH_LONG).show();
-			return false;
+			if (etPackageName.getText().toString().length() == 0)
+			{
+				Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterPackageName), Toast.LENGTH_LONG).show();
+				return false;
+			}
+			else if (etActivityOrActionPath.getText().toString().length() == 0)
+			{
+				Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.selectApplication), Toast.LENGTH_LONG).show();
+				return false;
+			}
 		}
-//		else
-//		{
-//			Intent testIntent = new Intent(ActivityManageActionStartActivity.this, etSelectedActivity);
-//			Intent externalActivityIntent = new Intent(Intent.ACTION_MAIN);
-//			externalActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//			externalActivityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-//			externalActivityIntent.setClassName(packageName, className);
-//
-//			boolean activityExists = externalActivityIntent.resolveActivityInfo(getPackageManager(), 0) != null;
-//		}
-
-		if(etSelectedActivity.getText().toString().equals(getResources().getString(R.string.selectApplication)))
+		else
 		{
-			Toast.makeText(this, getResources().getString(R.string.selectApplication), Toast.LENGTH_LONG).show();
-			return false;
+			if(etActivityOrActionPath.getText().toString().contains(";"))
+			{
+				Toast.makeText(this, getResources().getString(R.string.enterValidAction), Toast.LENGTH_LONG).show();
+				return false;
+			}
 		}
 		
 		if(resultingAction == null)
 			resultingAction = new Action();
+
+		resultingAction.setParameter1(rbStartAppSelectByAction.isChecked());
 		
 		resultingAction.setAction(Action_Enum.startOtherActivity);
 		
-		String parameter2;
+		String parameter2 = "";
 
-		if(etSelectedActivity.getText().toString().contains(";"))
-			parameter2 = etSelectedActivity.getText().toString();
+		if(rbStartAppSelectByActivity.isChecked())
+			parameter2 += etPackageName.getText().toString() + ";" + etActivityOrActionPath.getText().toString();
 		else
-			parameter2 = "dummyPkg;" + etSelectedActivity.getText().toString();
+		{
+			if(etPackageName.getText().toString() != null && etPackageName.getText().toString().length() > 0)
+				parameter2 += etPackageName.getText().toString() + ";" + etActivityOrActionPath.getText().toString();
+			else
+				parameter2 += Actions.dummyPackageString + ";" + etActivityOrActionPath.getText().toString();
+		}
+
+		if(rbStartAppByActivity.isChecked())
+			parameter2 += ";" + startByActivityString;
+		else
+			parameter2 += ";" + startByBroadcastString;
 
 		for(String s : intentPairList)
 			parameter2 += ";" + s;
@@ -490,7 +663,6 @@ public class ActivityManageActionStartActivity extends Activity
 			}
 		});
 		AlertDialog alertDialog = alertDialogBuilder.create();
-		
 		return alertDialog;
 	}
 	
@@ -507,9 +679,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/ActivityManageActionTriggerUrl.java

@@ -39,7 +39,7 @@ public class ActivityManageActionTriggerUrl extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		this.setContentView(R.layout.trigger_url_editor);
+		this.setContentView(R.layout.activity_manage_action_trigger_url);
 		
 		etTriggerUrl = (EditText)findViewById(R.id.etTriggerUrl);
 		etTriggerUrlUsername = (EditText)findViewById(R.id.etTriggerUrlUsername);
@@ -47,7 +47,7 @@ public class ActivityManageActionTriggerUrl extends Activity
 		chkTriggerUrlUseAuthentication = (CheckBox)findViewById(R.id.chkTriggerUrlUseAuthentication);
 		lvTriggerUrlPostParameters = (ListView)findViewById(R.id.lvTriggerUrlPostParameters);
 		tlTriggerUrlAuthentication = (TableLayout)findViewById(R.id.tlTriggerUrlAuthentication);
-		bSaveTriggerUrl = (Button)findViewById(R.id.bSaveTriggerUrl);
+		bSaveTriggerUrl = (Button)findViewById(R.id.bSaveSpeakText);
 		bSaveTriggerUrl.setOnClickListener(new OnClickListener()
 		{			
 			@Override

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

@@ -0,0 +1,85 @@
+package com.jens.automation2;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class ActivityManageActionVibrate extends Activity
+{
+    TextView etVibratePattern;
+    Button bTestVibratePattern, bSaveVibratePattern;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_vibrate);
+
+        etVibratePattern = (EditText)findViewById(R.id.etVibratePattern);
+        bTestVibratePattern = (Button)findViewById(R.id.bTestVibratePattern);
+        bSaveVibratePattern = (Button)findViewById(R.id.bSaveVibratePattern);
+
+        bSaveVibratePattern.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                if(checkInput())
+                {
+                    Intent answer = new Intent();
+                    answer.putExtra("vibratePattern", etVibratePattern.getText().toString());
+                    setResult(RESULT_OK, answer);
+                    finish();
+                }
+            }
+        });
+
+        bTestVibratePattern.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                if(checkInput())
+                {
+                    if (ActivityPermissions.havePermission(Manifest.permission.VIBRATE, ActivityManageActionVibrate.this))
+                    {
+                        String pattern = etVibratePattern.getText().toString();
+                        Actions.vibrate(false, pattern);
+                    }
+                }
+            }
+        });
+
+        Intent input = getIntent();
+
+        if(input.hasExtra("vibratePattern"))
+            etVibratePattern.setText(input.getStringExtra("vibratePattern"));
+    }
+
+    boolean checkInput()
+    {
+        String vibratePattern = etVibratePattern.getText().toString();
+        String regex = "^[0-9,]+$";
+        if(StringUtils.isEmpty(vibratePattern) || !vibratePattern.matches(regex) || vibratePattern.substring(0, 1).equals(",") || vibratePattern.substring(vibratePattern.length()-1).equals(","))
+        {
+            Toast.makeText(ActivityManageActionVibrate.this, getResources().getString(R.string.pleaseEnterValidVibrationPattern), Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+public class ActivityManageActionWifi extends Activity
+{
+    CheckBox chkWifiRunAsRoot;
+    RadioButton rbActionWifiOn, rbActionWifiOff;
+    Button bActionWifiSave;
+    TextView tvWifiExplanation1, tvWifiExplanation2;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_wifi);
+
+        chkWifiRunAsRoot = (CheckBox)findViewById(R.id.chkWifiRunAsRoot);
+        rbActionWifiOn = (RadioButton) findViewById(R.id.rbActionWifiOn);
+        rbActionWifiOff = (RadioButton)findViewById(R.id.rbActionWifiOff);
+        bActionWifiSave = (Button) findViewById(R.id.bActionWifiSave);
+        tvWifiExplanation1 = (TextView)findViewById(R.id.tvWifiExplanation1);
+        tvWifiExplanation2 = (TextView)findViewById(R.id.tvWifiExplanation2);
+
+        Intent input = getIntent();
+        if(input.hasExtra(ActivityManageRule.intentNameActionParameter1))
+            rbActionWifiOn.setChecked(input.getBooleanExtra(ActivityManageRule.intentNameActionParameter1, true));
+
+        if(input.hasExtra(ActivityManageRule.intentNameActionParameter2))
+            chkWifiRunAsRoot.setChecked(Boolean.parseBoolean(input.getStringExtra(ActivityManageRule.intentNameActionParameter2)));
+
+//        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+//            Miscellaneous.messageBox(getResources().getString(R.string.app_name), getResources().getString(R.string.android10WifiToggleNotice), ActivityManageActionWifi.this).show();
+
+        if(getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.Q)
+            tvWifiExplanation1.setVisibility(View.VISIBLE);
+        else
+            tvWifiExplanation1.setVisibility(View.GONE);
+
+        bActionWifiSave.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                Intent response = new Intent();
+                response.putExtra(ActivityManageRule.intentNameActionParameter1, rbActionWifiOn.isChecked());
+                response.putExtra(ActivityManageRule.intentNameActionParameter2, String.valueOf(chkWifiRunAsRoot.isChecked()));
+                setResult(RESULT_OK, response);
+                finish();
+            }
+        });
+    }
+}

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

@@ -12,7 +12,9 @@ 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;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
@@ -21,16 +23,26 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
+import com.jens.automation2.receivers.ConnectivityReceiver;
+
+import java.util.Calendar;
+import java.util.Timer;
+import java.util.TimerTask;
+
 public class ActivityManagePoi extends Activity
 {
 	public LocationManager myLocationManager;
 	MyLocationListenerGps myLocationListenerGps = new MyLocationListenerGps();
 	Location locationGps = null, locationNetwork = null;
-//	Location locationWifi = null;
 	MyLocationListenerNetwork myLocationListenerNetwork = new MyLocationListenerNetwork();
 	Button bGetPosition, bSavePoi;
 	ImageButton ibShowOnMap;
     EditText guiPoiName, guiPoiLatitude, guiPoiLongitude, guiPoiRadius;
+    Calendar locationSearchStart = null;
+	Timer timer = null;
+
+    final static int defaultRadius = 250;
+    final static int searchTimeout = 120;
 
     private static ProgressDialog progressDialog;
 
@@ -47,7 +59,7 @@ public class ActivityManagePoi extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		this.setContentView(R.layout.manage_specific_poi);
+		this.setContentView(R.layout.activity_manage_specific_poi);
 		
 		myLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
 		bGetPosition = (Button)findViewById(R.id.bGetPosition);
@@ -71,17 +83,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()
 		{			
@@ -104,7 +116,7 @@ public class ActivityManagePoi extends Activity
 		myLocationManager.removeUpdates(myLocationListenerGps);
 		ActivityMainPoi.poiToEdit = new PointOfInterest();
 		ActivityMainPoi.poiToEdit.setLocation(new Location("POINT_LOCATION"));
-		if(loadFormValuesToVariable())
+		if(loadFormValuesToVariable(false))
 			if(ActivityMainPoi.poiToEdit.create(this))
 			{
 				this.setResult(RESULT_OK);
@@ -114,7 +126,7 @@ public class ActivityManagePoi extends Activity
 	private void changePoi()
 	{
 		myLocationManager.removeUpdates(myLocationListenerGps);
-		if(loadFormValuesToVariable())
+		if(loadFormValuesToVariable(false))
 			if(ActivityMainPoi.poiToEdit.change(this))
 			{
 				this.setResult(RESULT_OK);
@@ -124,73 +136,171 @@ 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
 		{
-			Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logGettingPositionWithProvider) + " " + provider1, 3);
-			myLocationManager.requestLocationUpdates(provider1, 500, Settings.satisfactoryAccuracyNetwork, myLocationListenerNetwork);
-			
+			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(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.", 4);
+
 			Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logGettingPositionWithProvider) + " " + provider2, 3);
 			myLocationManager.requestLocationUpdates(provider2, 500, Settings.satisfactoryAccuracyGps, myLocationListenerGps);
 		}
-		
 	}
-	
-	private void compareLocations()
+
+	private void startTimeout()
 	{
+		if(timer != null)
+			stopTimeout();
+
+		timer = new Timer();
+
+		class TimeoutTask extends TimerTask
+		{
+			public void run()
+			{
+				evaluateLocationResults();
+			}
+		}
+
+		Miscellaneous.logEvent("i", "POI Manager", "Starting timeout for location search: " + String.valueOf(searchTimeout) + " seconds", 5);
+
+		TimerTask timeoutTask = new TimeoutTask();
+		timer.schedule(timeoutTask, searchTimeout * 1000);
+	}
+
+	private void stopTimeout()
+	{
+		Miscellaneous.logEvent("i", "POI Manager", "Stopping timeout for location search.", 5);
+
+		if(timer != null)
+		{
+			timer.purge();
+			timer.cancel();
+		}
+	}
+
+	private void evaluateLocationResults()
+	{
+		/*
+			Procedure:
+			If we get a GPS result we take it and suggest a default minimum radius.
+			If private locationing is active that's the only possible outcome other than a timeout.
+
+			If private locationing is not active
+			If we get a network
+		 */
+
+		// We have GPS
 		if(locationGps != null)
 		{
+			myLocationManager.removeUpdates(myLocationListenerNetwork);
+
 			guiPoiLatitude.setText(String.valueOf(locationGps.getLatitude()));
 			guiPoiLongitude.setText(String.valueOf(locationGps.getLongitude()));
 
+			String text;
 			if(locationNetwork != null)
 			{
 				Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.comparing), 4);
-
 				double variance = locationGps.distanceTo(locationNetwork);
-
-				String text = getResources().getString(R.string.distanceBetween) + " " + String.valueOf(Math.round(variance)) + " " + getResources().getString(R.string.radiusSuggestion);
-//			Toast.makeText(getBaseContext(), text, Toast.LENGTH_LONG).show();
-				Miscellaneous.logEvent("i", "POI Manager", text, 4);
-//			if(variance > 50 && guiPoiRadius.getText().toString().length()>0 && Integer.parseInt(guiPoiRadius.getText().toString())<variance)
-//			{
-//				String text = "Positioning via network is off by " + variance + " meters. The radius you specify shouldn't be smaller than that.";
-				getDialog(text, Math.round(variance) + 1).show();
-//				Toast.makeText(getBaseContext(), "Positioning via network is off by " + variance + " meters. The radius you specify shouldn't be smaller than that.", Toast.LENGTH_LONG).show();
-//			}
+				text = String.format(getResources().getString(R.string.distanceBetween), Math.round(variance));
+				getRadiusConfirmationDialog(text, Math.round(variance) + 1).show();
 			}
 			else
 			{
-				progressDialog.dismiss();
-				myLocationManager.removeUpdates(myLocationListenerNetwork);
-				guiPoiRadius.setText("250");
+				text = String.format(getResources().getString(R.string.locationFound), defaultRadius);
+				getRadiusConfirmationDialog(text, defaultRadius).show();
 			}
+			Miscellaneous.logEvent("i", "POI Manager", text, 4);
+		}	// we have a great network signal:
+		else if(locationNetwork != null && locationNetwork.getAccuracy() <= Settings.satisfactoryAccuracyGps && locationNetwork.getAccuracy() <= defaultRadius)
+		{
+			/*
+				We do not yet have a GPS result. But we have a network result that is good enough
+				to accept it a sole result. In that case we suggest a default radius, no variance.
+			 */
+
+			guiPoiLatitude.setText(String.valueOf(locationNetwork.getLatitude()));
+			guiPoiLongitude.setText(String.valueOf(locationNetwork.getLongitude()));
+
+			String text = String.format(getResources().getString(R.string.locationFound), defaultRadius);
+			Miscellaneous.logEvent("i", "POI Manager", text, 4);
+
+			getRadiusConfirmationDialog(text, defaultRadius).show();
+		}
+		else if(	// we have a bad network signal and nothing else, GPS result may still come in
+				locationNetwork != null
+						&&
+				Calendar.getInstance().getTimeInMillis()
+						<
+				(locationSearchStart.getTimeInMillis() + ((long)searchTimeout * 1000))
+			)
+		{
+			// Only a network location was found and it is also not very accurate.
+		}
+		else if(	// we have a bad network signal and nothing else, timeout has expired, nothing else can possibly come in
+				locationNetwork != null
+						&&
+				Calendar.getInstance().getTimeInMillis()
+						>
+				(locationSearchStart.getTimeInMillis() + ((long)searchTimeout * 1000))
+		)
+		{
+			// Only a network location was found and it is also not very accurate.
+
+			guiPoiLatitude.setText(String.valueOf(locationNetwork.getLatitude()));
+			guiPoiLongitude.setText(String.valueOf(locationNetwork.getLongitude()));
+
+			String text = String.format(getResources().getString(R.string.locationFoundInaccurate), defaultRadius);
+			getRadiusConfirmationDialog(text, defaultRadius).show();
+			Miscellaneous.logEvent("i", "POI Manager", text, 4);
 		}
 		else
-			Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logNotAllMeasurings), 4);
+		{
+			String text = String.format(getResources().getString(R.string.noLocationCouldBeFound), String.valueOf(searchTimeout));
+			Miscellaneous.logEvent("i", "POI Manager", text, 2);
+
+			if(myLocationListenerNetwork != null)
+				myLocationManager.removeUpdates(myLocationListenerNetwork);
+
+			myLocationManager.removeUpdates(myLocationListenerGps);
+			progressDialog.dismiss();
+			getErrorDialog(text).show();
+		}
 	}
 	
 	private AlertDialog getNotificationDialog(String text)
@@ -202,17 +312,22 @@ public class ActivityManagePoi extends Activity
 			@Override
 			public void onClick(DialogInterface dialog, int which)
 			{
-//				switch(which)
-//				{
-//					case DialogInterface.BUTTON_POSITIVE:
-//						guiPoiRadius.setText(String.valueOf(value));
-//						break;
-//					case DialogInterface.BUTTON_NEGATIVE:
-//						break;
-//				}
-				
 				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);
@@ -221,8 +336,11 @@ public class ActivityManagePoi extends Activity
 		
 		return alertDialog;
 	}
-	private AlertDialog getDialog(String text, final double value)
+
+	private AlertDialog getRadiusConfirmationDialog(String text, final double value)
 	{
+		stopTimeout();
+
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
 		DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener()
 		{			
@@ -247,10 +365,31 @@ public class ActivityManagePoi extends Activity
 		
 		return alertDialog;
 	}
+
+	private AlertDialog getErrorDialog(String text)
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener()
+		{
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				progressDialog.dismiss();
+			}
+		};
+		alertDialogBuilder.setMessage(text);
+		alertDialogBuilder.setPositiveButton(getResources().getString(R.string.ok), null);
+
+		if (Looper.myLooper() == null)
+			Looper.prepare();
+
+		AlertDialog alertDialog = alertDialogBuilder.create();
+
+		return alertDialog;
+	}
 	
 	public class MyLocationListenerGps implements LocationListener
 	{
-
 		@Override
 		public void onLocationChanged(Location location)
 		{
@@ -260,10 +399,11 @@ public class ActivityManagePoi extends Activity
 //			{
 //				Miscellaneous.logEvent("i", "POI Manager", "satisfactoryNetworkAccuracy of " + String.valueOf(Settings.SATISFACTORY_ACCURACY_GPS) + "m reached. Removing location updates...");
 
+				Miscellaneous.logEvent("i", "POI Manager", "Unsubscribing from GPS location updates.", 5);
 				myLocationManager.removeUpdates(this);
 				locationGps = location;
 				
-				compareLocations();
+				evaluateLocationResults();
 //			}
 		}
 
@@ -287,66 +427,27 @@ public class ActivityManagePoi extends Activity
 			// TODO Auto-generated method stub
 			
 		}
-		
 	}
-//	public class MyLocationListenerWifi implements LocationListener
-//	{
-//
-//		@Override
-//		public void onLocationChanged(Location location)
-//		{
-//			Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.gotGpsUpdate) + " " + String.valueOf(location.getAccuracy()));
-//			// Deactivate when accuracy reached
-////			if(location.getAccuracy() < Settings.SATISFACTORY_ACCURACY_GPS)
-////			{
-////				Miscellaneous.logEvent("i", "POI Manager", "satisfactoryNetworkAccuracy of " + String.valueOf(Settings.SATISFACTORY_ACCURACY_GPS) + "m reached. Removing location updates...");
-//
-//				myLocationManager.removeUpdates(this);
-//				locationGps = location;
-//				
-//				compareLocations();
-////			}
-//		}
-//
-//		@Override
-//		public void onProviderDisabled(String provider)
-//		{
-//			// TODO Auto-generated method stub
-//			
-//		}
-//
-//		@Override
-//		public void onProviderEnabled(String provider)
-//		{
-//			// TODO Auto-generated method stub
-//			
-//		}
-//
-//		@Override
-//		public void onStatusChanged(String provider, int status, Bundle extras)
-//		{
-//			// TODO Auto-generated method stub
-//			
-//		}
-//		
-//	}
+
 	public class MyLocationListenerNetwork implements LocationListener
 	{
-
 		@Override
 		public void onLocationChanged(Location location)
 		{			
 			Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logGotNetworkUpdate) + " " + String.valueOf(location.getAccuracy()), 3);
+
+			myLocationManager.removeUpdates(this);
+			locationNetwork = location;
+
 			// Deactivate when accuracy reached
-//			if(location.getAccuracy() < Settings.SATISFACTORY_ACCURACY_GPS)
-//			{
-//				String text = "Network position found. satisfactoryNetworkAccuracy of " + String.valueOf(Settings.SATISFACTORY_ACCURACY_NETWORK) + "m reached. Removing location updates...";
-//				Miscellaneous.logEvent("i", "POI Manager", text);
-				myLocationManager.removeUpdates(this);
-				locationNetwork = location;
-				
-				compareLocations();
-//			}
+			if(location.getAccuracy() <= Settings.satisfactoryAccuracyGps)
+			{
+				// Accuracy is so good that we don't need to wait for GPS result
+				Miscellaneous.logEvent("i", "POI Manager", "Unsubscribing from network location updates.", 5);
+				myLocationManager.removeUpdates(myLocationListenerGps);
+			}
+
+			evaluateLocationResults();
 		}
 
 		@Override
@@ -369,7 +470,6 @@ public class ActivityManagePoi extends Activity
 			// TODO Auto-generated method stub
 			
 		}
-		
 	}
 	
 	public void editPoi(PointOfInterest poi)
@@ -380,19 +480,22 @@ public class ActivityManagePoi extends Activity
 		guiPoiRadius.setText(String.valueOf(poi.getRadius()));
 	}
 	
-	public boolean loadFormValuesToVariable()
+	public boolean loadFormValuesToVariable(boolean checkOnlyCoordinates)
 	{
 		if(ActivityMainPoi.poiToEdit == null)
 			ActivityMainPoi.poiToEdit = new PointOfInterest();
-		
-		if(guiPoiName.getText().length() == 0)
+
+		if(!checkOnlyCoordinates)
 		{
-			Toast.makeText(this, getResources().getString(R.string.pleaseEnterValidName), Toast.LENGTH_LONG).show();
-			return false;
+			if (guiPoiName.getText().length() == 0)
+			{
+				Toast.makeText(this, getResources().getString(R.string.pleaseEnterValidName), Toast.LENGTH_LONG).show();
+				return false;
+			}
+			else
+				ActivityMainPoi.poiToEdit.setName(guiPoiName