Silent mode bug

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

.gitignore

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

.idea/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

@@ -11,8 +11,8 @@ android {
         compileSdkVersion 29
         buildToolsVersion '29.0.2'
         useLibrary  'org.apache.http.legacy'
-        versionCode 100
-        versionName "1.6.24"
+        versionCode 115
+        versionName "1.7.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,41 +36,42 @@ android {
     flavorDimensions "version"
 
     productFlavors
-            {
-                googlePlayFlavor
-                        {
-                            dimension "version"
-//                            applicationIdSuffix ".googlePlay"
-                            versionNameSuffix "-googlePlay"
-                            targetSdkVersion 30
-                        }
+    {
+        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
+        }
+    }
 }
 
 dependencies {
-    googlePlayFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0'
-    googlePlayFlavorImplementation 'com.google.android.gms:play-services-location:17.1.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.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'

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": 98,
-      "versionName": "1.6.22-googlePlay",
+      "attributes": [],
+      "versionCode": 115,
+      "versionName": "1.7.1-googlePlay",
       "outputFile": "app-googlePlayFlavor-release.apk"
     }
-  ]
+  ],
+  "elementType": "File"
 }

app/src/apkFlavor/AndroidManifest.xml

@@ -51,6 +51,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+<!--    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />-->
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.NFC" />
@@ -62,8 +63,8 @@
     <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"/>
-
-    <!-- Commented out because of Google Play policy -->
+    <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
+    <uses-permission android:name="com.wireguard.android.permission.CONTROL_TUNNELS"/>
 
     <uses-feature
         android:name="android.hardware.telephony"
@@ -76,7 +77,7 @@
         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">
 
@@ -95,15 +96,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>
@@ -131,17 +132,35 @@
                     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=".ActivityEditTriggerUrl" />
+        <activity android:name=".ActivityManageActionTriggerUrl" />
         <activity android:name=".ActivityDisplayLongMessage" />
-        <activity android:name=".ActivityEditSendTextMessage" />
-        <activity android:name=".ActivityManageTimeFrame" />
-        <activity android:name=".ActivityManageBrightnessSetting" />
+        <activity android:name=".ActivityManageActionSendTextMessage" />
+        <activity android:name=".ActivityManageActionPlaySound" />
+        <activity android:name=".ActivityManageTriggerTimeFrame" />
+        <activity android:name=".ActivityMaintenance" />
+        <activity android:name=".ActivityManageTriggerPhoneCall" />
+        <activity android:name=".ActivityManageActionBrightnessSetting" />
+        <activity android:name=".ActivityManageTriggerDeviceOrientation" />
         <activity android:name=".ActivityHelp" />
+        <activity android:name=".ActivityManageActionVibrate" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -178,13 +197,33 @@
         <activity android:name=".ActivityMainPoi" />
         <activity android:name=".ActivityMainRules" />
         <activity android:name=".ActivityGeneric" />
-        <activity android:name=".ActivityManageStartActivity" />
-        <activity android:name=".ActivityManageNfc" />
-        <activity android:name=".ActivityEditSpeakText" />
-        <activity android:name=".ActivityManageBluetoothTrigger" />
+        <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" />
+
+        <service
+            android:name=".receivers.NotificationListener"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService" />
+            </intent-filter>
+
+        </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"
@@ -194,15 +233,15 @@
         <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"/>
 
+
+        <provider
+            android:name=".FileShareProvider"
+            android:authorities="com.jens.automation2"
+            android:exported="true"
+            />
+
     </application>
 
 </manifest>

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

@@ -60,6 +60,8 @@
     <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-feature
         android:name="android.hardware.telephony"
@@ -72,7 +74,7 @@
         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 +93,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>
@@ -127,17 +129,35 @@
                     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=".ActivityEditTriggerUrl" />
+        <activity android:name=".ActivityManageActionTriggerUrl" />
         <activity android:name=".ActivityDisplayLongMessage" />
-        <activity android:name=".ActivityEditSendTextMessage" />
-        <activity android:name=".ActivityManageTimeFrame" />
-        <activity android:name=".ActivityManageBrightnessSetting" />
+        <activity android:name=".ActivityManageActionSendTextMessage" />
+        <activity android:name=".ActivityManageActionPlaySound" />
+        <activity android:name=".ActivityManageTriggerTimeFrame" />
+        <activity android:name=".ActivityMaintenance" />
+        <activity android:name=".ActivityManageTriggerPhoneCall" />
+        <activity android:name=".ActivityManageActionBrightnessSetting" />
+        <activity android:name=".ActivityManageTriggerDeviceOrientation" />
         <activity android:name=".ActivityHelp" />
+        <activity android:name=".ActivityManageActionVibrate" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -173,18 +193,40 @@
         <activity android:name=".ActivityMainPoi" />
         <activity android:name=".ActivityMainRules" />
         <activity android:name=".ActivityGeneric" />
-        <activity android:name=".ActivityManageStartActivity" />
-        <activity android:name=".ActivityManageNfc" />
-        <activity android:name=".ActivityEditSpeakText" />
-        <activity android:name=".ActivityManageBluetoothTrigger" />
+        <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" />
 
+        <service
+            android:name=".receivers.NotificationListener"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService" />
+            </intent-filter>
+
+        </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
+            android:name=".FileShareProvider"
+            android:authorities="com.jens.automation2"
+            android:exported="true"
+            />
+
     </application>
 
 </manifest>

app/src/googlePlayFlavor/AndroidManifest.xml

@@ -50,6 +50,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+<!--    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />-->
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.NFC" />
@@ -61,12 +62,14 @@
     <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"/>
 
     <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>
@@ -121,17 +124,35 @@
                     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=".ActivityEditTriggerUrl" />
+        <activity android:name=".ActivityManageActionTriggerUrl" />
         <activity android:name=".ActivityDisplayLongMessage" />
-        <activity android:name=".ActivityEditSendTextMessage" />
-        <activity android:name=".ActivityManageTimeFrame" />
-        <activity android:name=".ActivityManageBrightnessSetting" />
+        <activity android:name=".ActivityManageActionSendTextMessage" />
+        <activity android:name=".ActivityManageActionPlaySound" />
+        <activity android:name=".ActivityManageTriggerTimeFrame" />
+        <activity android:name=".ActivityMaintenance" />
+        <activity android:name=".ActivityManageTriggerPhoneCall" />
+        <activity android:name=".ActivityManageActionBrightnessSetting" />
+        <activity android:name=".ActivityManageTriggerDeviceOrientation" />
         <activity android:name=".ActivityHelp" />
+        <activity android:name=".ActivityManageActionVibrate" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -168,13 +189,34 @@
         <activity android:name=".ActivityMainPoi" />
         <activity android:name=".ActivityMainRules" />
         <activity android:name=".ActivityGeneric" />
-        <activity android:name=".ActivityManageStartActivity" />
-        <activity android:name=".ActivityManageNfc" />
-        <activity android:name=".ActivityEditSpeakText" />
-        <activity android:name=".ActivityManageBluetoothTrigger" />
+        <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" />
+
+        <service
+            android:name=".receivers.NotificationListener"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService" />
+            </intent-filter>
+
+        </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"
@@ -184,12 +226,14 @@
         <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"
+            android:authorities="com.jens.automation2"
+            android:exported="true"
+            />
 
     </application>
 

app/src/googlePlayFlavor/java/com/jens/automation2/receivers/ActivityDetectionReceiver.java

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

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

@@ -3,7 +3,9 @@ package com.jens.automation2;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
+import android.widget.Toast;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.HttpGet;
 
 import java.util.ArrayList;
@@ -12,11 +14,18 @@ import java.util.Locale;
 
 public class Action
 {
+	Rule parentRule = null;
+
+	public static final String actionParameter2Split = "ap2split";
+	public static final String intentPairSeperator = "intPairSplit";
+	public static final String vibrateSeparator = ",";
+
 	public enum Action_Enum {	
 								setWifi,
 								setBluetooth,
 								setUsbTethering,
 								setWifiTethering,
+								setBluetoothTethering,
 								setDisplayRotation,
 								turnWifiOn,turnWifiOff,
 								turnBluetoothOn,turnBluetoothOff,
@@ -24,15 +33,17 @@ public class Action
 								changeSoundProfile,
 								turnUsbTetheringOn,turnUsbTetheringOff,
 								turnWifiTetheringOn,turnWifiTetheringOff,
-								enableScreenRotation, disableScreenRotation,
+								enableScreenRotation,disableScreenRotation,
 								startOtherActivity,
 								waitBeforeNextAction,
-								wakeupDevice,
+								turnScreenOnOrOff,
 								setAirplaneMode,
 								setDataConnection,
 								speakText,
 								playMusic,
 								setScreenBrightness,
+								playSound,
+								vibrate,
 								sendTextMessage;
 								
 								public String getFullName(Context context)
@@ -45,6 +56,8 @@ public class Action
 											return context.getResources().getString(R.string.actionSetBluetooth);
 										case setWifiTethering:
 											return context.getResources().getString(R.string.actionSetWifiTethering);
+										case setBluetoothTethering:
+											return context.getResources().getString(R.string.actionSetBluetoothTethering);
 										case setUsbTethering:
 											return context.getResources().getString(R.string.actionSetUsbTethering);
 										case setDisplayRotation:
@@ -77,8 +90,10 @@ public class Action
 											return context.getResources().getString(R.string.startOtherActivity);
 										case waitBeforeNextAction:
 											return context.getResources().getString(R.string.waitBeforeNextAction);
-										case wakeupDevice:
-											return context.getResources().getString(R.string.wakeupDevice);
+										case turnScreenOnOrOff:
+											return context.getResources().getString(R.string.turnScreenOnOrOff);
+										case vibrate:
+											return context.getResources().getString(R.string.vibrate);
 										case setAirplaneMode:
 											return context.getResources().getString(R.string.airplaneMode);
 										case setDataConnection:
@@ -87,6 +102,8 @@ public class Action
 											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:
@@ -165,6 +182,13 @@ public class Action
 			else
 				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiTetheringOff));
 		}
+		else if(this.getAction().equals(Action_Enum.setBluetoothTethering))
+		{
+			if(this.getParameter1())
+				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothTetheringOn));
+			else
+				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothTetheringOff));
+		}
 		else if(this.getAction().equals(Action_Enum.setDisplayRotation))
 		{
 			if(this.getParameter1())
@@ -206,13 +230,20 @@ public class Action
 		{
 			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.sendTextMessage));
 		}
-		else if(this.getAction().equals(Action_Enum.wakeupDevice))
+		else if(this.getAction().equals(Action_Enum.turnScreenOnOrOff))
 		{
-			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.wakeupDevice));
+			if(getParameter1())
+				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.turnScreenOn));
+			else
+				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.turnScreenOff));
+		}
+		else if(this.getAction().equals(Action_Enum.playSound))
+		{
+			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playSound));
 		}
 		else
 			returnString.append(action.toString());
-		
+
 		if(this.getAction().equals(Action_Enum.triggerUrl))
 		{
 			String[] components = parameter2.split(";");
@@ -226,6 +257,10 @@ public class Action
 			else
 				returnString.append(": " + components[0]);
 		}
+		else if(this.getAction().equals(Action_Enum.startOtherActivity))
+		{
+			returnString.append(": " + parameter2.replace(Action.intentPairSeperator, "/"));
+		}
 		else if(this.getAction().equals(Action_Enum.sendTextMessage))
 		{
 			String[] components = parameter2.split(Actions.smsSeparator);
@@ -254,6 +289,16 @@ public class Action
 		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>();
@@ -320,84 +365,104 @@ public class Action
 	}
 	
 	public void run(Context context, boolean toggleActionIfPossible)
-	{		
-		switch(this.getAction())
+	{
+		try
 		{
-			case changeSoundProfile:
-				/*
-				 * 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
-//				{
+			switch(this.getAction())
+			{
+				case changeSoundProfile:
+					/*
+					 * 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.
+					 */
+
 					Profile p = Profile.getByName(this.getParameter2());
-					if(p != null)
+					if (p != null)
 						p.activate(context);
-//				}
-				break;
-			case triggerUrl:
-				triggerUrl(context);
-				break;
-			case setBluetooth:
-				Actions.setBluetooth(context, getParameter1(), toggleActionIfPossible);
-				break;
-			case setUsbTethering:
-				Actions.setUsbTethering(context, getParameter1(), toggleActionIfPossible);
-				break;
-			case setWifi:
-				Actions.setWifi(context, getParameter1(), toggleActionIfPossible);
-				break;
-			case setWifiTethering:
-				Actions.setWifiTethering(context, getParameter1(), toggleActionIfPossible);
-				break;
-			case setDisplayRotation:
-				Actions.setDisplayRotation(context, getParameter1(), toggleActionIfPossible);
-				break;
-			case startOtherActivity:
-				Actions.startOtherActivity(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
-				{
-					Thread.sleep(100);
-				}
-				catch (InterruptedException e)
-				{
-					e.printStackTrace();
-				}
-				break;
-			case setAirplaneMode:
-				Actions.setAirplaneMode(this.getParameter1(), toggleActionIfPossible);
-				break;
-			case setDataConnection:
-				Actions.MobileDataStuff.setDataConnection(this.getParameter1(), toggleActionIfPossible);
-				break;
-			case speakText:
-				Actions.speakText(this.getParameter2());
-				break;
-			case playMusic:
-				Actions.playMusic(this.getParameter1(), toggleActionIfPossible);
-				break;
-			case sendTextMessage:
-				Actions.sendTextMessage(context, this.getParameter2().split(Actions.smsSeparator));
-				break;
-			case setScreenBrightness:
-				Actions.setScreenBrightness(getParameter1(), Integer.parseInt(getParameter2()));
-				break;
-			default:
-				Miscellaneous.logEvent("w", "Action", context.getResources().getString(R.string.unknownActionSpecified), 3);
-				break;
+
+					break;
+				case triggerUrl:
+					triggerUrl(context);
+					break;
+				case setBluetooth:
+					Actions.setBluetooth(context, getParameter1(), toggleActionIfPossible);
+					break;
+				case setUsbTethering:
+					Actions.setUsbTethering(context, getParameter1(), toggleActionIfPossible);
+					break;
+				case setWifi:
+					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(getParameter1(), getParameter2());
+					break;
+				case waitBeforeNextAction:
+					Actions.waitBeforeNextAction(Long.parseLong(this.getParameter2()));
+					break;
+				case turnScreenOnOrOff:
+					if(getParameter1())
+					{
+						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();
+						}
+					}
+					else
+					{
+						Actions.turnOffScreen();
+					}
+					break;
+				case setAirplaneMode:
+					Actions.setAirplaneMode(this.getParameter1(), toggleActionIfPossible);
+					break;
+				case setDataConnection:
+					Actions.MobileDataStuff.setDataConnection(this.getParameter1(), toggleActionIfPossible);
+					break;
+				case speakText:
+					Actions.speakText(this.getParameter2());
+					break;
+				case playMusic:
+					Actions.playMusic(this.getParameter1(), toggleActionIfPossible);
+					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;
+				default:
+					Miscellaneous.logEvent("w", "Action", context.getResources().getString(R.string.unknownActionSpecified), 3);
+					break;
+			}
+		}
+		catch(Exception e)
+		{
+			Miscellaneous.logEvent("e", "ActionExecution", Log.getStackTraceString(e), 1);
+			Toast.makeText(context, context.getResources().getString(R.string.errorRunningRule), Toast.LENGTH_LONG).show();
 		}
 	}
 	
@@ -433,7 +498,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);
 		}
 	}	
 	
@@ -464,62 +529,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;
 	    }

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

@@ -19,17 +19,21 @@ 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
 {
 	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 +56,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 +109,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);
@@ -163,13 +159,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 +186,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)
@@ -212,11 +208,22 @@ public class ActivityMainRules extends ActivityGeneric
 					case 1:
 						ruleToEdit = ruleThisIsAbout;
 						Intent manageSpecificRuleIntent = new Intent (ActivityMainRules.this, ActivityManageRule.class);
-						startActivityForResult(manageSpecificRuleIntent, 4000);
+						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 +236,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)
@@ -242,11 +254,11 @@ public class ActivityMainRules extends ActivityGeneric
 		try
 		{
 			if(AutomationService.isMyServiceRunning(this))
-				AlarmListener.reloadAlarms();
+				DateTimeListener.reloadAlarms();
 		}
 		catch(NullPointerException e)
 		{
 			// AlarmManager instance not prepared, yet.
 		}
 	}
-}
+}

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

@@ -1,5 +1,6 @@
 package com.jens.automation2;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.PendingIntent;
@@ -10,6 +11,7 @@ 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;
@@ -27,8 +29,11 @@ import androidx.core.text.HtmlCompat;
 
 import com.jens.automation2.AutomationService.serviceCommands;
 import com.jens.automation2.Trigger.Trigger_Enum;
+import com.jens.automation2.location.CellLocationChangedReceiver;
 import com.jens.automation2.location.LocationProvider;
 
+import java.io.File;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Calendar;
 
@@ -39,8 +44,9 @@ public class ActivityMainScreen extends ActivityGeneric
 
 	private static ActivityMainScreen activityMainScreenInstance = null;
 	private ToggleButton toggleService, tbLockSound;
-	private Button bShowHelp, bPrivacy, bSettingsErase, bSettingsSetToDefault, bVolumeTest, bAddSoundLockTIme;
-	private TextView tvActivePoi, tvClosestPoi, tvLastRule, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvlockSoundDuration, tvFileStoreLocation;
+	private Button bShowHelp, bPrivacy, bSettingsErase, bAddSoundLockTIme, bDonate;
+	private TextView tvActivePoi, tvClosestPoi, tvLastRule, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvlockSoundDuration;
+	private static boolean updateNoteDisplayed = false;
 
 	private ListView lvRuleHistory;
 	private ArrayAdapter<Rule> ruleHistoryListViewAdapter;
@@ -74,9 +80,14 @@ public class ActivityMainScreen extends ActivityGeneric
 		tvMainScreenNoteLocationImpossibleBlameGoogle = (TextView) findViewById(R.id.tvMainScreenNoteLocationImpossibleBlameGoogle);
 		tvMainScreenNoteNews = (TextView) findViewById(R.id.tvMainScreenNoteNews);
 		tvlockSoundDuration = (TextView)findViewById(R.id.tvlockSoundDuration);
-		tvFileStoreLocation = (TextView)findViewById(R.id.tvFileStoreLocation);
 		tbLockSound = (ToggleButton) findViewById(R.id.tbLockSound);
 		toggleService = (ToggleButton) findViewById(R.id.tbArmMastListener);
+
+		bDonate = (Button)findViewById(R.id.bDonate);
+
+		if(!BuildConfig.FLAVOR.equalsIgnoreCase("googlePlayFlavor"))
+			bDonate.setVisibility(View.VISIBLE);
+
 		toggleService.setChecked(AutomationService.isMyServiceRunning(this));
 		toggleService.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{
@@ -106,6 +117,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,19 +153,8 @@ public class ActivityMainScreen extends ActivityGeneric
 			@Override
 			public void onClick(View v)
 			{
-				Intent myIntent = new Intent(ActivityMainScreen.this, ActivitySettings.class);
-				startActivityForResult(myIntent, 6000);
-			}
-		});
-
-		Button bVolumeTest = (Button) findViewById(R.id.bVolumeTest);
-		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, ActivityMaintenance.class);
+				startActivity(myIntent);
 			}
 		});
 
@@ -178,25 +190,6 @@ public class ActivityMainScreen extends ActivityGeneric
 				builder.create().show();
 			}
 		});
-		
-		/*bSettingsErase = (Button)findViewById(R.id.bSettingsErase);
-		bSettingsErase.setOnClickListener(new OnClickListener()
-		{			
-			@Override
-			public void onClick(View v)
-			{
-				getEraseSettingsDialog(ActivityMainScreen.this).show();
-			}
-		});*/
-		bSettingsSetToDefault = (Button) findViewById(R.id.bSettingsSetToDefault);
-		bSettingsSetToDefault.setOnClickListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				getDefaultSettingsDialog(ActivityMainScreen.this).show();
-			}
-		});
 
 		lvRuleHistory.setOnTouchListener(new OnTouchListener()
 		{
@@ -260,25 +253,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;
-	}
-
 	public static ActivityMainScreen getActivityMainScreenInstance()
 	{
 		return activityMainScreenInstance;
@@ -370,9 +344,9 @@ public class ActivityMainScreen extends ActivityGeneric
 						if(
 								Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest)
 										&&
-								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationCoarse, AutomationService.getInstance())
+								ActivityPermissions.havePermission(Manifest.permission.ACCESS_COARSE_LOCATION, Miscellaneous.getAnyContext())
 										&&
-								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationFine, AutomationService.getInstance())
+								ActivityPermissions.havePermission(Manifest.permission.ACCESS_FINE_LOCATION, Miscellaneous.getAnyContext())
 						  )
 							activityMainScreenInstance.tvActivePoi.setText(activityMainScreenInstance.getResources().getString(R.string.stillGettingPosition));
 						else
@@ -453,12 +427,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));
 		}
 	}
 
@@ -514,16 +493,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))
@@ -648,6 +617,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)
@@ -677,4 +655,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/ActivityMaintenance.java

@@ -0,0 +1,377 @@
+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.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;
+
+public class ActivityMaintenance 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, bShareConfigAndLog, bImportConfiguration, bExportConfiguration;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_maintenance);
+
+        bVolumeTest = (Button) findViewById(R.id.bVolumeTest);
+        bVolumeTest.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent intent = new Intent(ActivityMaintenance.this, ActivityVolumeTest.class);
+                startActivity(intent);
+            }
+        });
+
+        bShareConfigAndLog = (Button) findViewById(R.id.bShareConfigAndLog);
+        bShareConfigAndLog.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                getShareConfigAndLogDialogue(ActivityMaintenance.this).show();
+            }
+        });
+
+        bSettingsSetToDefault = (Button) findViewById(R.id.bSettingsSetToDefault);
+        bSettingsSetToDefault.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                getDefaultSettingsDialog(ActivityMaintenance.this).show();
+            }
+        });
+
+        Button bMoreSettings = (Button) findViewById(R.id.bMoreSettings);
+        bMoreSettings.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent myIntent = new Intent(ActivityMaintenance.this, ActivitySettings.class);
+                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(ActivityMaintenance.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(ActivityMaintenance.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(ActivityMaintenance.this, getResources().getString(R.string.prefsImportError), Toast.LENGTH_LONG).show();
+                    }
+                }
+            }
+
+            if(applicableFilesFound > 0)
+            {
+                if(filesImported == 0)
+                    Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
+                else if(filesImported < applicableFilesFound)
+                    Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.notAllFilesImported), Toast.LENGTH_LONG).show();
+                else if (filesImported == applicableFilesFound)
+                {
+                    Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.configurationImportedSuccessfully), Toast.LENGTH_LONG).show();
+
+                    try
+                    {
+                        XmlFileInterface.readFile();
+                        ActivityMainPoi.getInstance().updateListView();
+                        ActivityMainRules.getInstance().updateListView();
+                        ActivityMainProfiles.getInstance().updateListView();
+                    }
+                    catch (Exception e)
+                    {
+                        Miscellaneous.logEvent("e", "Reading import", "Rules re-read failed: " + Log.getStackTraceString(e), 1);
+                        Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.errorReadingPoisAndRulesFromFile), Toast.LENGTH_LONG).show();
+                    }
+
+                    Settings.readFromPersistentStorage(ActivityMaintenance.this);
+                }
+                else
+                    Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
+            }
+            else
+                Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.noApplicableFilesFoundInDirectory), Toast.LENGTH_LONG).show();
+        }
+        else
+            Toast.makeText(ActivityMaintenance.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(ActivityMaintenance.this, getResources().getString(R.string.configurationExportedSuccessfully), Toast.LENGTH_LONG).show();
+            else
+                Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.ConfigurationExportError), Toast.LENGTH_LONG).show();
+        }
+        else
+            Toast.makeText(ActivityMaintenance.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(ActivityMaintenance.this, "android-development@gmx.de", "Automation logs", getSystemInfo(), uri);
+            }
+        });
+        alertDialogBuilder.setNegativeButton(context.getResources().getString(R.string.no), null);
+        AlertDialog alertDialog = alertDialogBuilder.create();
+
+        return alertDialog;
+    }
+
+    public static String getSystemInfo()
+    {
+        StringBuilder systemInfoText = new StringBuilder();
+        systemInfoText.append("Device details" + Miscellaneous.lineSeparator);
+        systemInfoText.append("OS version: " + System.getProperty("os.version") + Miscellaneous.lineSeparator);
+        systemInfoText.append("API Level: " + android.os.Build.VERSION.SDK + Miscellaneous.lineSeparator);
+        systemInfoText.append("Device: " + android.os.Build.DEVICE + Miscellaneous.lineSeparator);
+        systemInfoText.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
+        systemInfoText.append("Product: " + android.os.Build.PRODUCT + Miscellaneous.lineSeparator);
+        systemInfoText.append("Flavor: " + BuildConfig.FLAVOR);
+        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(ActivityMaintenance.this, getResources().getString(R.string.noFileManageInstalled), Toast.LENGTH_LONG).show();
+                    }
+
+                }
+            });
+        }
+    }
+}

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-public class ActivityManageBrightnessSetting extends Activity
+public class ActivityManageActionBrightnessSetting extends Activity
 {
     CheckBox chkAutoBrightness;
     SeekBar sbBrightness;

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

@@ -0,0 +1,109 @@
+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 java.io.File;
+
+public class ActivityManageActionPlaySound extends Activity
+{
+    final static int PICKFILE_RESULT_CODE = 4711;
+
+    CheckBox chkPlaySoundAlwaysPlay;
+    EditText etSelectedSoundFile;
+    Button bSelectSoundFile, bSavePlaySound;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_play_sound);
+
+        chkPlaySoundAlwaysPlay = (CheckBox)findViewById(R.id.chkPlaySoundAlwaysPlay);
+        etSelectedSoundFile = (EditText)findViewById(R.id.etSelectedSoundFile);
+        bSelectSoundFile = (Button)findViewById(R.id.bSelectSoundFile);
+        bSavePlaySound = (Button)findViewById(R.id.bSavePlaySound);
+
+        boolean edit = getIntent().getBooleanExtra("edit", false);
+
+        if(edit)
+        {
+            boolean param1 = getIntent().getBooleanExtra("actionParameter1", false);
+            String param2 = getIntent().getStringExtra("actionParameter2");
+            chkPlaySoundAlwaysPlay.setChecked(param1);
+            etSelectedSoundFile.setText(param2);
+        }
+
+        bSelectSoundFile.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);
+            }
+        });
+
+        bSavePlaySound.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                savePlaySoundSettings();
+            }
+        });
+    }
+
+    void savePlaySoundSettings()
+    {
+        if(etSelectedSoundFile.getText().toString() == null || etSelectedSoundFile.getText().toString().length() == 0)
+        {
+            Toast.makeText(ActivityManageActionPlaySound.this, getResources().getString(R.string.selectSoundFile), Toast.LENGTH_LONG).show();
+            return;
+        }
+        else
+        {
+            File soundFile = new File(etSelectedSoundFile.getText().toString());
+            if(!soundFile.exists())
+            {
+                Toast.makeText(ActivityManageActionPlaySound.this, getResources().getString(R.string.fileDoesNotExist), Toast.LENGTH_LONG).show();
+                return;
+            }
+        }
+
+        Intent returnData = new Intent();
+        returnData.putExtra("actionParameter1", chkPlaySoundAlwaysPlay.isChecked());
+        returnData.putExtra("actionParameter2", etSelectedSoundFile.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(ActivityManageActionPlaySound.this, fileUri);
+                etSelectedSoundFile.setText(filePath);
+            }
+        }
+    }
+}

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

@@ -19,12 +19,13 @@ import androidx.annotation.NonNull;
 import com.jens.automation2.Action.Action_Enum;
 
 
-public class ActivityEditSendTextMessage extends Activity
+public class ActivityManageActionSendTextMessage extends Activity
 {
 	Button bSaveSendTextMessage, bImportNumberFromContacts;
 	EditText etPhoneNumber, etSendTextMessage;
 
 	protected final static int requestCodeForContactsPermissions = 9876;
+	protected final static int requestCodeGetContact = 3235;
 	
 //	private String existingUrl = "";
 	
@@ -35,7 +36,7 @@ public class ActivityEditSendTextMessage 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 +59,7 @@ public class ActivityEditSendTextMessage 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();
 			}
 		});
 
@@ -67,7 +68,7 @@ public class ActivityEditSendTextMessage extends Activity
 			@Override
 			public void onClick(View view)
 			{
-				if(!ActivityPermissions.havePermission("android.permission.READ_CONTACTS", ActivityEditSendTextMessage.this))
+				if(!ActivityPermissions.havePermission("android.permission.READ_CONTACTS", ActivityManageActionSendTextMessage.this))
 				{
                     requestPermissions("android.permission.READ_CONTACTS");
 				}
@@ -76,30 +77,20 @@ public class ActivityEditSendTextMessage extends Activity
 			}
 		});
 
-		ActivityEditSendTextMessage.edit = getIntent().getBooleanExtra("edit", false);
+		ActivityManageActionSendTextMessage.edit = getIntent().getBooleanExtra("edit", false);
 		if(edit)
 		{
-			String[] parameters = ActivityEditSendTextMessage.resultingAction.getParameter2().split(Actions.smsSeparator);
+			String[] parameters = ActivityManageActionSendTextMessage.resultingAction.getParameter2().split(Actions.smsSeparator);
 			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)
 		{
-			ActivityEditSendTextMessage.resultingAction.setParameter2(etPhoneNumber.getText().toString() + Actions.smsSeparator + etSendTextMessage.getText().toString());
+			ActivityManageActionSendTextMessage.resultingAction.setParameter2(etPhoneNumber.getText().toString() + Actions.smsSeparator + etSendTextMessage.getText().toString());
 		}
 		
 		setResult(RESULT_OK);
@@ -145,16 +136,14 @@ public class ActivityEditSendTextMessage 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)
             {
@@ -162,7 +151,7 @@ public class ActivityEditSendTextMessage extends Activity
                 String name = null;
 
                 Uri uri = data.getData();
-                Cursor cursor = ActivityEditSendTextMessage.this.getContentResolver().query(uri, null, null, null, null);
+                Cursor cursor = ActivityManageActionSendTextMessage.this.getContentResolver().query(uri, null, null, null, null);
 
                 if (cursor.moveToFirst())
                 {

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

@@ -10,7 +10,7 @@ import android.widget.Toast;
 
 import com.jens.automation2.Action.Action_Enum;
 
-public class ActivityEditSpeakText extends Activity
+public class ActivityManageActionSpeakText extends Activity
 {
 	private Button bSaveSpeakText;
 	private EditText etSpeakText;
@@ -24,7 +24,7 @@ public class ActivityEditSpeakText 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);
@@ -44,13 +44,13 @@ public class ActivityEditSpeakText 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();
 			}
 		});
 		
-		ActivityEditSpeakText.edit = getIntent().getBooleanExtra("edit", false);
+		ActivityManageActionSpeakText.edit = getIntent().getBooleanExtra("edit", false);
 		if(edit)
-			etSpeakText.setText(ActivityEditSpeakText.resultingAction.getParameter2());
+			etSpeakText.setText(ActivityManageActionSpeakText.resultingAction.getParameter2());
 		
 
 //		String url = getIntent().getStringExtra("urlToTrigger");
@@ -66,7 +66,7 @@ public class ActivityEditSpeakText extends Activity
 //		setResult(RESULT_OK, returnIntent);
 		
 		if(edit && resultingAction != null)
-			ActivityEditSpeakText.resultingAction.setParameter2(etSpeakText.getText().toString());
+			ActivityManageActionSpeakText.resultingAction.setParameter2(etSpeakText.getText().toString());
 		
 		setResult(RESULT_OK);
 		

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

@@ -10,6 +10,7 @@ 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.Bundle;
 import android.text.InputType;
@@ -22,10 +23,11 @@ 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 com.jens.automation2.Action.Action_Enum;
@@ -35,15 +37,23 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-public class ActivityManageStartActivity extends Activity
+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;
-	Button bSelectApp, bAddIntentPair, bSaveActionStartOtherActivity;
+	EditText etParameterName, etParameterValue, etPackageName, etActivityOrActionPath;
+	Button bSelectApp, bAddIntentPair, bSaveActionStartOtherActivity, showStartProgramExamples;
 	Spinner spinnerParameterType;
-	TextView tvSelectedActivity;
 	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";
 	
 	private class CustomPackageInfo extends PackageInfo implements Comparable<CustomPackageInfo>
 	{
@@ -56,12 +66,12 @@ public class ActivityManageStartActivity extends Activity
 			ApplicationInfo aInfo1 = this.applicationInfo;
 			if (aInfo1 != null)
 			{
-				name1 = (String) ActivityManageStartActivity.this.getPackageManager().getApplicationLabel(aInfo1);
+				name1 = (String) ActivityManageActionStartActivity.this.getPackageManager().getApplicationLabel(aInfo1);
 			}
 			ApplicationInfo aInfo2 = another.applicationInfo;
 			if (aInfo2 != null)
 			{
-				name2 = (String) ActivityManageStartActivity.this.getPackageManager().getApplicationLabel(aInfo2);
+				name2 = (String) ActivityManageActionStartActivity.this.getPackageManager().getApplicationLabel(aInfo2);
 			}
 					
 			return name1.compareTo(name2);
@@ -72,7 +82,7 @@ public class ActivityManageStartActivity extends Activity
 	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;
@@ -224,7 +234,7 @@ public class ActivityManageStartActivity extends Activity
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
 		alertDialogBuilder.setTitle(getResources().getString(R.string.selectApplication));
-		final String[] applicationArray = ActivityManageStartActivity.getApplicationNameListString(this);
+		final String[] applicationArray = ActivityManageActionStartActivity.getApplicationNameListString(this);
 		alertDialogBuilder.setItems(applicationArray, new DialogInterface.OnClickListener()
 		{			
 			@Override
@@ -242,14 +252,14 @@ public class ActivityManageStartActivity extends Activity
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
 		alertDialogBuilder.setTitle(getResources().getString(R.string.selectPackageOfApplication));
-		final String[] packageArray = ActivityManageStartActivity.getPackageListString(this, applicationName);
+		final String[] packageArray = ActivityManageActionStartActivity.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), ActivityManageStartActivity.this).show();
+				Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageActionStartActivity.this).show();
 
 			}
 		});
@@ -261,14 +271,15 @@ public class ActivityManageStartActivity extends Activity
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
 		alertDialogBuilder.setTitle(getResources().getString(R.string.selectActivityToBeStarted));
-		final String activityArray[] = ActivityManageStartActivity.getActivityListForPackageName(packageName);
+		final String activityArray[] = ActivityManageActionStartActivity.getActivityListForPackageName(packageName);
 		alertDialogBuilder.setItems(activityArray, new DialogInterface.OnClickListener()
 		{			
 			@Override
 			public void onClick(DialogInterface dialog, int which)
 			{
-				ActivityInfo ai = ActivityManageStartActivity.getActivityInfoForPackageNameAndActivityName(packageName, activityArray[which]);
-				tvSelectedActivity.setText(ai.packageName + ";" + ai.name);
+				ActivityInfo ai = ActivityManageActionStartActivity.getActivityInfoForPackageNameAndActivityName(packageName, activityArray[which]);
+				etPackageName.setText(ai.packageName);
+				etActivityOrActionPath.setText(ai.name);
 			}
 		});
 		AlertDialog alertDialog = alertDialogBuilder.create();
@@ -280,7 +291,7 @@ public class ActivityManageStartActivity extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.action_start_activity);
+		setContentView(R.layout.activity_manage_action_start_activity);
 		
 		lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs);
 		etParameterName = (EditText)findViewById(R.id.etParameterName);
@@ -289,13 +300,20 @@ public class ActivityManageStartActivity extends Activity
 		bAddIntentPair = (Button)findViewById(R.id.bAddIntentPair);
 		bSaveActionStartOtherActivity = (Button)findViewById(R.id.bSaveActionStartOtherActivity);
 		spinnerParameterType = (Spinner)findViewById(R.id.spinnerParameterType);
-		tvSelectedActivity = (TextView)findViewById(R.id.tvSelectedActivity);
+		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, ActivityManageStartActivity.supportedIntentTypes);
+		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_smalltextsize, intentPairList);
+		intentPairAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, intentPairList);
 		
 		bSelectApp.setOnClickListener(new OnClickListener()
 		{
@@ -304,7 +322,7 @@ public class ActivityManageStartActivity extends Activity
 			{
 				GetActivityListTask getActivityListTask = new GetActivityListTask();
 				getActivityListTask.execute();
-				progressDialog = ProgressDialog.show(ActivityManageStartActivity.this, "", ActivityManageStartActivity.this.getResources().getString(R.string.gettingListOfInstalledApplications));
+				progressDialog = ProgressDialog.show(ActivityManageActionStartActivity.this, "", ActivityManageActionStartActivity.this.getResources().getString(R.string.gettingListOfInstalledApplications));
 			}
 		});
 		
@@ -316,23 +334,43 @@ public class ActivityManageStartActivity extends Activity
 				// type;name;value
 				if(spinnerParameterType.getSelectedItem().toString().length() == 0)
 				{
-					Toast.makeText(ActivityManageStartActivity.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
 					return;
 				}
 					
 				if(etParameterName.getText().toString().length() == 0)
 				{
-					Toast.makeText(ActivityManageStartActivity.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterName.getText().toString().contains(Action.intentPairSeperator))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeperator), 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(ActivityManageStartActivity.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterValue.getText().toString().contains(Action.intentPairSeperator))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeperator), 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()] + "/" + etParameterName.getText().toString() + "/" + etParameterValue.getText().toString();
+				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeperator + etParameterName.getText().toString() + Action.intentPairSeperator + etParameterValue.getText().toString();
 				intentPairList.add(param);
 				
 				spinnerParameterType.setSelection(0);
@@ -340,6 +378,19 @@ public class ActivityManageStartActivity extends Activity
 				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);
 			}
 		});
 		
@@ -360,7 +411,7 @@ public class ActivityManageStartActivity extends Activity
 			{
 				if(saveAction())
 				{
-					ActivityManageStartActivity.this.setResult(RESULT_OK);
+					ActivityManageActionStartActivity.this.setResult(RESULT_OK);
 					finish();
 				}
 			}
@@ -382,9 +433,9 @@ public class ActivityManageStartActivity extends Activity
 			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"))
-					ActivityManageStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
+					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
 				else
-					ActivityManageStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
+					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
 			}
 
 			@Override
@@ -394,6 +445,26 @@ public class ActivityManageStartActivity extends Activity
 				
 			}
 		});
+
+		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)
@@ -405,22 +476,46 @@ public class ActivityManageStartActivity extends Activity
 	
 	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)
 		{
-			tvSelectedActivity.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();
 		}
 	}
 
@@ -434,24 +529,52 @@ public class ActivityManageStartActivity extends Activity
 	
 	private boolean saveAction()
 	{
-		if(tvSelectedActivity.getText().toString().length() == 0)
+		if(rbStartAppSelectByActivity.isChecked())
 		{
-			Toast.makeText(ActivityManageStartActivity.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;
+			}
 		}
-
-		if(tvSelectedActivity.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 = tvSelectedActivity.getText().toString();
+		String parameter2 = "";
+
+		if(rbStartAppSelectByActivity.isChecked())
+			parameter2 += etPackageName.getText().toString() + ";" + etActivityOrActionPath.getText().toString();
+		else
+		{
+			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;
 		
@@ -462,7 +585,7 @@ public class ActivityManageStartActivity extends Activity
 	
 	private AlertDialog getIntentPairDialog(final int itemPosition)
 	{
-		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ActivityManageStartActivity.this);
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ActivityManageActionStartActivity.this);
 		alertDialogBuilder.setTitle(getResources().getString(R.string.whatToDoWithIntentPair));
 		alertDialogBuilder.setItems(new String[]{getResources().getString(R.string.delete)}, new DialogInterface.OnClickListener()
 		{			
@@ -470,7 +593,7 @@ public class ActivityManageStartActivity extends Activity
 			public void onClick(DialogInterface dialog, int which)
 			{
 				// Only 1 choice at the moment, no need to check
-				ActivityManageStartActivity.this.intentPairList.remove(itemPosition);
+				ActivityManageActionStartActivity.this.intentPairList.remove(itemPosition);
 				updateIntentPairList();
 			}
 		});
@@ -484,7 +607,7 @@ public class ActivityManageStartActivity extends Activity
 		@Override
 		protected Void doInBackground(Void... params)
 		{
-			getActivityList(ActivityManageStartActivity.this);
+			getActivityList(ActivityManageActionStartActivity.this);
 			return null;
 		}
 

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

@@ -20,7 +20,7 @@ import com.jens.automation2.Action.Action_Enum;
 
 import java.util.Map;
 
-public class ActivityEditTriggerUrl extends Activity
+public class ActivityManageActionTriggerUrl extends Activity
 {
 	Button bSaveTriggerUrl;
 	EditText etTriggerUrl, etTriggerUrlUsername, etTriggerUrlPassword;
@@ -39,7 +39,7 @@ public class ActivityEditTriggerUrl 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);
@@ -70,7 +70,7 @@ public class ActivityEditTriggerUrl extends Activity
 						if(password == null)
 							password = "";
 						
-						ActivityEditTriggerUrl.resultingAction.setParameter2(
+						ActivityManageActionTriggerUrl.resultingAction.setParameter2(
 																				username + ";" +
 																				password + ";" +
 																				etTriggerUrl.getText().toString().trim()
@@ -110,16 +110,16 @@ public class ActivityEditTriggerUrl extends Activity
 		updateListView();
 
 		
-		ActivityEditTriggerUrl.edit = getIntent().getBooleanExtra("edit", false);
+		ActivityManageActionTriggerUrl.edit = getIntent().getBooleanExtra("edit", false);
 		if(edit)
 		{
 			// username,password,URL
-			String[] components = ActivityEditTriggerUrl.resultingAction.getParameter2().split(";");
+			String[] components = ActivityManageActionTriggerUrl.resultingAction.getParameter2().split(";");
 			
 			if(components.length >= 3)
 			{
 				etTriggerUrl.setText(components[2]);				
-				chkTriggerUrlUseAuthentication.setChecked(ActivityEditTriggerUrl.resultingAction.getParameter1());
+				chkTriggerUrlUseAuthentication.setChecked(ActivityManageActionTriggerUrl.resultingAction.getParameter1());
 				etTriggerUrlUsername.setText(components[0]);
 				etTriggerUrlPassword.setText(components[1]);
 			}
@@ -141,9 +141,9 @@ public class ActivityEditTriggerUrl extends Activity
 			if(password == null)
 				password = "";
 			
-			ActivityEditTriggerUrl.resultingAction.setParameter1(chkTriggerUrlUseAuthentication.isChecked());
+			ActivityManageActionTriggerUrl.resultingAction.setParameter1(chkTriggerUrlUseAuthentication.isChecked());
 			
-			ActivityEditTriggerUrl.resultingAction.setParameter2(
+			ActivityManageActionTriggerUrl.resultingAction.setParameter2(
 																	username + ";" +
 																	password + ";" +
 																	etTriggerUrl.getText().toString()

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

@@ -13,6 +13,7 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Looper;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
@@ -21,6 +22,12 @@ 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;
@@ -31,6 +38,11 @@ public class ActivityManagePoi extends Activity
 	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);
@@ -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);
@@ -150,47 +162,142 @@ public class ActivityManagePoi extends Activity
 		}
 		else
 		{
-			Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logGettingPositionWithProvider) + " " + provider1, 3);
-			myLocationManager.requestLocationUpdates(provider1, 500, Settings.satisfactoryAccuracyNetwork, myLocationListenerNetwork);
-			
+			locationSearchStart = Calendar.getInstance();
+			startTimeout();
+
+			if(!Settings.privacyLocationing || !ConnectivityReceiver.isDataConnectionAvailable(AutomationService.getInstance()))
+			{
+				Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logGettingPositionWithProvider) + " " + provider1, 3);
+				myLocationManager.requestLocationUpdates(provider1, 500, Settings.satisfactoryAccuracyNetwork, myLocationListenerNetwork);
+			}
+			else
+				Miscellaneous.logEvent("i", "POI Manager", "Skipping network location query because private locationing is active.", 4);
+
 			Miscellaneous.logEvent("i", "POI Manager", 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,15 +309,6 @@ 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();
 			}
@@ -221,8 +319,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 +348,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 +382,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 +410,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 +453,6 @@ public class ActivityManagePoi extends Activity
 			// TODO Auto-generated method stub
 			
 		}
-		
 	}
 	
 	public void editPoi(PointOfInterest poi)
@@ -380,19 +463,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.getText().toString());
 		}
-		else
-			ActivityMainPoi.poiToEdit.setName(guiPoiName.getText().toString());
-		
+
 		if(ActivityMainPoi.poiToEdit.getLocation() == null)
 			ActivityMainPoi.poiToEdit.setLocation(new Location("POINT_LOCATION"));
 		
@@ -415,28 +501,31 @@ public class ActivityManagePoi extends Activity
 			Toast.makeText(this, getResources().getString(R.string.pleaseEnterValidLongitude), Toast.LENGTH_LONG).show();
 			return false;
 		}
-		
-		try
+
+		if(!checkOnlyCoordinates)
 		{
-			ActivityMainPoi.poiToEdit.setRadius(Double.parseDouble(guiPoiRadius.getText().toString()), this);
+			try
+			{
+				ActivityMainPoi.poiToEdit.setRadius(Double.parseDouble(guiPoiRadius.getText().toString()), this);
+			}
+			catch (NumberFormatException e)
+			{
+				Toast.makeText(this, getResources().getString(R.string.pleaseEnterValidRadius), Toast.LENGTH_LONG).show();
+				return false;
+			}
+			catch (Exception e)
+			{
+				Toast.makeText(this, getResources().getString(R.string.unknownError), Toast.LENGTH_LONG).show();
+				return false;
+			}
 		}
-		catch(NumberFormatException e)
-		{
-			Toast.makeText(this, getResources().getString(R.string.pleaseEnterValidRadius), Toast.LENGTH_LONG).show();
-			return false;
-		}
-		catch (Exception e)
-		{
-			Toast.makeText(this, getResources().getString(R.string.unknownError), Toast.LENGTH_LONG).show();
-			return false;
-		}
-		
+
 		return true;
 	}
 	
 	private void showOnMap()
 	{
-		if(loadFormValuesToVariable())
+		if(loadFormValuesToVariable(true))
 		{
 			try
 			{

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

@@ -1,6 +1,7 @@
 package com.jens.automation2;
 
 import android.app.Activity;
+import android.app.NotificationManager;
 import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -37,8 +38,8 @@ public class ActivityManageProfile extends Activity
 	final static int intentCodeRingtonePickerNotificationsFile = 9020;
 	final static int intentCodeRingtonePickerNotificationsRingtone = 9021;
 	
-	CheckBox checkBoxChangeSoundMode, checkBoxChangeVolumeMusicVideoGameMedia, checkBoxChangeVolumeNotifications, checkBoxChangeVolumeAlarms, checkBoxChangeIncomingCallsRingtone, checkBoxChangeNotificationRingtone, checkBoxChangeAudibleSelection, checkBoxChangeScreenLockUnlockSound, checkBoxChangeHapticFeedback, checkBoxChangeVibrateWhenRinging, checkBoxVibrateWhenRinging, checkBoxAudibleSelection, checkBoxScreenLockUnlockSound, checkBoxHapticFeedback;
-	Spinner spinnerSoundMode;
+	CheckBox checkBoxChangeSoundMode, checkBoxChangeVolumeMusicVideoGameMedia, checkBoxChangeVolumeNotifications, checkBoxChangeVolumeAlarms, checkBoxChangeIncomingCallsRingtone, checkBoxChangeNotificationRingtone, checkBoxChangeAudibleSelection, checkBoxChangeScreenLockUnlockSound, checkBoxChangeHapticFeedback, checkBoxChangeVibrateWhenRinging, checkBoxVibrateWhenRinging, checkBoxAudibleSelection, checkBoxScreenLockUnlockSound, checkBoxHapticFeedback, checkBoxChangeDnd;
+	Spinner spinnerSoundMode, spinnerDndMode;
 	SeekBar seekBarVolumeMusic, seekBarVolumeNotifications, seekBarVolumeAlarms;		
 	Button bChangeSoundIncomingCalls, bChangeSoundNotifications, bSaveProfile;
 	TextView tvIncomingCallsRingtone, tvNotificationsRingtone;
@@ -47,6 +48,7 @@ public class ActivityManageProfile extends Activity
 	File incomingCallsRingtone = null, notificationsRingtone = null;
 	
 	ArrayAdapter<String> soundModeAdapter;
+	ArrayAdapter<String> dndModeAdapter;
 
 	public void setIncomingCallsRingtone(File incomingCallsRingtone)
 	{
@@ -82,9 +84,10 @@ public class ActivityManageProfile extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		this.setContentView(R.layout.manage_specific_profile);
+		this.setContentView(R.layout.activity_manage_specific_profile);
 		
 		checkBoxChangeSoundMode = (CheckBox)findViewById(R.id.checkBoxChangeSoundMode);
+		checkBoxChangeDnd = (CheckBox)findViewById(R.id.checkBoxChangeDnd);
 		checkBoxChangeVolumeMusicVideoGameMedia = (CheckBox)findViewById(R.id.checkBoxChangeVolumeMusicVideoGameMedia);
 		checkBoxChangeVolumeNotifications = (CheckBox)findViewById(R.id.checkBoxChangeVolumeNotifications);
 		checkBoxChangeVolumeAlarms = (CheckBox)findViewById(R.id.checkBoxChangeVolumeAlarms);
@@ -99,6 +102,7 @@ public class ActivityManageProfile extends Activity
 		checkBoxHapticFeedback = (CheckBox)findViewById(R.id.checkBoxHapticFeedback);
 		checkBoxVibrateWhenRinging = (CheckBox)findViewById(R.id.checkBoxVibrateWhenRinging);
 		spinnerSoundMode = (Spinner)findViewById(R.id.spinnerSoundMode);
+		spinnerDndMode = (Spinner)findViewById(R.id.spinnerDndMode);
 		seekBarVolumeMusic = (SeekBar)findViewById(R.id.seekBarVolumeMusic);
 		seekBarVolumeNotifications = (SeekBar)findViewById(R.id.seekBarVolumeNotifications);
 		seekBarVolumeAlarms = (SeekBar)findViewById(R.id.seekBarVolumeAlarms);
@@ -114,6 +118,7 @@ public class ActivityManageProfile extends Activity
 		checkBoxScreenLockUnlockSound.setEnabled(false);
 		checkBoxHapticFeedback.setEnabled(false);
 		spinnerSoundMode.setEnabled(false);
+		spinnerDndMode.setEnabled(false);
 		seekBarVolumeMusic.setEnabled(false);
 		seekBarVolumeNotifications.setEnabled(false);
 		seekBarVolumeAlarms.setEnabled(false);
@@ -121,6 +126,14 @@ public class ActivityManageProfile extends Activity
 		bChangeSoundNotifications.setEnabled(false);
 		
 		spinnerSoundMode.setSelection(0);
+		spinnerDndMode.setSelection(0);
+
+		if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
+		{
+			// Disable DND controls
+			checkBoxChangeDnd.setEnabled(false);
+			spinnerDndMode.setEnabled(false);
+		}
 		
 		// Scale SeekBars to the system's maximum volume values
 		AudioManager am = (AudioManager) Miscellaneous.getAnyContext().getSystemService(Context.AUDIO_SERVICE);
@@ -128,8 +141,30 @@ public class ActivityManageProfile extends Activity
 		seekBarVolumeNotifications.setMax(am.getStreamMaxVolume(AudioManager.STREAM_NOTIFICATION));
 		seekBarVolumeAlarms.setMax(am.getStreamMaxVolume(AudioManager.STREAM_ALARM));
 		
-		soundModeAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, new String[] { getResources().getString(R.string.soundModeSilent), getResources().getString(R.string.soundModeVibrate), getResources().getString(R.string.soundModeNormal) });
+		soundModeAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, new String[]
+																				{
+																						getResources().getString(R.string.soundModeSilent),
+																						getResources().getString(R.string.soundModeVibrate),
+																						getResources().getString(R.string.soundModeNormal)
+																				});
 		spinnerSoundMode.setAdapter(soundModeAdapter);
+
+		dndModeAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, new String[]
+																				{
+																						getResources().getString(R.string.dndOff),
+																						getResources().getString(R.string.dndPriority),
+																						getResources().getString(R.string.dndNothing),
+																						getResources().getString(R.string.dndAlarms)
+																				});
+		spinnerDndMode.setAdapter(dndModeAdapter);
+		/*
+			Order in spinner: 1, 2, 4, 3
+			NotificationManager.INTERRUPTION_FILTER_UNKNOWN	-> Returned when the value is unavailable for any reason.
+			NotificationManager.INTERRUPTION_FILTER_ALL -> 1 -> Normal interruption filter - no notifications are suppressed. -> essentially turn off DND
+			NotificationManager.INTERRUPTION_FILTER_PRIORITY -> 2 ->  Priority interruption filter - all notifications are suppressed except those that match the priority criteria.
+			NotificationManager.INTERRUPTION_FILTER_ALARMS -> 4 -> Alarms only interruption filter - all notifications except those of category
+			NotificationManager.INTERRUPTION_FILTER_NONE -> 3 -> No interruptions filter - all notifications are suppressed and all audio streams (except those used for phone calls) and vibrations are muted.
+		*/
 		
 		checkBoxChangeSoundMode.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{			
@@ -139,6 +174,14 @@ public class ActivityManageProfile extends Activity
 				spinnerSoundMode.setEnabled(isChecked);
 			}
 		});
+		checkBoxChangeDnd.setOnCheckedChangeListener(new OnCheckedChangeListener()
+		{
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+			{
+				spinnerDndMode.setEnabled(isChecked);
+			}
+		});
 		checkBoxChangeVolumeMusicVideoGameMedia.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{			
 			@Override
@@ -327,6 +370,7 @@ public class ActivityManageProfile extends Activity
 	{
 		etName.setText(ActivityMainProfiles.profileToEdit.getName());
 		checkBoxChangeSoundMode.setChecked(ActivityMainProfiles.profileToEdit.getChangeSoundMode());
+		checkBoxChangeDnd.setChecked(ActivityMainProfiles.profileToEdit.getChangeDndMode());
 		checkBoxChangeVolumeMusicVideoGameMedia.setChecked(ActivityMainProfiles.profileToEdit.getChangeVolumeMusicVideoGameMedia());
 		checkBoxChangeVolumeNotifications.setChecked(ActivityMainProfiles.profileToEdit.getChangeVolumeNotifications());
 		checkBoxChangeVolumeAlarms.setChecked(ActivityMainProfiles.profileToEdit.getChangeVolumeAlarms());
@@ -338,6 +382,7 @@ public class ActivityManageProfile extends Activity
 		checkBoxChangeVibrateWhenRinging.setChecked(ActivityMainProfiles.profileToEdit.getChangeVibrateWhenRinging());
 		
 		spinnerSoundMode.setSelection(ActivityMainProfiles.profileToEdit.getSoundMode());
+		spinnerDndMode.setSelection(ActivityMainProfiles.profileToEdit.getDndMode()-1);
 		seekBarVolumeMusic.setProgress(ActivityMainProfiles.profileToEdit.getVolumeMusic());
 		seekBarVolumeNotifications.setProgress(ActivityMainProfiles.profileToEdit.getVolumeNotifications());
 		seekBarVolumeAlarms.setProgress(ActivityMainProfiles.profileToEdit.getVolumeAlarms());
@@ -359,6 +404,7 @@ public class ActivityManageProfile extends Activity
 			
 			ActivityMainProfiles.profileToEdit.setName(etName.getText().toString());
 			ActivityMainProfiles.profileToEdit.setChangeSoundMode(checkBoxChangeSoundMode.isChecked());
+			ActivityMainProfiles.profileToEdit.setChangeDndMode(checkBoxChangeDnd.isChecked());
 			ActivityMainProfiles.profileToEdit.setChangeVolumeMusicVideoGameMedia(checkBoxChangeVolumeMusicVideoGameMedia.isChecked());
 			ActivityMainProfiles.profileToEdit.setChangeVolumeNotifications(checkBoxChangeVolumeNotifications.isChecked());
 			ActivityMainProfiles.profileToEdit.setChangeVolumeAlarms(checkBoxChangeVolumeAlarms.isChecked());
@@ -374,6 +420,7 @@ public class ActivityManageProfile extends Activity
 			ActivityMainProfiles.profileToEdit.setHapticFeedback(checkBoxHapticFeedback.isChecked());
 			ActivityMainProfiles.profileToEdit.setVibrateWhenRinging(checkBoxVibrateWhenRinging.isChecked());
 			ActivityMainProfiles.profileToEdit.setSoundMode(spinnerSoundMode.getSelectedItemPosition());
+			ActivityMainProfiles.profileToEdit.setDndMode(spinnerDndMode.getSelectedItemPosition()+1);
 			ActivityMainProfiles.profileToEdit.setVolumeMusic(seekBarVolumeMusic.getProgress());
 			ActivityMainProfiles.profileToEdit.setVolumeNotifications(seekBarVolumeNotifications.getProgress());
 			ActivityMainProfiles.profileToEdit.setVolumeAlarms(seekBarVolumeAlarms.getProgress());
@@ -401,21 +448,23 @@ public class ActivityManageProfile extends Activity
 		}
 		
 		if(!checkBoxChangeSoundMode.isChecked()
-				&
+				&&
+			!checkBoxChangeDnd.isChecked()
+				&&
 			!checkBoxChangeVolumeMusicVideoGameMedia.isChecked()
-				&
+				&&
 			!checkBoxChangeVolumeNotifications.isChecked()
-				&
+				&&
 			!checkBoxChangeVolumeAlarms.isChecked()
-				&
+				&&
 			!checkBoxChangeIncomingCallsRingtone.isChecked()
-				&
+				&&
 			!checkBoxChangeNotificationRingtone.isChecked()
-				&
+				&&
 			!checkBoxChangeAudibleSelection.isChecked()
-				&
+				&&
 			!checkBoxChangeScreenLockUnlockSound.isChecked()
-				&
+				&&
 			!checkBoxChangeHapticFeedback.isChecked()
 			)
 		{

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

@@ -16,7 +16,7 @@ import android.widget.Toast;
 
 import com.jens.automation2.receivers.BluetoothReceiver;
 
-public class ActivityManageBluetoothTrigger extends Activity
+public class ActivityManageTriggerBluetooth extends Activity
 {
 	protected static Trigger editedBluetoothTrigger;
 	RadioButton radioAnyBluetoothDevice, radioNoDevice, radioDeviceFromList, radioBluetoothConnected, radioBluetoothDisconnected, radioBluetoothInRange, radioBluetoothOutRange;
@@ -29,7 +29,7 @@ public class ActivityManageBluetoothTrigger extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_bluetooth_trigger);
+		setContentView(R.layout.activity_manage_trigger_bluetooth);
 		
 		radioAnyBluetoothDevice = (RadioButton)findViewById(R.id.radioAnyBluetoothDevice);
 		radioNoDevice = (RadioButton)findViewById(R.id.radioNoDevice);
@@ -109,7 +109,7 @@ public class ActivityManageBluetoothTrigger extends Activity
 			}
 			else
 			{
-				Toast.makeText(ActivityManageBluetoothTrigger.this, getResources().getString(R.string.selectDeviceOption), Toast.LENGTH_LONG).show();
+				Toast.makeText(ActivityManageTriggerBluetooth.this, getResources().getString(R.string.selectDeviceOption), Toast.LENGTH_LONG).show();
 				return false;
 			}
 			
@@ -138,7 +138,7 @@ public class ActivityManageBluetoothTrigger extends Activity
 			}
 			else
 			{
-				Toast.makeText(ActivityManageBluetoothTrigger.this, getResources().getString(R.string.selectConnectionOption), Toast.LENGTH_LONG).show();
+				Toast.makeText(ActivityManageTriggerBluetooth.this, getResources().getString(R.string.selectConnectionOption), Toast.LENGTH_LONG).show();
 				return false;
 			}
 			

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

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

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

@@ -21,7 +21,7 @@ import android.widget.Toast;
 import com.jens.automation2.receivers.NfcReceiver;
 
 @SuppressLint("NewApi")
-public class ActivityManageNfc extends Activity
+public class ActivityManageTriggerNfc extends Activity
 {
 	public static String generatedId = null;
 	private static Tag discoveredTag = null;
@@ -39,7 +39,7 @@ public class ActivityManageNfc extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.manage_nfc);
+		setContentView(R.layout.activity_manage_trigger_nfc);
 		
 		etNewNfcIdValue = (EditText)findViewById(R.id.etNewNfcIdValue);
 		bReadNfcTag = (Button)findViewById(R.id.bReadNfcTag);
@@ -59,7 +59,7 @@ public class ActivityManageNfc extends Activity
 				}
 				else
 				{
-					progressDialog = ProgressDialog.show(ActivityManageNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
+					progressDialog = ProgressDialog.show(ActivityManageTriggerNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
 					{							
 						@Override
 						public void onCancel(DialogInterface dialog)
@@ -88,7 +88,7 @@ public class ActivityManageNfc extends Activity
 				}
 				else
 				{
-					progressDialog = ProgressDialog.show(ActivityManageNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
+					progressDialog = ProgressDialog.show(ActivityManageTriggerNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
 					{							
 						@Override
 						public void onCancel(DialogInterface dialog)
@@ -118,7 +118,7 @@ public class ActivityManageNfc extends Activity
 					}
 					else
 					{
-						progressDialog = ProgressDialog.show(ActivityManageNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
+						progressDialog = ProgressDialog.show(ActivityManageTriggerNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
 						{							
 							@Override
 							public void onCancel(DialogInterface dialog)
@@ -255,7 +255,7 @@ public class ActivityManageNfc extends Activity
 		if(generatedId.length() == 0)
 		{
 			generatedId = null;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcEnterValidIdentifier), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcEnterValidIdentifier), Toast.LENGTH_LONG).show();
 			return false;
 		}
 		else
@@ -267,14 +267,14 @@ public class ActivityManageNfc extends Activity
 		if(NfcReceiver.writeTag(generatedId, discoveredTag))
 		{
 			currentStatus = 0;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcTagWrittenSuccessfully), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcTagWrittenSuccessfully), Toast.LENGTH_LONG).show();
 			setResult(RESULT_OK);
 			finish();
 		}
 		else
 		{
 			currentStatus = 0;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcTagWriteError), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcTagWriteError), Toast.LENGTH_LONG).show();
 			Miscellaneous.logEvent("e", "NFC", getResources().getString(R.string.nfcTagWriteError), 2);
 		}		
 	}
@@ -285,14 +285,14 @@ public class ActivityManageNfc extends Activity
 		if(checkEnteredText(false))
 		{
 			currentStatus = 0;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcTagReadSuccessfully), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcTagReadSuccessfully), Toast.LENGTH_LONG).show();
 			setResult(RESULT_OK);
 			finish();
 		}
 		else
 		{
 			currentStatus = 0;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcValueNotSuitable), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcValueNotSuitable), Toast.LENGTH_LONG).show();
 			generatedId = null;
 		}
 	}

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

@@ -0,0 +1,398 @@
+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.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import static com.jens.automation2.Trigger.triggerParameter2Split;
+
+public class ActivityManageTriggerNotification extends Activity
+{
+	public static Trigger editedNotificationTrigger;
+	boolean edit = false;
+	ProgressDialog progressDialog = null;
+
+	EditText etNotificationTitle, etNotificationText;
+	Button bSelectApp, bSaveTriggerNotification;
+	Spinner spinnerTitleDirection, spinnerTextDirection;
+	TextView tvSelectedApplication;
+	CheckBox chkNotificationDirection;
+	
+	private static List<PackageInfo> pInfos = null;
+	public static Trigger resultingTrigger;
+
+	private static String[] directions;
+
+	ArrayAdapter<String> directionSpinnerAdapter;
+	
+	public static void getActivityList(final Context context)
+	{
+		if(pInfos == null)
+		{
+			pInfos = context.getPackageManager().getInstalledPackages(PackageManager.GET_ACTIVITIES);
+			Collections.sort(pInfos, new Comparator<PackageInfo>()
+			{
+			    public int compare(PackageInfo obj1, PackageInfo obj2)
+			    {
+			    	String name1 = "";
+					String name2 = "";
+
+					ApplicationInfo aInfo1 = obj1.applicationInfo;
+					if (aInfo1 != null)
+					{
+						name1 = (String) context.getPackageManager().getApplicationLabel(aInfo1);
+					}
+					ApplicationInfo aInfo2 = obj2.applicationInfo;
+					if (aInfo2 != null)
+					{
+						name2 = (String) context.getPackageManager().getApplicationLabel(aInfo2);
+					}
+
+					return name1.compareTo(name2);
+			    }
+			});
+		}
+	}
+ 
+	public static String[] getApplicationNameListString(Context myContext)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			ApplicationInfo aInfo = pInfo.applicationInfo;
+			if (aInfo != null)
+			{
+				String aLabel;
+	
+				aLabel = (String) myContext.getPackageManager().getApplicationLabel(aInfo);
+
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null && aInfos.length > 0)		// Only put Applications into the list that have packages.
+				{
+					if(!returnList.contains(aLabel))
+						returnList.add(aLabel);
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+
+	public static String[] getPackageListString(Context myContext, String applicationLabel)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(myContext.getPackageManager().getApplicationLabel(pInfo.applicationInfo).equals(applicationLabel))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null && aInfos.length > 0)
+				{
+					returnList.add(pInfo.packageName);
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+
+	public static String[] getPackageListString(Context myContext)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			ActivityInfo[] aInfos = pInfo.activities;
+			if (aInfos != null && aInfos.length > 0)
+			{
+				returnList.add(pInfo.packageName);
+			}
+			else
+				Miscellaneous.logEvent("w", "Empty Application", "Application " + myContext.getPackageManager().getApplicationLabel(pInfo.applicationInfo) + " doesn\'t have packages.", 5);
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+	
+	public static String[] getActivityListForPackageName(String packageName)
+	{
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(pInfo.packageName.equals(packageName))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null)
+				{
+					for (ActivityInfo activityInfo : aInfos)
+					{
+						returnList.add(activityInfo.name);
+					}
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+	
+	public static ActivityInfo getActivityInfoForPackageNameAndActivityName(String packageName, String activityName)
+	{
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(pInfo.packageName.equals(packageName))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null)
+				{
+					for (ActivityInfo activityInfo : aInfos)
+					{
+						if(activityInfo.name.equals(activityName))
+							return activityInfo;
+					}
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	private AlertDialog getActionStartActivityDialog1()
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		alertDialogBuilder.setTitle(getResources().getString(R.string.selectApplication));
+		final String[] applicationArray = ActivityManageTriggerNotification.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 = ActivityManageTriggerNotification.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[] = ActivityManageTriggerNotification.getActivityListForPackageName(packageName);
+		alertDialogBuilder.setItems(activityArray, new DialogInterface.OnClickListener()
+		{			
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				ActivityInfo ai = ActivityManageTriggerNotification.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_trigger_notification);
+
+		etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle);
+		etNotificationText = (EditText)findViewById(R.id.etNotificationText);
+		bSelectApp = (Button)findViewById(R.id.bSelectApp);
+		bSaveTriggerNotification = (Button)findViewById(R.id.bSaveTriggerNotification);
+		spinnerTitleDirection = (Spinner)findViewById(R.id.spinnerTitleDirection);
+		spinnerTextDirection = (Spinner)findViewById(R.id.spinnerTextDirection);
+		tvSelectedApplication = (TextView)findViewById(R.id.etActivityOrActionPath);
+		chkNotificationDirection = (CheckBox)findViewById(R.id.chkNotificationDirection);
+
+		directions = new String[] {
+									getResources().getString(R.string.directionStringEquals),
+									getResources().getString(R.string.directionStringContains),
+									getResources().getString(R.string.directionStringStartsWith),
+									getResources().getString(R.string.directionStringEndsWith),
+									getResources().getString(R.string.directionStringNotEquals)
+								};
+
+		directionSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageTriggerNotification.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(ActivityManageTriggerNotification.this, "", ActivityManageTriggerNotification.this.getResources().getString(R.string.gettingListOfInstalledApplications));
+			}
+		});
+
+		chkNotificationDirection.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+		{
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+			{
+				if(isChecked)
+					chkNotificationDirection.setText(getResources().getString(R.string.notificationAppears));
+				else
+					chkNotificationDirection.setText(getResources().getString(R.string.notificationDisappears));
+			}
+		});
+		
+		bSaveTriggerNotification.setOnClickListener(new OnClickListener()
+		{		
+			@Override
+			public void onClick(View v)
+			{
+				String app;
+				if(tvSelectedApplication.getText().toString().equalsIgnoreCase(getResources().getString(R.string.anyApp)))
+					app = "-1";
+				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();
+
+				if(edit)
+				{
+					editedNotificationTrigger.setTriggerParameter(chkNotificationDirection.isChecked());
+					editedNotificationTrigger.setTriggerParameter2(app + triggerParameter2Split + titleDir + triggerParameter2Split + title + triggerParameter2Split + textDir + triggerParameter2Split + text);
+					ActivityManageTriggerNotification.this.setResult(RESULT_OK);
+				}
+				else
+				{
+					Intent data = new Intent();
+					data.putExtra("direction", chkNotificationDirection.isChecked());
+					data.putExtra("app", app);
+					data.putExtra("titleDir", titleDir);
+					data.putExtra("title", title);
+					data.putExtra("textDir", textDir);
+					data.putExtra("text", text);
+					ActivityManageTriggerNotification.this.setResult(RESULT_OK, data);
+				}
+
+				finish();
+			}
+		});
+
+		Intent i = getIntent();
+		if(i.getBooleanExtra("edit", false) == true)
+		{
+			edit = true;
+			loadValuesIntoGui();
+		}
+	}
+	
+	private void loadValuesIntoGui()
+	{
+		chkNotificationDirection.setChecked(editedNotificationTrigger.getTriggerParameter());
+
+		String[] params = editedNotificationTrigger.getTriggerParameter2().split(triggerParameter2Split);
+
+		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("-1"))
+			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(ActivityManageTriggerNotification.this);
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(Void result)
+		{
+			progressDialog.dismiss();
+			getActionStartActivityDialog1().show();
+		}
+	}
+}

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

@@ -0,0 +1,212 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RadioButton;
+
+import androidx.annotation.NonNull;
+
+import static com.jens.automation2.Trigger.triggerParameter2Split;
+
+public class ActivityManageTriggerPhoneCall extends Activity
+{
+    public static Trigger editedPhoneCallTrigger;
+    boolean edit = false;
+    public static Trigger resultingTrigger;
+    ProgressDialog progressDialog = null;
+    protected final static int requestCodeForContactsPermissions = 2345;
+    protected final static int requestCodeGetContact = 3235;
+
+    EditText etTriggerPhoneCallPhoneNumber;
+    RadioButton rbTriggerPhoneCallStateRinging, rbTriggerPhoneCallStateStarted, rbTriggerPhoneCallStateStopped, rbTriggerPhoneCallDirectionAny, rbTriggerPhoneCallDirectionIncoming, rbTriggerPhoneCallDirectionOutgoing;
+    Button bSaveTriggerPhoneCall, bTriggerPhoneCallImportFromContacts;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_trigger_phone_call);
+
+        etTriggerPhoneCallPhoneNumber = (EditText)findViewById(R.id.etTriggerPhoneCallPhoneNumber);
+        rbTriggerPhoneCallStateRinging = (RadioButton)findViewById(R.id.rbTriggerPhoneCallStateRinging);
+        rbTriggerPhoneCallStateStarted = (RadioButton)findViewById(R.id.rbTriggerPhoneCallStateStarted);
+        rbTriggerPhoneCallStateStopped = (RadioButton)findViewById(R.id.rbTriggerPhoneCallStateStopped);
+        rbTriggerPhoneCallDirectionAny = (RadioButton)findViewById(R.id.rbTriggerPhoneCallDirectionAny);
+        rbTriggerPhoneCallDirectionIncoming = (RadioButton)findViewById(R.id.rbTriggerPhoneCallDirectionIncoming);
+        rbTriggerPhoneCallDirectionOutgoing = (RadioButton)findViewById(R.id.rbTriggerPhoneCallDirectionOutgoing);
+        bTriggerPhoneCallImportFromContacts = (Button) findViewById(R.id.bTriggerPhoneCallImportFromContacts);
+        bSaveTriggerPhoneCall = (Button) findViewById(R.id.bSaveTriggerPhoneCall);
+
+        bSaveTriggerPhoneCall.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                String tp2Result = "";
+
+                if(rbTriggerPhoneCallStateRinging.isChecked())
+                    tp2Result += Trigger.triggerPhoneCallStateRinging;
+                else if(rbTriggerPhoneCallStateStarted.isChecked())
+                    tp2Result += Trigger.triggerPhoneCallStateStarted;
+                else if(rbTriggerPhoneCallStateStopped.isChecked())
+                    tp2Result += Trigger.triggerPhoneCallStateStopped;
+
+                tp2Result += triggerParameter2Split;
+
+                if(rbTriggerPhoneCallDirectionAny.isChecked())
+                    tp2Result += Trigger.triggerPhoneCallDirectionAny;
+                else if(rbTriggerPhoneCallDirectionIncoming.isChecked())
+                    tp2Result += Trigger.triggerPhoneCallDirectionIncoming;
+                else if(rbTriggerPhoneCallDirectionOutgoing.isChecked())
+                    tp2Result += Trigger.triggerPhoneCallDirectionOutgoing;
+
+                tp2Result += triggerParameter2Split;
+
+                if(etTriggerPhoneCallPhoneNumber.getText() != null && etTriggerPhoneCallPhoneNumber.getText().toString().length() > 0)
+                    tp2Result += etTriggerPhoneCallPhoneNumber.getText().toString();
+                else
+                    tp2Result += Trigger.triggerPhoneCallNumberAny;
+
+                if(edit)
+                {
+                    editedPhoneCallTrigger.setTriggerParameter(false);
+                    editedPhoneCallTrigger.setTriggerParameter2(tp2Result);
+                    ActivityManageTriggerPhoneCall.this.setResult(RESULT_OK);
+                }
+                else
+                {
+                    Intent data = new Intent();
+                    data.putExtra("triggerParameter", false);
+                    data.putExtra("triggerParameter2", tp2Result);
+                    ActivityManageTriggerPhoneCall.this.setResult(RESULT_OK, data);
+                }
+
+                finish();
+            }
+        });
+
+        bTriggerPhoneCallImportFromContacts.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !ActivityPermissions.havePermission("android.permission.READ_CONTACTS", ActivityManageTriggerPhoneCall.this))
+                {
+                    requestPermissions("android.permission.READ_CONTACTS");
+                }
+                else
+                    openContactsDialogue();
+            }
+        });
+
+        Intent i = getIntent();
+        if(i.getBooleanExtra("edit", false) == true)
+        {
+            edit = true;
+            loadValuesIntoGui();
+        }
+    }
+
+    protected void requestPermissions(String... requiredPermissions)
+    {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+        {
+            if(requiredPermissions.length > 0)
+            {
+                StringBuilder permissions = new StringBuilder();
+                for (String perm : requiredPermissions)
+                    permissions.append(perm + "; ");
+                if (permissions.length() > 0)
+                    permissions.delete(permissions.length() - 2, permissions.length());
+
+                Miscellaneous.logEvent("i", "Permissions", "Requesting permissions: " + permissions, 2);
+
+                requestPermissions(requiredPermissions, requestCodeForContactsPermissions);
+            }
+        }
+    }
+
+    private void openContactsDialogue()
+    {
+        Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Phone.CONTENT_URI);
+        startActivityForResult(intent, requestCodeGetContact);
+    }
+
+    private void loadValuesIntoGui()
+    {
+        String[] parts = editedPhoneCallTrigger.getTriggerParameter2().split(triggerParameter2Split);
+
+        if(parts[0].equals(Trigger.triggerPhoneCallStateRinging))
+            rbTriggerPhoneCallStateRinging.setChecked(true);
+        else if(parts[0].equals(Trigger.triggerPhoneCallStateStarted))
+            rbTriggerPhoneCallStateStarted.setChecked(true);
+        else if(parts[0].equals(Trigger.triggerPhoneCallStateStopped))
+            rbTriggerPhoneCallStateStopped.setChecked(true);
+
+        if(parts[1].equals(Trigger.triggerPhoneCallDirectionAny))
+            rbTriggerPhoneCallDirectionAny.setChecked(true);
+        else if(parts[1].equals(Trigger.triggerPhoneCallDirectionIncoming))
+            rbTriggerPhoneCallDirectionIncoming.setChecked(true);
+        else if(parts[1].equals(Trigger.triggerPhoneCallDirectionOutgoing))
+            rbTriggerPhoneCallDirectionOutgoing.setChecked(true);
+
+        if(!parts[2].equals(Trigger.triggerPhoneCallNumberAny))
+            etTriggerPhoneCallPhoneNumber.setText(parts[2]);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        if(requestCode == requestCodeGetContact)
+        {
+            if(resultCode == Activity.RESULT_OK)
+            {
+                String phoneNo = null;
+                String name = null;
+
+                Uri uri = data.getData();
+                Cursor cursor = ActivityManageTriggerPhoneCall.this.getContentResolver().query(uri, null, null, null, null);
+
+                if (cursor.moveToFirst())
+                {
+                    int phoneIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
+                    int nameIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
+
+                    phoneNo = cursor.getString(phoneIndex);
+                    name = cursor.getString(nameIndex);
+
+                    etTriggerPhoneCallPhoneNumber.setText(phoneNo);
+                }
+            }
+        }
+        //super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults)
+    {
+        if(requestCode == requestCodeForContactsPermissions)
+        {
+            for(int i=0; i<permissions.length; i++)
+            {
+                if(permissions[i].equals("android.permission.READ_CONTACTS"))
+                {
+                    if(grantResults[i] == PackageManager.PERMISSION_GRANTED)
+                    {
+                        openContactsDialogue();
+                    }
+                }
+            }
+        }
+    }
+}

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

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

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

@@ -0,0 +1,193 @@
+package com.jens.automation2;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+
+import com.jens.automation2.receivers.BluetoothReceiver;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ActivityManageTriggerWifi extends Activity
+{
+    RadioButton rbTriggerWifiConnected, rbTriggerWifiDisconnected;
+    EditText etTriggerWifiName;
+    Spinner spinnerWifiList;
+    Button btriggerWifiSave, bLoadWifiList;
+    List<String> wifiList = new ArrayList<>();
+    ArrayAdapter<String> wifiSpinnerAdapter;
+    private final static int requestCodeLocationPermission = 124;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_trigger_wifi);
+
+        rbTriggerWifiConnected = (RadioButton) findViewById(R.id.rbTriggerWifiConnected);
+        rbTriggerWifiDisconnected = (RadioButton) findViewById(R.id.rbTriggerWifiDisconnected);
+        etTriggerWifiName = (EditText) findViewById(R.id.etTriggerWifiName);
+        spinnerWifiList = (Spinner) findViewById(R.id.spinnerWifiList);
+        btriggerWifiSave = (Button) findViewById(R.id.btriggerWifiSave);
+        bLoadWifiList = (Button) findViewById(R.id.bLoadWifiList);
+
+        wifiSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, wifiList);
+        spinnerWifiList.setAdapter(wifiSpinnerAdapter);
+        spinnerWifiList.setEnabled(false);  // bug in Android; this only works when done in code, not in xml
+
+        if (getIntent().hasExtra("edit"))
+        {
+            boolean connected = getIntent().getBooleanExtra("wifiState", false);
+            String wifiName = getIntent().getStringExtra("wifiName");
+
+            rbTriggerWifiConnected.setChecked(connected);
+            rbTriggerWifiDisconnected.setChecked(!connected);
+
+            etTriggerWifiName.setText(wifiName);
+        }
+
+        btriggerWifiSave.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent response = new Intent();
+                response.putExtra("wifiState", rbTriggerWifiConnected.isChecked());
+                response.putExtra("wifiName", etTriggerWifiName.getText().toString());
+                setResult(RESULT_OK, response);
+                finish();
+            }
+        });
+
+        spinnerWifiList.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
+        {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+            {
+                etTriggerWifiName.setText(wifiList.get(position));
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent)
+            {
+
+            }
+        });
+
+        bLoadWifiList.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                loadWifis();
+            }
+        });
+    }
+
+    public void loadWifis()
+    {
+        if(!ActivityPermissions.havePermission(Manifest.permission.ACCESS_FINE_LOCATION, ActivityManageTriggerWifi.this))
+        {
+            AlertDialog dialog = Miscellaneous.messageBox(getResources().getString(R.string.permissionsTitle), getResources().getString(R.string.needLocationPermForWifiList), ActivityManageTriggerWifi.this);
+            dialog.setOnDismissListener(new DialogInterface.OnDismissListener()
+            {
+                @Override
+                public void onDismiss(DialogInterface dialog)
+                {
+                    ActivityCompat.requestPermissions(ActivityManageTriggerWifi.this, new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, requestCodeLocationPermission);
+                }
+            });
+            dialog.show();
+        }
+        else
+        {
+            reallyLoadWifiList();
+        }
+    }
+
+    void reallyLoadWifiList()
+    {
+        if(Build.VERSION.SDK_INT >= 30)
+        {
+            Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.wifiApi30), ActivityManageTriggerWifi.this).show();
+            loadListOfVisibleWifis();
+        }
+        else
+        {
+            WifiManager myWifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+
+            for (WifiConfiguration wifi : myWifiManager.getConfiguredNetworks())
+                wifiList.add(wifi.SSID.replaceAll("\"+$", "").replaceAll("^\"+", ""));
+        }
+
+        if (wifiList.size() > 0)
+        {
+            spinnerWifiList.setEnabled(true);
+            Collections.sort(wifiList);
+        }
+        else
+        {
+            spinnerWifiList.setEnabled(false);
+            Toast.makeText(ActivityManageTriggerWifi.this, getResources().getString(R.string.noKnownWifis), Toast.LENGTH_SHORT).show();
+        }
+
+        wifiSpinnerAdapter.notifyDataSetChanged();
+    }
+
+    void loadListOfVisibleWifis()
+    {
+        List<ScanResult> results = null;
+
+        try
+        {
+            WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
+            results = wifiManager.getScanResults();
+
+            for (ScanResult wifi : results)
+                wifiList.add(wifi.SSID.replaceAll("\"+$", "").replaceAll("^\"+", ""));
+        }
+        catch(Exception e)
+        {
+            Miscellaneous.logEvent("e", "loadListOfVisibleWifis()", Log.getStackTraceString(e), 1);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults)
+    {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        switch (requestCode)
+        {
+            case requestCodeLocationPermission:
+                if(grantResults[0] == PackageManager.PERMISSION_GRANTED)
+                    reallyLoadWifiList();
+                break;
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.jens.automation2;
 
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.PreferenceActivity;
 
@@ -9,11 +10,18 @@ import com.jens.automation2.R.layout;
 public class ActivitySettings extends PreferenceActivity
 {
 	ListPreference lpStartScreenOptionsValues;
+	CheckBoxPreference chkPrefUpdateCheck;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		addPreferencesFromResource(layout.settings);
+		addPreferencesFromResource(layout.activity_settings);
+
+		if(BuildConfig.FLAVOR.equals("apkFlavor"))
+		{
+			chkPrefUpdateCheck = (CheckBoxPreference) findPreference("automaticUpdateCheck");
+			chkPrefUpdateCheck.setEnabled(true);
+		}
 	}
 }

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

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

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

@@ -0,0 +1,65 @@
+package com.jens.automation2;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+
+public class AsyncTasks
+{
+    public static class AsyncTaskUpdateCheck extends AsyncTask<Context, Void, Boolean>
+    {
+        public static boolean checkRunning = false;
+
+        @Override
+        protected Boolean doInBackground(Context... contexts)
+        {
+            if(checkRunning)
+                return false;
+            else
+                checkRunning = true;
+
+            try
+            {
+                String result = Miscellaneous.downloadURL("https://server47.de/automation/?action=getLatestVersionCode", null, null).trim();
+                int latestVersion = Integer.parseInt(result);
+
+                // At this point the update check itself has already been successful.
+
+                Settings.lastUpdateCheck = Calendar.getInstance().getTimeInMillis();
+                Settings.writeSettings(contexts[0]);
+
+                if (latestVersion > BuildConfig.VERSION_CODE)
+                {
+                    // There's a new update
+                    return true;
+                }
+            }
+            catch (Exception e)
+            {
+                Miscellaneous.logEvent("e", "Error checking for update", Log.getStackTraceString(e), 3);
+            }
+
+            return false;
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result)
+        {
+            try
+            {
+                ActivityMainScreen.getActivityMainScreenInstance().processUpdateCheckResult(result);
+            }
+            catch (NullPointerException e)
+            {
+                Miscellaneous.logEvent("e", "NewsDownload", "There was a problem displaying the update check result, probably ActivityMainScreen isn't currently shown: " + Log.getStackTraceString(e), 2);
+            }
+            catch (Exception e)
+            {
+                Miscellaneous.logEvent("e", "NewsDownload", "There was a problem displaying the update check result: " + Log.getStackTraceString(e), 2);
+            }
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.jens.automation2;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -23,6 +24,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.jens.automation2.Trigger.Trigger_Enum;
 import com.jens.automation2.location.LocationProvider;
@@ -121,14 +123,14 @@ public class AutomationService extends Service implements OnInitListener
 
 		if(Build.VERSION.SDK_INT >= 28)
 		{
-			if (!ActivityPermissions.havePermission(ActivityPermissions.permissionNameStartService, AutomationService.this))
+			if (!ActivityPermissions.havePermission(Manifest.permission.FOREGROUND_SERVICE, AutomationService.this))
 			{
 			/*
 				Don't have permission to start service. This is a show stopper.
 			 */
 				Miscellaneous.logEvent("e", "Permission", "Don't have permission to start foreground service. Will request it now.", 4);
 //			Toast.makeText(AutomationService.this, getResources().getString(R.string.appRequiresPermissiontoAccessExternalStorage), Toast.LENGTH_LONG).show();
-				ActivityPermissions.requestSpecificPermission(ActivityPermissions.permissionNameStartService);
+				ActivityPermissions.requestSpecificPermission(Manifest.permission.FOREGROUND_SERVICE);
 				return false;
 			}
 		}
@@ -196,7 +198,8 @@ public class AutomationService extends Service implements OnInitListener
 
 		if (checkStartupRequirements(this, startAtBoot))
 		{
-			Miscellaneous.logEvent("i", "Service", this.getResources().getString(R.string.logServiceStarting), 1);
+			Miscellaneous.logEvent("i", "Service", this.getResources().getString(R.string.logServiceStarting) + " VERSION_CODE: " + BuildConfig.VERSION_CODE + ", VERSION_NAME: " + BuildConfig.VERSION_NAME + ", flavor: " + BuildConfig.FLAVOR, 1);
+			Miscellaneous.logEvent("i", "Service", ActivityMaintenance.getSystemInfo(), 1);
 
 			startUpRoutine();
 
@@ -210,7 +213,7 @@ public class AutomationService extends Service implements OnInitListener
 				ActivityMainScreen.updateMainScreen();
 
             this.isRunning = true;
-			Miscellaneous.logEvent("i", "Service", this.getResources().getString(R.string.serviceStarted) + " " + String.format(this.getResources().getString(R.string.version), BuildConfig.VERSION_NAME + "(Build " + BuildConfig.VERSION_CODE + ")"), 1);
+			Miscellaneous.logEvent("i", "Service", this.getResources().getString(R.string.serviceStarted) + " VERSION_CODE: " + BuildConfig.VERSION_CODE + ", VERSION_NAME: " + BuildConfig.VERSION_NAME + ", flavor: " + BuildConfig.FLAVOR, 1);
 			Toast.makeText(this, this.getResources().getString(R.string.serviceStarted), Toast.LENGTH_LONG).show();
 			// ********** Test area **********
 //			Miscellaneous.logEvent("i", "setNetworkType", "bin hier.", 3);
@@ -257,7 +260,8 @@ public class AutomationService extends Service implements OnInitListener
 			case reloadSettings:
 				Settings.readFromPersistentStorage(this);
 				applySettingsAndRules();
-				myLocationProvider.applySettingsAndRules();
+				if(myLocationProvider != null)
+					myLocationProvider.applySettingsAndRules();
 				break;
 			case updateNotification:
 				this.updateNotification();
@@ -270,16 +274,7 @@ public class AutomationService extends Service implements OnInitListener
 
 	public void applySettingsAndRules()
 	{
-		if (Settings.useTextToSpeechOnNormal | Settings.useTextToSpeechOnSilent | Settings.useTextToSpeechOnVibrate)
-		{
-			if (ttsEngine == null)
-				ttsEngine = new TextToSpeech(this, this);
-		}
-		else
-		{
-			if (ttsEngine != null)
-				ttsEngine.shutdown();
-		}
+		checkForTtsEngine();
 
 		startLocationProvider();
 		ReceiverCoordinator.startAllReceivers();
@@ -302,7 +297,7 @@ public class AutomationService extends Service implements OnInitListener
 
 	public void checkForTtsEngine()
 	{
-		if (Settings.useTextToSpeechOnNormal | Settings.useTextToSpeechOnSilent | Settings.useTextToSpeechOnVibrate | Rule.isAnyRuleUsing(Action.Action_Enum.speakText))
+		if (Settings.useTextToSpeechOnNormal || Settings.useTextToSpeechOnSilent || Settings.useTextToSpeechOnVibrate || Rule.isAnyRuleUsing(Action.Action_Enum.speakText))
 		{
 			if (ttsEngine == null)
 				ttsEngine = new TextToSpeech(this, this);
@@ -331,7 +326,7 @@ public class AutomationService extends Service implements OnInitListener
 
 	protected void startLocationProvider()
 	{
-		if(ActivityPermissions.havePermission("android.permission.ACCESS_COARSE_LOCATION", AutomationService.this))
+		if(ActivityPermissions.havePermission(Manifest.permission.ACCESS_COARSE_LOCATION, AutomationService.this))
 			myLocationProvider = new LocationProvider(this); //autostart with this (only) constructor
 	}
 
@@ -341,19 +336,22 @@ public class AutomationService extends Service implements OnInitListener
 		{
 			boolean displayNotification = false;
 
+			String rule = "";
+
+			outerLoop:
 			for(Rule r : Rule.getRuleCollection())
 			{
 				if(r.isRuleActive())
 				{
 					if(!r.haveEnoughPermissions())
-//					for (String permission : ActivityPermissions.getPermissionsForRule(r))
 					{
-//						if (!ActivityPermissions.havePermission(permission, AutomationService.this))
 						{
-//							r.setRuleActive(false);
-//							r.change(AutomationService.this);
 							if(!displayNotification)
+							{
 								displayNotification = true;
+								rule = r.getName();
+								break outerLoop;
+							}
 						}
 					}
 				}
@@ -361,18 +359,16 @@ public class AutomationService extends Service implements OnInitListener
 
 			if(displayNotification)
 			{
-//				Toast.makeText(Miscellaneous.getAnyContext(), "Require more permissions.", Toast.LENGTH_LONG).show();
-				// Update notification or show new one that notifiies of the lack or permissions.
-
 				Intent intent = new Intent(AutomationService.this, ActivityPermissions.class);
 				PendingIntent pi = PendingIntent.getActivity(AutomationService.this, 0, intent, 0);
+
+				Miscellaneous.logEvent("w", "Features disabled", "Features disabled because of rule " + rule, 5);
+
 				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
 					Miscellaneous.createDismissableNotificationWithDelay(1010, getResources().getString(R.string.featuresDisabled), ActivityPermissions.notificationIdPermissions, pi);
 				else
 					Miscellaneous.createDismissableNotification(getResources().getString(R.string.featuresDisabled), ActivityPermissions.notificationIdPermissions, pi);
 			}
-//			else
-//				Toast.makeText(Miscellaneous.getAnyContext(), "Have all required permissions.", Toast.LENGTH_LONG).show();
 		}
 	}
 
@@ -389,6 +385,9 @@ public class AutomationService extends Service implements OnInitListener
 				Intent intent = new Intent(AutomationService.this, ActivityMainTabLayout.class);
 				PendingIntent pi = PendingIntent.getActivity(AutomationService.this, 0, intent, 0);
 //				Miscellaneous.createDismissableNotification(getResources().getString(R.string.settingsReferringToRestrictedFeatures), ActivityPermissions.notificationIdPermissions, pi);
+
+				Miscellaneous.logEvent("w", "Features disabled", "Background location disabled because Google to blame.", 5);
+
 				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
 					Miscellaneous.createDismissableNotificationWithDelay(3300, getResources().getString(R.string.featuresDisabled), notificationIdRestrictions, pi);
 				else
@@ -397,6 +396,11 @@ public class AutomationService extends Service implements OnInitListener
 		}
 	}
 
+	public void cancelNotification()
+	{
+		NotificationManagerCompat.from(AutomationService.this).cancelAll();
+	}
+
 	protected void checkForMissingBackgroundLocationPermission()
 	{
 		if(Miscellaneous.googleToBlameForLocation(true))
@@ -404,28 +408,13 @@ public class AutomationService extends Service implements OnInitListener
 			Intent intent = new Intent(AutomationService.this, ActivityMainTabLayout.class);
 			PendingIntent pi = PendingIntent.getActivity(AutomationService.this, 0, intent, 0);
 
+			Miscellaneous.logEvent("w", "Features disabled", "Background location disabled because Google to blame.", 5);
+
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
 				Miscellaneous.createDismissableNotificationWithDelay(2200, getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, pi);
 			else
 				Miscellaneous.createDismissableNotification(getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, pi);
 		}
-
-		/*
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-		{
-			if (BuildConfig.FLAVOR.equalsIgnoreCase("googlePlayFlavor"))
-			{
-				if (Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest))
-				{
-					Intent intent = new Intent(AutomationService.this, ActivityMainTabLayout.class);
-					PendingIntent pi = PendingIntent.getActivity(AutomationService.this, 0, intent, 0);
-					if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
-						Miscellaneous.createDismissableNotificationWithDelay(2200, getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, pi);
-					else
-						Miscellaneous.createDismissableNotification(getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, pi);
-				}
-			}
-		}*/
 	}
 
 	public static void startAutomationService(Context context, boolean startAtBoot)
@@ -445,7 +434,7 @@ public class AutomationService extends Service implements OnInitListener
 	
 	private void stopRoutine()
 	{
-		Log.i("STOP", "Stopping");
+		Miscellaneous.logEvent("i", "Service", "Stopping service...", 3);
 		try
 		{
 			myLocationProvider.stopLocationService();
@@ -474,7 +463,6 @@ public class AutomationService extends Service implements OnInitListener
 		builder.setWhen(System.currentTimeMillis());
 		builder.setContentIntent(myPendingIntent);
 
-//		Notification defaultNotification = new Notification();
 		Notification defaultNotification = builder.build();
 
 		defaultNotification.icon = R.drawable.ic_launcher;
@@ -492,31 +480,6 @@ public class AutomationService extends Service implements OnInitListener
 //		defaultNotification.ledOffMS = 1500;
 
 		return builder;
-
-		/*NotificationManager mNotificationManager = (NotificationManager) AutomationService.getInstance().getSystemService(Context.NOTIFICATION_SERVICE);
-
-		NotificationCompat.Builder builder;
-			builder = new NotificationCompat.Builder(AutomationService.getInstance());
-
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-			builder.setCategory(Notification.CATEGORY_EVENT);
-
-		builder.setWhen(System.currentTimeMillis());
-
-		builder.setContentTitle("Automation");
-		builder.setSmallIcon(R.drawable.ic_launcher);
-//		builder.setContentText(textToDisplay);
-//		builder.setSmallIcon(icon);
-//		builder.setContentIntent(pendingIntent);
-//		builder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-		{
-			NotificationChannel channel = new NotificationChannel("notify_001", "Channel human readable title", NotificationManager.IMPORTANCE_DEFAULT);
-			mNotificationManager.createNotificationChannel(channel);
-		}
-
-		return builder;*/
 	}
 	
 	protected static NotificationCompat.Builder createDefaultNotificationBuilder()
@@ -566,76 +529,68 @@ public class AutomationService extends Service implements OnInitListener
 		
 		if(instance != null)
 		{
-//			if(Settings.showIconWhenServiceIsRunning)
-//			{
-				Miscellaneous.logEvent("i", "Notification", "Request to update notification.", 4);
-				
-				String bodyText="";
-				String lastRuleString = "";
-				
-				if(PointOfInterest.getPointOfInterestCollection() != null && PointOfInterest.getPointOfInterestCollection().size() > 0)
-				{
-					try
-					{
-						PointOfInterest activePoi = PointOfInterest.getActivePoi();
-						if(activePoi == null)
-						{
-							PointOfInterest closestPoi = PointOfInterest.getClosestPOI(instance.getLocationProvider().getCurrentLocation());
-							bodyText = "Active POI: none" + "\n" + "Closest POI: " + closestPoi.getName() + lastRuleString;
-						}
-						else
-						{
-							bodyText = "Active POI: " + activePoi.getName() + lastRuleString;
-						}
-					}
-					catch(NullPointerException e)
-					{
-						if(
-								Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest)
-										&&
-								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationCoarse, AutomationService.getInstance())
-										&&
-								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationFine, AutomationService.getInstance())
-						  )
-							bodyText = instance.getResources().getString(R.string.stillGettingPosition);
-						else
-							bodyText = instance.getResources().getString(R.string.locationEngineNotActive);
-					}
-				}
-		
+			Miscellaneous.logEvent("i", "Notification", "Request to update notification.", 4);
+
+			String bodyText="";
+			String lastRuleString = "";
+
+			if(PointOfInterest.getPointOfInterestCollection() != null && PointOfInterest.getPointOfInterestCollection().size() > 0)
+			{
 				try
 				{
-					lastRuleString = instance.getResources().getString(R.string.lastRule) + " " + Rule.getLastActivatedRule().getName()  + " " + instance.getResources().getString(R.string.at) + " " + Rule.getLastActivatedRuleActivationTime().toLocaleString();
+					PointOfInterest activePoi = PointOfInterest.getActivePoi();
+					if(activePoi == null)
+					{
+						PointOfInterest closestPoi = PointOfInterest.getClosestPOI(instance.getLocationProvider().getCurrentLocation());
+						bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + AutomationService.getInstance().getResources().getString(R.string.none) + "\n" + AutomationService.getInstance().getResources().getString(R.string.closestPoi) + ": " + closestPoi.getName() + lastRuleString;
+					}
+					else
+					{
+						bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + activePoi.getName() + lastRuleString;
+					}
 				}
-				catch(Exception e)
+				catch(NullPointerException e)
 				{
-					lastRuleString = instance.getResources().getString(R.string.lastRule) + " n./a.";
+					if(
+							Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest)
+									&&
+							ActivityPermissions.havePermission(Manifest.permission.ACCESS_COARSE_LOCATION, AutomationService.getInstance())
+									&&
+							ActivityPermissions.havePermission(Manifest.permission.ACCESS_FINE_LOCATION, AutomationService.getInstance())
+					  )
+						bodyText = instance.getResources().getString(R.string.stillGettingPosition);
+					else
+						bodyText = instance.getResources().getString(R.string.locationEngineNotActive);
 				}
+			}
 
-				String textToDisplay = bodyText + " " + lastRuleString;
-//				if(Build.VERSION.SDK_INT < 11)
-//				{
-//					myNotification.setLatestEventInfo(instance, "Automation", textToDisplay, myPendingIntent);
-//				}
-//				else
-//				{			
-					notificationBuilder.setContentText(textToDisplay);
-					notificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
+			try
+			{
+				lastRuleString = instance.getResources().getString(R.string.lastRule) + " " + Rule.getLastActivatedRule().getName()  + " " + instance.getResources().getString(R.string.at) + " " + Rule.getLastActivatedRuleActivationTime().toLocaleString();
+			}
+			catch(Exception e)
+			{
+				lastRuleString = instance.getResources().getString(R.string.lastRule) + " n./a.";
+			}
 
-					myNotification = notificationBuilder.build();
-                    myNotification.defaults = 0;
-//				}
+			String textToDisplay = bodyText + " " + lastRuleString;
+
+			if(notificationBuilder == null)
+					notificationBuilder = createDefaultNotificationBuilder();
+
+			notificationBuilder.setContentText(textToDisplay);
+			notificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
+
+			myNotification = notificationBuilder.build();
+			myNotification.defaults = 0;
 
 //				NotificationManager notificationManager = (NotificationManager) instance.getSystemService(NOTIFICATION_SERVICE);
-			    // hide the notification after its selected
+			// hide the notification after its selected
 //				myNotification.flags |= Notification.FLAG_AUTO_CANCEL;
-				myNotification.flags |= Notification.FLAG_NO_CLEAR;
+			myNotification.flags |= Notification.FLAG_NO_CLEAR;
 //			    notificationManager.notify(notificationId, myNotification);
 
-				instance.startForeground(notificationId, myNotification);
-//			}
-//			else
-//				instance.startForeground(notificationId, null);		// do not show icon in task bar
+			instance.startForeground(notificationId, myNotification);
 		}
 	}
 
@@ -659,18 +614,18 @@ public class AutomationService extends Service implements OnInitListener
 	 **/
 	public void speak(String text, boolean force)
 	{
-		if(text.length() > 0 && (force | Settings.useTextToSpeechOnNormal | Settings.useTextToSpeechOnSilent | Settings.useTextToSpeechOnVibrate))
+		if(text.length() > 0 && (force || Settings.useTextToSpeechOnNormal || Settings.useTextToSpeechOnSilent || Settings.useTextToSpeechOnVibrate))
 		{
 			AudioManager myAudioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
 			int mode = myAudioManager.getRingerMode();
 			
 			if(
 					(mode == AudioManager.RINGER_MODE_NORMAL && Settings.useTextToSpeechOnNormal)
-												|
+												||
 					(mode == AudioManager.RINGER_MODE_VIBRATE && Settings.useTextToSpeechOnVibrate)
-												|
+												||
 					(mode == AudioManager.RINGER_MODE_SILENT && Settings.useTextToSpeechOnSilent)
-												|
+												||
 											  force
 				)
 			{
@@ -700,12 +655,12 @@ public class AutomationService extends Service implements OnInitListener
 								{}
 							}
 						}
+						Miscellaneous.logEvent("i", "TextToSpeech", "Speaking " + text + " in language " + ttsEngine.getLanguage().toLanguageTag(), 3);
 						this.ttsEngine.speak(text, TextToSpeech.QUEUE_ADD, null);
 					}
 					catch(Exception e)
 					{
 						Miscellaneous.logEvent("e", "TextToSpeech", Log.getStackTraceString(e), 3);
-						e.printStackTrace();
 					}
 				}
 			}
@@ -718,31 +673,6 @@ public class AutomationService extends Service implements OnInitListener
 			 return false;
 		 else
 			 return true;
-		 
-//		 boolean isActivityFound = false;
-//		 ActivityManager activityManager = (ActivityManager)context.getSystemService (Context.ACTIVITY_SERVICE); 
-//	     List<RunningTaskInfo> activitys = activityManager.getRunningTasks(Integer.MAX_VALUE); 
-//	     isActivityFound = false; 
-//	     for (int i = 0; i < activitys.size(); i++)
-//	     { 
-//	         if (activitys.get(i).topActivity.toString().equalsIgnoreCase("ComponentInfo{com.jens.automation/com.jens.automation.ActivityMainScreen}"))
-//	         {
-//	             isActivityFound = true;
-//	         }
-//	     } 
-//	     Miscellaneous.logEvent("i", "ActivityMainScreen", "Activity running status: " + String.valueOf(isActivityFound), 5);
-//	     return isActivityFound;
-		 
-//		ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-//		List<RunningTaskInfo> tasks = activityManager.getRunningTasks(Integer.MAX_VALUE);
-//		
-//		for (RunningTaskInfo task : tasks)
-//		{
-//		    if (context.getPackageName().equalsIgnoreCase(task.baseActivity.getPackageName())) 
-//		        return true;                                  
-//		}
-//		
-//		return false;
 	 }
 	
 	public static boolean isMyServiceRunning(Context context)
@@ -754,7 +684,6 @@ public class AutomationService extends Service implements OnInitListener
 		    {
 		        if(AutomationService.class.getName().equals(service.service.getClassName()))
 		        {
-//		            return AutomationService.getInstance() != null && AutomationService.getInstance().isRunning;
 		            return true;
 		        }
 		    }
@@ -763,9 +692,8 @@ public class AutomationService extends Service implements OnInitListener
 		{
 			if(Log.getStackTraceString(e).contains("activate"))	// Means that a poi has been activated/deactivated. Service is running.
 				return true;
-//			return AutomationService.getInstance() != null && AutomationService.getInstance().isRunning;
 		}
 
 	    return false;
 	}
-}
+}

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

@@ -33,7 +33,8 @@ public class CompensateCrappyAndroidPaths
      * @param uri     The Uri to query.
      */
     @SuppressLint("NewApi")
-    public static String getPath(final Context context, final Uri uri) {
+    public static String getPath(final Context context, final Uri uri)
+    {
         // check here to KITKAT or new version
         final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
         String selection = null;

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

@@ -0,0 +1,22 @@
+package com.jens.automation2;
+
+import android.app.admin.DeviceAdminReceiver;