allow http

# Conflicts:
#	app/src/main/res/values-es/strings.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>

.idea/deploymentTargetDropDown.xml

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

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 109
+        versionName "1.6.39"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -40,23 +40,19 @@ android {
                 googlePlayFlavor
                         {
                             dimension "version"
-//                            applicationIdSuffix ".googlePlay"
                             versionNameSuffix "-googlePlay"
-                            targetSdkVersion 30
+                            targetSdkVersion 29
                         }
 
                 fdroidFlavor
                         {
                             dimension "version"
-//                            applicationIdSuffix ".fdroid"
-//                            versionNameSuffix "-fdroid"
                             targetSdkVersion 28
                         }
 
                 apkFlavor
                         {
                             dimension "version"
-//                            applicationIdSuffix ".apk"
                             versionNameSuffix "-apk"
                             targetSdkVersion 28
                         }
@@ -64,13 +60,18 @@ android {
 }
 
 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

@@ -5,13 +5,13 @@
     "kind": "Directory"
   },
   "applicationId": "com.jens.automation2",
-  "variantName": "processGooglePlayFlavorReleaseResources",
+  "variantName": "googlePlayFlavorRelease",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 98,
-      "versionName": "1.6.22-googlePlay",
+      "versionCode": 107,
+      "versionName": "1.6.36-googlePlay",
       "outputFile": "app-googlePlayFlavor-release.apk"
     }
   ]

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"
@@ -74,9 +75,10 @@
 
     <application
         android:allowBackup="true"
+        android:usesClearTextTraffic="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 +97,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>
@@ -136,12 +138,16 @@
         <receiver android:name=".receivers.TimeZoneListener" />
 
         <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=".ActivityHelp" />
+        <activity android:name=".ActivityManageActionVibrate" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -178,13 +184,31 @@
         <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=".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>
+
+
+<!--        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 +218,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/Rule.java

@@ -1,13 +1,18 @@
 package com.jens.automation2;
 
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
+import android.service.notification.StatusBarNotification;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.google.android.gms.location.DetectedActivity;
+import com.jens.automation2.location.LocationProvider;
 import com.jens.automation2.location.WifiBroadcastReceiver;
 import com.jens.automation2.receivers.ActivityDetectionReceiver;
 import com.jens.automation2.receivers.BatteryReceiver;
@@ -16,6 +21,7 @@ import com.jens.automation2.receivers.ConnectivityReceiver;
 import com.jens.automation2.receivers.HeadphoneJackListener;
 import com.jens.automation2.receivers.NfcReceiver;
 import com.jens.automation2.receivers.NoiseListener;
+import com.jens.automation2.receivers.NotificationListener;
 import com.jens.automation2.receivers.PhoneStatusListener;
 import com.jens.automation2.receivers.ProcessListener;
 
@@ -24,6 +30,12 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
+import static com.jens.automation2.Trigger.triggerParameter2Split;
+import static com.jens.automation2.receivers.NotificationListener.EXTRA_TEXT;
+import static com.jens.automation2.receivers.NotificationListener.EXTRA_TITLE;
+
+import org.apache.commons.lang3.StringUtils;
+
 
 public class Rule implements Comparable<Rule>
 {
@@ -42,9 +54,20 @@ public class Rule implements Comparable<Rule>
 	private String name;
 	private boolean ruleActive = true;		// rules can be deactivated, so they won't fire if you don't want them temporarily
 	private boolean ruleToggle = false;		// rule will run again and do the opposite of its actions if applicable
+	private Calendar lastExecution;
 	
 	private static Date lastActivatedRuleActivationTime;
-	
+
+	public Calendar getLastExecution()
+	{
+		return lastExecution;
+	}
+
+	public void setLastExecution(Calendar lastExecution)
+	{
+		this.lastExecution = lastExecution;
+	}
+
 	public boolean isRuleToggle()
 	{
 		return ruleToggle;
@@ -114,6 +137,7 @@ public class Rule implements Comparable<Rule>
 	{
 		return this.getName();
 	}
+	@SuppressLint("NewApi")
 	public String toStringLong()
 	{
 		String returnString = "";
@@ -153,6 +177,15 @@ public class Rule implements Comparable<Rule>
 			Miscellaneous.logEvent("i", "Rule", "Creating rule: " + this.toString(), 3);
 			ruleCollection.add(this);
 			boolean returnValue = XmlFileInterface.writeFile();
+
+			try
+			{
+				XmlFileInterface.readFile();
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("w", "Read file", Log.getStackTraceString(e), 3);
+			}
 			
 			if(returnValue)
 			{
@@ -196,10 +229,23 @@ public class Rule implements Comparable<Rule>
 		
 		return XmlFileInterface.writeFile();
 	}
+
+	public boolean cloneRule(Context context)
+	{
+		Rule newRule = new Rule();
+		newRule.setName(this.getName() + " - clone");
+		newRule.setRuleActive(this.isRuleActive());
+		newRule.setRuleToggle(this.isRuleToggle());
+
+		newRule.setTriggerSet(this.getTriggerSet());
+		newRule.setActionSet(this.getActionSet());
+
+		return newRule.create(context);
+	}
 	
 	private boolean checkBeforeSaving(Context context, boolean changeExistingRule)
 	{
-		if(this.getName() == null | this.getName().length()==0)
+		if(this.getName() == null || this.getName().length()==0)
 		{
 			Toast.makeText(context, context.getResources().getString(R.string.pleaseEnterValidName), Toast.LENGTH_LONG).show();
 			return false;
@@ -394,13 +440,13 @@ public class Rule implements Comparable<Rule>
 													&&
 										Miscellaneous.compareTimes(nowTime, oneTrigger.getTimeFrame().getTriggerTimeStop()) > 0
 								)
-									|
+									||
 									// Other case, start time higher than end time, timeframe goes over midnight
 								(
 										Miscellaneous.compareTimes(oneTrigger.getTimeFrame().getTriggerTimeStart(), oneTrigger.getTimeFrame().getTriggerTimeStop()) < 0
 											&&
 										(Miscellaneous.compareTimes(oneTrigger.getTimeFrame().getTriggerTimeStart(), nowTime) >= 0
-											|
+											||
 										Miscellaneous.compareTimes(nowTime, oneTrigger.getTimeFrame().getTriggerTimeStop()) > 0)
 								)
 							
@@ -469,7 +515,7 @@ public class Rule implements Comparable<Rule>
 				{
 					if(oneTrigger.getTriggerParameter())
 					{
-						if(BatteryReceiver.getBatteryLevel() < oneTrigger.getBatteryLevel())
+						if(BatteryReceiver.getBatteryLevel() <= oneTrigger.getBatteryLevel())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyBatteryLowerThan) + " " + String.valueOf(oneTrigger.getBatteryLevel()), 3);
 							return false;
@@ -477,7 +523,7 @@ public class Rule implements Comparable<Rule>
 					}
 					else
 					{
-						if(BatteryReceiver.getBatteryLevel() > oneTrigger.getBatteryLevel())
+						if(oneTrigger.getBatteryLevel() >= oneTrigger.getBatteryLevel())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyBatteryHigherThan) + " " + String.valueOf(oneTrigger.getBatteryLevel()), 3);
 							return false;
@@ -488,7 +534,7 @@ public class Rule implements Comparable<Rule>
 				{
 					if(oneTrigger.getTriggerParameter())
 					{
-						if(com.jens.automation2.location.LocationProvider.getSpeed() < oneTrigger.getSpeed())
+						if(LocationProvider.getSpeed() < oneTrigger.getSpeed())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyWeAreSlowerThan) + " " + String.valueOf(oneTrigger.getSpeed()), 3);
 							return false;
@@ -496,7 +542,7 @@ public class Rule implements Comparable<Rule>
 					}
 					else
 					{
-						if(com.jens.automation2.location.LocationProvider.getSpeed() > oneTrigger.getSpeed())
+						if(LocationProvider.getSpeed() > oneTrigger.getSpeed())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyWeAreFasterThan) + " " + String.valueOf(oneTrigger.getSpeed()), 3);
 							return false;
@@ -527,12 +573,12 @@ public class Rule implements Comparable<Rule>
 					Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Checking for wifi state", 4);
 					if(oneTrigger.getTriggerParameter() == WifiBroadcastReceiver.lastConnectedState)	// connected / disconnected
 					{
-						if(oneTrigger.getWifiName().length() > 0)	// only check if any wifi name specified, otherwise any wifi will do
+						if(oneTrigger.getTriggerParameter2().length() > 0)	// only check if any wifi name specified, otherwise any wifi will do
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Wifi name specified, checking that.", 4);
-							if(!WifiBroadcastReceiver.getLastWifiSsid().equals(oneTrigger.getWifiName()))
+							if(!WifiBroadcastReceiver.getLastWifiSsid().equals(oneTrigger.getTriggerParameter2()))
 							{
-								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectSsid), oneTrigger.getWifiName(), WifiBroadcastReceiver.getLastWifiSsid()), 3);
+								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectSsid), oneTrigger.getTriggerParameter2(), WifiBroadcastReceiver.getLastWifiSsid()), 3);
 								return false;
 							}
 							else
@@ -580,13 +626,29 @@ public class Rule implements Comparable<Rule>
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.phoneCall))
 				{
-					if(oneTrigger.getPhoneNumber().equals("any") | oneTrigger.getPhoneNumber().equals(PhoneStatusListener.getLastPhoneNumber()))
+					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+					// state dir number
+
+					if(elements[2].equals(Trigger.triggerPhoneCallNumberAny) || Miscellaneous.comparePhoneNumbers(PhoneStatusListener.getLastPhoneNumber(), elements[2]) || (Miscellaneous.isRegularExpression(elements[2]) && PhoneStatusListener.getLastPhoneNumber().matches(elements[2])))
 					{
-						if(PhoneStatusListener.isInACall() == oneTrigger.getTriggerParameter())
+						//if(PhoneStatusListener.isInACall() == oneTrigger.getTriggerParameter())
+						if(
+								(elements[0].equals(Trigger.triggerPhoneCallStateRinging) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_RINGING)
+										||
+								(elements[0].equals(Trigger.triggerPhoneCallStateStarted) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_OFFHOOK)
+										||
+								(elements[0].equals(Trigger.triggerPhoneCallStateStopped) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_IDLE)
+						)
 						{
-							if(oneTrigger.getPhoneDirection() == 0 | (oneTrigger.getPhoneDirection() == PhoneStatusListener.getLastPhoneDirection()))
+							if(
+									elements[1].equals(Trigger.triggerPhoneCallDirectionAny)
+											||
+									(elements[1].equals(Trigger.triggerPhoneCallDirectionIncoming) && PhoneStatusListener.getLastPhoneDirection() == 1)
+											||
+									(elements[1].equals(Trigger.triggerPhoneCallDirectionOutgoing) && PhoneStatusListener.getLastPhoneDirection() == 2)
+							)
 							{
-								// Everything's allright
+								// Trigger conditions are met
 							}
 							else
 							{
@@ -601,7 +663,10 @@ public class Rule implements Comparable<Rule>
 						}
 					}
 					else
+					{
 						Miscellaneous.logEvent("i", "Rule", "Rule doesn't apply. Wrong phone number. Demanded: " + oneTrigger.getPhoneNumber() + ", got: " + PhoneStatusListener.getLastPhoneNumber(), 4);
+						return false;
+					}
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.nfcTag))
 				{
@@ -648,109 +713,69 @@ public class Rule implements Comparable<Rule>
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.bluetoothConnection))
 				{
 					Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Checking for bluetooth...", 4);
-					
-//					if(	// connected / disconnected
-//							(oneTrigger.getTriggerParameter() && (BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_CONNECTED) | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACL_CONNECTED")))
-//								|
-//							(!oneTrigger.getTriggerParameter() && (BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED) | BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_DISCONNECTED) | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACTION_ACL_DISCONNECT_REQUESTED") | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACTION_ACL_DISCONNECTED")))
-//						)
-//					{
-//						if(oneTrigger.getBluetoothDeviceAddress() != null)
-//						{
-//							if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
-//							{								
-//								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "No bluetooth address specified, any will do.", 4);
-//							}
-//							else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
-//							{
-//								// ???
-//							}
-//							else
-//							{
-//								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Bluetooth address specified, checking that.", 4);
-//								if(!BluetoothReceiver.getLastAffectedDevice().getAddress().equals(oneTrigger.getBluetoothDeviceAddress()))
-//								{
-//									Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectDeviceAddress), 3);
-//									return false;								
-//								}
-//								else
-//									Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Bluetooth address matches. Rule will apply.", 4);
-//							}
-//						}
-//					}
-//					else if(BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_FOUND) | BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_FOUND))
-//					{
-//						if(!oneTrigger.getTriggerParameter())
-//						{
-//							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyDeviceInRangeButShouldNotBe), 3);
-//							return false;
-//						}
-//					}
-//					else		// above only checks for last action, this checks for things in the past
+
+					if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
 					{
-						if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
-						{	
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isAnyDeviceInRange() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-						}
-						else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
 						{
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isAnyDeviceInRange() == oneTrigger.getTriggerParameter())
-									return false;
-							}
+							if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
+								return false;
 						}
-						else if(oneTrigger.getBluetoothDeviceAddress().length() > 0)
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
 						{
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isDeviceInRange(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
+							if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
+								return false;
 						}
 						else
 						{
-							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyStateNotCorrect), 3);
-							return false;
+							// range
+							if(BluetoothReceiver.isAnyDeviceInRange() != oneTrigger.getTriggerParameter())
+								return false;
 						}
 					}
+					else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
+					{
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
+						{
+							if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
+						{
+							if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else
+						{
+							// range
+							if(BluetoothReceiver.isAnyDeviceInRange() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+					}
+					else if(oneTrigger.getBluetoothDeviceAddress().length() > 0)
+					{
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
+						{
+							if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
+						{
+							if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else
+						{
+							// range
+							if(BluetoothReceiver.isDeviceInRange(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+					}
+					else
+					{
+						Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyStateNotCorrect), 3);
+						return false;
+					}
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.headsetPlugged))
 				{
@@ -763,6 +788,113 @@ public class Rule implements Comparable<Rule>
 							return false;
 						}
 				}
+				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.notification))
+				{
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+					{
+						String[] params = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+
+						String myApp = params[0];
+						String myTitleDir = params[1];
+						String myTitle = params[2];
+						String myTextDir = params[3];
+						String myText;
+						if (params.length >= 5)
+							myText = params[4];
+						else
+							myText = "";
+
+						if(oneTrigger.getTriggerParameter())
+						{
+							// Check an active notification that is still there
+
+							boolean foundMatch = false;
+
+							for (StatusBarNotification sbn : NotificationListener.getInstance().getActiveNotifications())
+							{
+								if(getLastExecution() == null || sbn.getPostTime() > this.lastExecution.getTimeInMillis())
+								{
+									String notificationApp = sbn.getPackageName();
+									String notificationTitle = sbn.getNotification().extras.getString(EXTRA_TITLE);
+									String notificationText = sbn.getNotification().extras.getString(EXTRA_TEXT);
+
+									Miscellaneous.logEvent("i", "NotificationCheck", "Checking if this notification matches our rule " + this.getName() + ". App: " + notificationApp + ", title: " + notificationTitle + ", text: " + notificationText, 5);
+
+									if (!myApp.equals("-1"))
+									{
+										if (!notificationApp.equalsIgnoreCase(myApp))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification app name does not match rule.", 5);
+											continue;
+										}
+									}
+
+									if (!StringUtils.isEmpty(myTitle))
+									{
+										if (!Miscellaneous.compare(myTitleDir, myTitle, notificationTitle))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification title does not match rule.", 5);
+											continue;
+										}
+									}
+									else
+										Miscellaneous.logEvent("i", "NotificationCheck", "A required title for a notification trigger was not specified.", 5);
+
+									if (!StringUtils.isEmpty(myText))
+									{
+										if (!Miscellaneous.compare(myTextDir, myText, notificationText))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification text does not match rule.", 5);
+											continue;
+										}
+									}
+									else
+										Miscellaneous.logEvent("i", "NotificationCheck", "A required text for a notification trigger was not specified.", 5);
+
+									foundMatch = true;
+									break;
+								}
+							}
+
+							if(!foundMatch)
+								return false;
+						}
+						else
+						{
+							// check a notification that is gone
+
+							if(NotificationListener.getLastNotification() != null)
+							{
+								if(!NotificationListener.getLastNotification().isCreated())
+								{
+									String app = NotificationListener.getLastNotification().getApp();
+									String title = NotificationListener.getLastNotification().getTitle();
+									String text = NotificationListener.getLastNotification().getText();
+
+									if (!myApp.equals("-1"))
+									{
+										if (!app.equalsIgnoreCase(myApp))
+											return false;
+									}
+
+									if (myTitle.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTitleDir, title, myTitle))
+											return false;
+									}
+
+									if (myText.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTextDir, text, myText))
+											return false;
+									}
+								}
+								else
+									return false;
+							}
+						}
+					}
+				}
 			}
 			
 			return true;
@@ -771,9 +903,11 @@ public class Rule implements Comparable<Rule>
 		Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleIsDeactivatedCantApply), this.getName()), 3);
 		return false;
 	}
-	
+
 	private class ActivateRuleTask extends AsyncTask<Object, String, Void>
 	{
+		boolean wasActivated = false;
+
 		@Override
 		protected Void doInBackground(Object... params)
 		{
@@ -788,7 +922,7 @@ public class Rule implements Comparable<Rule>
 	        if (Looper.myLooper() == null)
 	        	Looper.prepare();
 	        
-			activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
 
 			return null;
 		}
@@ -806,27 +940,35 @@ public class Rule implements Comparable<Rule>
 		@Override
 		protected void onPostExecute(Void result)
 		{
-			AutomationService.updateNotification();
-			ActivityMainScreen.updateMainScreen();
-			super.onPostExecute(result);
-		}	
-		
+			/*
+			 	Only update if the rules was actually executed. Became necessary for the notification trigger. If a user created a rule
+			 	with a notification trigger and this app creates a notification itself this will otherwise end in an infinite loop.
+			 */
+			if(wasActivated)
+			{
+				setLastExecution(Calendar.getInstance());
+				AutomationService.updateNotification();
+				ActivityMainScreen.updateMainScreen();
+				super.onPostExecute(result);
+			}
+		}
+
 		/**
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected void activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService, boolean force)
 		{
 			boolean isActuallyToggable = isActuallyToggable();
-			
+
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
 			boolean doToggle = ruleToggle && isActuallyToggable;
-			
-			if(notLastActive | force | doToggle)
+
+			if(notLastActive || force || doToggle)
 			{
 				String message;
 				if(!doToggle)
-					 message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
 				else
 					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 				Miscellaneous.logEvent("i", "Rule", message, 2);
@@ -834,10 +976,19 @@ public class Rule implements Comparable<Rule>
 //				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
 				if(Settings.startNewThreadForRuleActivation)
 					publishProgress(message);
-				
+
 				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-					Rule.this.getActionSet().get(i).run(automationService, doToggle);
-				
+				{
+					try
+					{
+						Rule.this.getActionSet().get(i).run(automationService, doToggle);
+					}
+					catch(Exception e)
+					{
+						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
+					}
+				}
+
 				// Keep log of last x rule activations (Settings)
 				try
 				{
@@ -862,9 +1013,12 @@ public class Rule implements Comparable<Rule>
 			else
 			{
 				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
+				return false;
 			}
-		}	
-	}	
+
+			return true;
+		}
+	}
 	
 	public void activate(AutomationService automationService, boolean force)
 	{
@@ -963,7 +1117,7 @@ public class Rule implements Comparable<Rule>
 					if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() > oneTrigger.getTimeFrame().getTriggerTimeStop().getTime())
 					{
 						Miscellaneous.logEvent("i", "Timeframe search", "Rule goes over midnight.", 5);
-						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() | searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
+						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() || searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
 						{
 							ruleCandidates.add(oneRule);
 							break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
@@ -1234,10 +1388,10 @@ public class Rule implements Comparable<Rule>
 		return ruleCandidates;
 	}
 	
-	public static ArrayList<Rule> findRuleCandidatesByPhoneCall(boolean triggerParameter)
+	public static ArrayList<Rule> findRuleCandidatesByPhoneCall(String direction)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
+
 		for(Rule oneRule : ruleCollection)
 		{
 			innerloop:
@@ -1245,7 +1399,8 @@ public class Rule implements Comparable<Rule>
 			{
 				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.phoneCall)
 				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
+					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+					if(elements[1].equals(Trigger.triggerPhoneCallDirectionAny) || elements[1].equals(direction))
 					{
 						ruleCandidates.add(oneRule);
 						break innerloop; //we don't need to search the other triggers in the same rule
@@ -1253,7 +1408,7 @@ public class Rule implements Comparable<Rule>
 				}
 			}
 		}
-		
+
 		return ruleCandidates;
 	}
 	
@@ -1279,6 +1434,26 @@ public class Rule implements Comparable<Rule>
 		
 		return ruleCandidates;
 	}
+
+	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
+	{
+		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
+
+		for(Rule oneRule : ruleCollection)
+		{
+			innerloop:
+			for(Trigger oneTrigger : oneRule.getTriggerSet())
+			{
+				if(oneTrigger.getTriggerType() == triggerType)
+				{
+					ruleCandidates.add(oneRule);
+					break innerloop; //we don't need to search the other triggers in the same rule
+				}
+			}
+		}
+
+		return ruleCandidates;
+	}
 	
 	public static ArrayList<Rule> findRuleCandidatesByActivityDetection()
 	{

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"
@@ -70,9 +72,10 @@
 
     <application
         android:allowBackup="true"
+        android:usesClearTextTraffic="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 +94,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>
@@ -132,12 +135,16 @@
         <receiver android:name=".receivers.TimeZoneListener" />
 
         <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=".ActivityHelp" />
+        <activity android:name=".ActivityManageActionVibrate" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -173,18 +180,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/fdroidFlavor/java/com/jens/automation2/Rule.java

@@ -1,12 +1,17 @@
 package com.jens.automation2;
 
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
+import android.service.notification.StatusBarNotification;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.jens.automation2.location.LocationProvider;
 import com.jens.automation2.location.WifiBroadcastReceiver;
 import com.jens.automation2.receivers.BatteryReceiver;
 import com.jens.automation2.receivers.BluetoothReceiver;
@@ -14,6 +19,7 @@ import com.jens.automation2.receivers.ConnectivityReceiver;
 import com.jens.automation2.receivers.HeadphoneJackListener;
 import com.jens.automation2.receivers.NfcReceiver;
 import com.jens.automation2.receivers.NoiseListener;
+import com.jens.automation2.receivers.NotificationListener;
 import com.jens.automation2.receivers.PhoneStatusListener;
 import com.jens.automation2.receivers.ProcessListener;
 
@@ -22,6 +28,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
+import static com.jens.automation2.Trigger.triggerParameter2Split;
+import static com.jens.automation2.receivers.NotificationListener.EXTRA_TEXT;
+import static com.jens.automation2.receivers.NotificationListener.EXTRA_TITLE;
 
 public class Rule implements Comparable<Rule>
 {
@@ -40,8 +49,19 @@ public class Rule implements Comparable<Rule>
 	private String name;
 	private boolean ruleActive = true;		// rules can be deactivated, so they won't fire if you don't want them temporarily
 	private boolean ruleToggle = false;		// rule will run again and do the opposite of its actions if applicable
+	private Calendar lastExecution;
 	
 	private static Date lastActivatedRuleActivationTime;
+
+	public Calendar getLastExecution()
+	{
+		return lastExecution;
+	}
+
+	public void setLastExecution(Calendar lastExecution)
+	{
+		this.lastExecution = lastExecution;
+	}
 	
 	public boolean isRuleToggle()
 	{
@@ -112,6 +132,7 @@ public class Rule implements Comparable<Rule>
 	{
 		return this.getName();
 	}
+	@SuppressLint("NewApi")
 	public String toStringLong()
 	{
 		String returnString = "";
@@ -151,6 +172,15 @@ public class Rule implements Comparable<Rule>
 			Miscellaneous.logEvent("i", "Rule", "Creating rule: " + this.toString(), 3);
 			ruleCollection.add(this);
 			boolean returnValue = XmlFileInterface.writeFile();
+
+			try
+			{
+				XmlFileInterface.readFile();
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("w", "Read file", Log.getStackTraceString(e), 3);
+			}
 			
 			if(returnValue)
 			{
@@ -194,10 +224,23 @@ public class Rule implements Comparable<Rule>
 		
 		return XmlFileInterface.writeFile();
 	}
+
+	public boolean cloneRule(Context context)
+	{
+		Rule newRule = new Rule();
+		newRule.setName(this.getName() + " - clone");
+		newRule.setRuleActive(this.isRuleActive());
+		newRule.setRuleToggle(this.isRuleToggle());
+
+		newRule.setTriggerSet(this.getTriggerSet());
+		newRule.setActionSet(this.getActionSet());
+
+		return newRule.create(context);
+	}
 	
 	private boolean checkBeforeSaving(Context context, boolean changeExistingRule)
 	{
-		if(this.getName() == null | this.getName().length()==0)
+		if(this.getName() == null || this.getName().length()==0)
 		{
 			Toast.makeText(context, context.getResources().getString(R.string.pleaseEnterValidName), Toast.LENGTH_LONG).show();
 			return false;
@@ -392,13 +435,13 @@ public class Rule implements Comparable<Rule>
 													&&
 										Miscellaneous.compareTimes(nowTime, oneTrigger.getTimeFrame().getTriggerTimeStop()) > 0
 								)
-									|
+									||
 									// Other case, start time higher than end time, timeframe goes over midnight
 								(
 										Miscellaneous.compareTimes(oneTrigger.getTimeFrame().getTriggerTimeStart(), oneTrigger.getTimeFrame().getTriggerTimeStop()) < 0
 											&&
 										(Miscellaneous.compareTimes(oneTrigger.getTimeFrame().getTriggerTimeStart(), nowTime) >= 0
-											|
+											||
 										Miscellaneous.compareTimes(nowTime, oneTrigger.getTimeFrame().getTriggerTimeStop()) > 0)
 								)
 							
@@ -467,7 +510,7 @@ public class Rule implements Comparable<Rule>
 				{
 					if(oneTrigger.getTriggerParameter())
 					{
-						if(BatteryReceiver.getBatteryLevel() < oneTrigger.getBatteryLevel())
+						if(BatteryReceiver.getBatteryLevel() <= oneTrigger.getBatteryLevel())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyBatteryLowerThan) + " " + String.valueOf(oneTrigger.getBatteryLevel()), 3);
 							return false;
@@ -475,7 +518,7 @@ public class Rule implements Comparable<Rule>
 					}
 					else
 					{
-						if(BatteryReceiver.getBatteryLevel() > oneTrigger.getBatteryLevel())
+						if(oneTrigger.getBatteryLevel() >= oneTrigger.getBatteryLevel())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyBatteryHigherThan) + " " + String.valueOf(oneTrigger.getBatteryLevel()), 3);
 							return false;
@@ -486,7 +529,7 @@ public class Rule implements Comparable<Rule>
 				{
 					if(oneTrigger.getTriggerParameter())
 					{
-						if(com.jens.automation2.location.LocationProvider.getSpeed() < oneTrigger.getSpeed())
+						if(LocationProvider.getSpeed() < oneTrigger.getSpeed())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyWeAreSlowerThan) + " " + String.valueOf(oneTrigger.getSpeed()), 3);
 							return false;
@@ -494,7 +537,7 @@ public class Rule implements Comparable<Rule>
 					}
 					else
 					{
-						if(com.jens.automation2.location.LocationProvider.getSpeed() > oneTrigger.getSpeed())
+						if(LocationProvider.getSpeed() > oneTrigger.getSpeed())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyWeAreFasterThan) + " " + String.valueOf(oneTrigger.getSpeed()), 3);
 							return false;
@@ -525,12 +568,12 @@ public class Rule implements Comparable<Rule>
 					Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Checking for wifi state", 4);
 					if(oneTrigger.getTriggerParameter() == WifiBroadcastReceiver.lastConnectedState)	// connected / disconnected
 					{
-						if(oneTrigger.getWifiName().length() > 0)	// only check if any wifi name specified, otherwise any wifi will do
+						if(oneTrigger.getTriggerParameter2().length() > 0)	// only check if any wifi name specified, otherwise any wifi will do
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Wifi name specified, checking that.", 4);
-							if(!WifiBroadcastReceiver.getLastWifiSsid().equals(oneTrigger.getWifiName()))
+							if(!WifiBroadcastReceiver.getLastWifiSsid().equals(oneTrigger.getTriggerParameter2()))
 							{
-								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectSsid), oneTrigger.getWifiName(), WifiBroadcastReceiver.getLastWifiSsid()), 3);
+								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectSsid), oneTrigger.getTriggerParameter2(), WifiBroadcastReceiver.getLastWifiSsid()), 3);
 								return false;
 							}
 							else
@@ -578,13 +621,29 @@ public class Rule implements Comparable<Rule>
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.phoneCall))
 				{
-					if(oneTrigger.getPhoneNumber().equals("any") | oneTrigger.getPhoneNumber().equals(PhoneStatusListener.getLastPhoneNumber()))
+					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+					// state dir number
+
+					if(elements[2].equals(Trigger.triggerPhoneCallNumberAny) || Miscellaneous.comparePhoneNumbers(PhoneStatusListener.getLastPhoneNumber(), elements[2]) || (Miscellaneous.isRegularExpression(elements[2]) && PhoneStatusListener.getLastPhoneNumber().matches(elements[2])))
 					{
-						if(PhoneStatusListener.isInACall() == oneTrigger.getTriggerParameter())
+						//if(PhoneStatusListener.isInACall() == oneTrigger.getTriggerParameter())
+						if(
+								(elements[0].equals(Trigger.triggerPhoneCallStateRinging) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_RINGING)
+										||
+								(elements[0].equals(Trigger.triggerPhoneCallStateStarted) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_OFFHOOK)
+										||
+								(elements[0].equals(Trigger.triggerPhoneCallStateStopped) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_IDLE)
+						)
 						{
-							if(oneTrigger.getPhoneDirection() == 0 | (oneTrigger.getPhoneDirection() == PhoneStatusListener.getLastPhoneDirection()))
+							if(
+									elements[1].equals(Trigger.triggerPhoneCallDirectionAny)
+											||
+									(elements[1].equals(Trigger.triggerPhoneCallDirectionIncoming) && PhoneStatusListener.getLastPhoneDirection() == 1)
+											||
+									(elements[1].equals(Trigger.triggerPhoneCallDirectionOutgoing) && PhoneStatusListener.getLastPhoneDirection() == 2)
+							)
 							{
-								// Everything's allright
+								// Trigger conditions are met
 							}
 							else
 							{
@@ -599,7 +658,10 @@ public class Rule implements Comparable<Rule>
 						}
 					}
 					else
+					{
 						Miscellaneous.logEvent("i", "Rule", "Rule doesn't apply. Wrong phone number. Demanded: " + oneTrigger.getPhoneNumber() + ", got: " + PhoneStatusListener.getLastPhoneNumber(), 4);
+						return false;
+					}
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.nfcTag))
 				{
@@ -617,109 +679,69 @@ public class Rule implements Comparable<Rule>
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.bluetoothConnection))
 				{
 					Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Checking for bluetooth...", 4);
-					
-//					if(	// connected / disconnected
-//							(oneTrigger.getTriggerParameter() && (BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_CONNECTED) | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACL_CONNECTED")))
-//								|
-//							(!oneTrigger.getTriggerParameter() && (BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED) | BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_DISCONNECTED) | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACTION_ACL_DISCONNECT_REQUESTED") | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACTION_ACL_DISCONNECTED")))
-//						)
-//					{
-//						if(oneTrigger.getBluetoothDeviceAddress() != null)
-//						{
-//							if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
-//							{								
-//								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "No bluetooth address specified, any will do.", 4);
-//							}
-//							else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
-//							{
-//								// ???
-//							}
-//							else
-//							{
-//								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Bluetooth address specified, checking that.", 4);
-//								if(!BluetoothReceiver.getLastAffectedDevice().getAddress().equals(oneTrigger.getBluetoothDeviceAddress()))
-//								{
-//									Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectDeviceAddress), 3);
-//									return false;								
-//								}
-//								else
-//									Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Bluetooth address matches. Rule will apply.", 4);
-//							}
-//						}
-//					}
-//					else if(BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_FOUND) | BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_FOUND))
-//					{
-//						if(!oneTrigger.getTriggerParameter())
-//						{
-//							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyDeviceInRangeButShouldNotBe), 3);
-//							return false;
-//						}
-//					}
-//					else		// above only checks for last action, this checks for things in the past
+
+					if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
 					{
-						if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
-						{	
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isAnyDeviceInRange() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-						}
-						else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
 						{
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isAnyDeviceInRange() == oneTrigger.getTriggerParameter())
-									return false;
-							}
+							if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
+								return false;
 						}
-						else if(oneTrigger.getBluetoothDeviceAddress().length() > 0)
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
 						{
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isDeviceInRange(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
+							if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
+								return false;
 						}
 						else
 						{
-							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyStateNotCorrect), 3);
-							return false;
+							// range
+							if(BluetoothReceiver.isAnyDeviceInRange() != oneTrigger.getTriggerParameter())
+								return false;
 						}
 					}
+					else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
+					{
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
+						{
+							if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
+						{
+							if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else
+						{
+							// range
+							if(BluetoothReceiver.isAnyDeviceInRange() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+					}
+					else if(oneTrigger.getBluetoothDeviceAddress().length() > 0)
+					{
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
+						{
+							if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
+						{
+							if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else
+						{
+							// range
+							if(BluetoothReceiver.isDeviceInRange(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+					}
+					else
+					{
+						Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyStateNotCorrect), 3);
+						return false;
+					}
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.headsetPlugged))
 				{
@@ -732,6 +754,109 @@ public class Rule implements Comparable<Rule>
 							return false;
 						}
 				}
+				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.notification))
+				{
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+					{
+						String[] params = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+
+						String myApp = params[0];
+						String myTitleDir = params[1];
+						String myTitle = params[2];
+						String myTextDir = params[3];
+						String myText;
+						if (params.length >= 5)
+							myText = params[4];
+						else
+							myText = "";
+
+						if(oneTrigger.getTriggerParameter())
+						{
+							// Check an active notification that is still there
+
+							boolean foundMatch = false;
+
+							for (StatusBarNotification sbn : NotificationListener.getInstance().getActiveNotifications())
+							{
+								if(getLastExecution() == null || sbn.getPostTime() > this.lastExecution.getTimeInMillis())
+								{
+									String app = sbn.getPackageName();
+									String title = sbn.getNotification().extras.getString(EXTRA_TITLE);
+									String text = sbn.getNotification().extras.getString(EXTRA_TEXT);
+
+									Miscellaneous.logEvent("i", "NotificationCheck", "Checking if this notification matches our rule " + this.getName() + ". App: " + app + ", title: " + title + ", text: " + text, 5);
+
+									if (!myApp.equals("-1"))
+									{
+										if (!app.equalsIgnoreCase(myApp))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification app name does not match rule.", 5);
+											continue;
+										}
+									}
+
+									if (myTitle.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTitleDir, myTitle, title))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification title does not match rule.", 5);
+											continue;
+										}
+									}
+
+									if (myText.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTextDir, myText, text))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification text does not match rule.", 5);
+											continue;
+										}
+									}
+
+									foundMatch = true;
+									break;
+								}
+							}
+
+							if(!foundMatch)
+								return false;
+						}
+						else
+						{
+							// check a notification that is gone
+
+							if(NotificationListener.getLastNotification() != null)
+							{
+								if(!NotificationListener.getLastNotification().isCreated())
+								{
+									String app = NotificationListener.getLastNotification().getApp();
+									String title = NotificationListener.getLastNotification().getTitle();
+									String text = NotificationListener.getLastNotification().getText();
+
+									if (!myApp.equals("-1"))
+									{
+										if (!app.equalsIgnoreCase(myApp))
+											return false;
+									}
+
+									if (myTitle.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTitleDir, title, myTitle))
+											return false;
+									}
+
+									if (myText.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTextDir, text, myText))
+											return false;
+									}
+								}
+								else
+									return false;
+							}
+						}
+					}
+				}
 			}
 			
 			return true;
@@ -743,6 +868,8 @@ public class Rule implements Comparable<Rule>
 	
 	private class ActivateRuleTask extends AsyncTask<Object, String, Void>
 	{
+		boolean wasActivated = false;
+
 		@Override
 		protected Void doInBackground(Object... params)
 		{
@@ -757,7 +884,7 @@ public class Rule implements Comparable<Rule>
 	        if (Looper.myLooper() == null)
 	        	Looper.prepare();
 	        
-			activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
 
 			return null;
 		}
@@ -775,27 +902,35 @@ public class Rule implements Comparable<Rule>
 		@Override
 		protected void onPostExecute(Void result)
 		{
-			AutomationService.updateNotification();
-			ActivityMainScreen.updateMainScreen();
-			super.onPostExecute(result);
-		}	
-		
+			/*
+			 	Only update if the rules was actually executed. Became necessary for the notification trigger. If a user created a rule
+			 	with a notification trigger and this app creates a notification itself this will otherwise end in an infinite loop.
+			 */
+			if(wasActivated)
+			{
+				setLastExecution(Calendar.getInstance());
+				AutomationService.updateNotification();
+				ActivityMainScreen.updateMainScreen();
+				super.onPostExecute(result);
+			}
+		}
+
 		/**
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected void activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService, boolean force)
 		{
 			boolean isActuallyToggable = isActuallyToggable();
-			
+
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
 			boolean doToggle = ruleToggle && isActuallyToggable;
-			
-			if(notLastActive | force | doToggle)
+
+			if(notLastActive || force || doToggle)
 			{
 				String message;
 				if(!doToggle)
-					 message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
 				else
 					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 				Miscellaneous.logEvent("i", "Rule", message, 2);
@@ -803,10 +938,19 @@ public class Rule implements Comparable<Rule>
 //				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
 				if(Settings.startNewThreadForRuleActivation)
 					publishProgress(message);
-				
+
 				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-					Rule.this.getActionSet().get(i).run(automationService, doToggle);
-				
+				{
+					try
+					{
+						Rule.this.getActionSet().get(i).run(automationService, doToggle);
+					}
+					catch(Exception e)
+					{
+						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
+					}
+				}
+
 				// Keep log of last x rule activations (Settings)
 				try
 				{
@@ -831,9 +975,12 @@ public class Rule implements Comparable<Rule>
 			else
 			{
 				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
+				return false;
 			}
-		}	
-	}	
+
+			return true;
+		}
+	}
 	
 	public void activate(AutomationService automationService, boolean force)
 	{
@@ -932,7 +1079,7 @@ public class Rule implements Comparable<Rule>
 					if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() > oneTrigger.getTimeFrame().getTriggerTimeStop().getTime())
 					{
 						Miscellaneous.logEvent("i", "Timeframe search", "Rule goes over midnight.", 5);
-						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() | searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
+						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() || searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
 						{
 							ruleCandidates.add(oneRule);
 							break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
@@ -1203,10 +1350,10 @@ public class Rule implements Comparable<Rule>
 		return ruleCandidates;
 	}
 	
-	public static ArrayList<Rule> findRuleCandidatesByPhoneCall(boolean triggerParameter)
+	public static ArrayList<Rule> findRuleCandidatesByPhoneCall(String direction)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
+
 		for(Rule oneRule : ruleCollection)
 		{
 			innerloop:
@@ -1214,7 +1361,8 @@ public class Rule implements Comparable<Rule>
 			{
 				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.phoneCall)
 				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
+					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+					if(elements[1].equals(Trigger.triggerPhoneCallDirectionAny) || elements[1].equals(direction))
 					{
 						ruleCandidates.add(oneRule);
 						break innerloop; //we don't need to search the other triggers in the same rule
@@ -1222,7 +1370,7 @@ public class Rule implements Comparable<Rule>
 				}
 			}
 		}
-		
+
 		return ruleCandidates;
 	}
 	
@@ -1248,6 +1396,26 @@ public class Rule implements Comparable<Rule>
 		
 		return ruleCandidates;
 	}
+
+	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
+	{
+		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
+
+		for(Rule oneRule : ruleCollection)
+		{
+			innerloop:
+			for(Trigger oneTrigger : oneRule.getTriggerSet())
+			{
+				if(oneTrigger.getTriggerType() == triggerType)
+				{
+					ruleCandidates.add(oneRule);
+					break innerloop; //we don't need to search the other triggers in the same rule
+				}
+			}
+		}
+
+		return ruleCandidates;
+	}
 	
 	public static ArrayList<Rule> findRuleCandidatesByActivityDetection()
 	{

app/src/googlePlayFlavor/AndroidManifest.xml

@@ -61,12 +61,15 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
+    <uses-permission android:name="com.wireguard.android.permission.CONTROL_TUNNELS"/>
 
     <application
         android:allowBackup="true"
+        android:usesClearTextTraffic="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>
@@ -126,12 +129,16 @@
         <receiver android:name=".receivers.TimeZoneListener" />
 
         <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=".ActivityHelp" />
+        <activity android:name=".ActivityManageActionVibrate" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -168,13 +175,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 +212,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/Rule.java

@@ -1,13 +1,18 @@
 package com.jens.automation2;
 
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
+import android.service.notification.StatusBarNotification;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.google.android.gms.location.DetectedActivity;
+import com.jens.automation2.location.LocationProvider;
 import com.jens.automation2.location.WifiBroadcastReceiver;
 import com.jens.automation2.receivers.ActivityDetectionReceiver;
 import com.jens.automation2.receivers.BatteryReceiver;
@@ -16,6 +21,7 @@ import com.jens.automation2.receivers.ConnectivityReceiver;
 import com.jens.automation2.receivers.HeadphoneJackListener;
 import com.jens.automation2.receivers.NfcReceiver;
 import com.jens.automation2.receivers.NoiseListener;
+import com.jens.automation2.receivers.NotificationListener;
 import com.jens.automation2.receivers.PhoneStatusListener;
 import com.jens.automation2.receivers.ProcessListener;
 
@@ -24,6 +30,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
+import static com.jens.automation2.Trigger.triggerParameter2Split;
+import static com.jens.automation2.receivers.NotificationListener.EXTRA_TEXT;
+import static com.jens.automation2.receivers.NotificationListener.EXTRA_TITLE;
 
 public class Rule implements Comparable<Rule>
 {
@@ -42,9 +51,20 @@ public class Rule implements Comparable<Rule>
 	private String name;
 	private boolean ruleActive = true;		// rules can be deactivated, so they won't fire if you don't want them temporarily
 	private boolean ruleToggle = false;		// rule will run again and do the opposite of its actions if applicable
+	private Calendar lastExecution;
 	
 	private static Date lastActivatedRuleActivationTime;
-	
+
+	public Calendar getLastExecution()
+	{
+		return lastExecution;
+	}
+
+	public void setLastExecution(Calendar lastExecution)
+	{
+		this.lastExecution = lastExecution;
+	}
+
 	public boolean isRuleToggle()
 	{
 		return ruleToggle;
@@ -114,6 +134,7 @@ public class Rule implements Comparable<Rule>
 	{
 		return this.getName();
 	}
+	@SuppressLint("NewApi")
 	public String toStringLong()
 	{
 		String returnString = "";
@@ -153,6 +174,15 @@ public class Rule implements Comparable<Rule>
 			Miscellaneous.logEvent("i", "Rule", "Creating rule: " + this.toString(), 3);
 			ruleCollection.add(this);
 			boolean returnValue = XmlFileInterface.writeFile();
+
+			try
+			{
+				XmlFileInterface.readFile();
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("w", "Read file", Log.getStackTraceString(e), 3);
+			}
 			
 			if(returnValue)
 			{
@@ -196,10 +226,23 @@ public class Rule implements Comparable<Rule>
 		
 		return XmlFileInterface.writeFile();
 	}
+
+	public boolean cloneRule(Context context)
+	{
+		Rule newRule = new Rule();
+		newRule.setName(this.getName() + " - clone");
+		newRule.setRuleActive(this.isRuleActive());
+		newRule.setRuleToggle(this.isRuleToggle());
+
+		newRule.setTriggerSet(this.getTriggerSet());
+		newRule.setActionSet(this.getActionSet());
+
+		return newRule.create(context);
+	}
 	
 	private boolean checkBeforeSaving(Context context, boolean changeExistingRule)
 	{
-		if(this.getName() == null | this.getName().length()==0)
+		if(this.getName() == null || this.getName().length()==0)
 		{
 			Toast.makeText(context, context.getResources().getString(R.string.pleaseEnterValidName), Toast.LENGTH_LONG).show();
 			return false;
@@ -394,13 +437,13 @@ public class Rule implements Comparable<Rule>
 													&&
 										Miscellaneous.compareTimes(nowTime, oneTrigger.getTimeFrame().getTriggerTimeStop()) > 0
 								)
-									|
+									||
 									// Other case, start time higher than end time, timeframe goes over midnight
 								(
 										Miscellaneous.compareTimes(oneTrigger.getTimeFrame().getTriggerTimeStart(), oneTrigger.getTimeFrame().getTriggerTimeStop()) < 0
 											&&
 										(Miscellaneous.compareTimes(oneTrigger.getTimeFrame().getTriggerTimeStart(), nowTime) >= 0
-											|
+											||
 										Miscellaneous.compareTimes(nowTime, oneTrigger.getTimeFrame().getTriggerTimeStop()) > 0)
 								)
 							
@@ -469,7 +512,7 @@ public class Rule implements Comparable<Rule>
 				{
 					if(oneTrigger.getTriggerParameter())
 					{
-						if(BatteryReceiver.getBatteryLevel() < oneTrigger.getBatteryLevel())
+						if(BatteryReceiver.getBatteryLevel() <= oneTrigger.getBatteryLevel())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyBatteryLowerThan) + " " + String.valueOf(oneTrigger.getBatteryLevel()), 3);
 							return false;
@@ -477,7 +520,7 @@ public class Rule implements Comparable<Rule>
 					}
 					else
 					{
-						if(BatteryReceiver.getBatteryLevel() > oneTrigger.getBatteryLevel())
+						if(oneTrigger.getBatteryLevel() >= oneTrigger.getBatteryLevel())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyBatteryHigherThan) + " " + String.valueOf(oneTrigger.getBatteryLevel()), 3);
 							return false;
@@ -488,7 +531,7 @@ public class Rule implements Comparable<Rule>
 				{
 					if(oneTrigger.getTriggerParameter())
 					{
-						if(com.jens.automation2.location.LocationProvider.getSpeed() < oneTrigger.getSpeed())
+						if(LocationProvider.getSpeed() < oneTrigger.getSpeed())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyWeAreSlowerThan) + " " + String.valueOf(oneTrigger.getSpeed()), 3);
 							return false;
@@ -496,7 +539,7 @@ public class Rule implements Comparable<Rule>
 					}
 					else
 					{
-						if(com.jens.automation2.location.LocationProvider.getSpeed() > oneTrigger.getSpeed())
+						if(LocationProvider.getSpeed() > oneTrigger.getSpeed())
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyWeAreFasterThan) + " " + String.valueOf(oneTrigger.getSpeed()), 3);
 							return false;
@@ -527,12 +570,12 @@ public class Rule implements Comparable<Rule>
 					Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Checking for wifi state", 4);
 					if(oneTrigger.getTriggerParameter() == WifiBroadcastReceiver.lastConnectedState)	// connected / disconnected
 					{
-						if(oneTrigger.getWifiName().length() > 0)	// only check if any wifi name specified, otherwise any wifi will do
+						if(oneTrigger.getTriggerParameter2().length() > 0)	// only check if any wifi name specified, otherwise any wifi will do
 						{
 							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Wifi name specified, checking that.", 4);
-							if(!WifiBroadcastReceiver.getLastWifiSsid().equals(oneTrigger.getWifiName()))
+							if(!WifiBroadcastReceiver.getLastWifiSsid().equals(oneTrigger.getTriggerParameter2()))
 							{
-								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectSsid), oneTrigger.getWifiName(), WifiBroadcastReceiver.getLastWifiSsid()), 3);
+								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectSsid), oneTrigger.getTriggerParameter2(), WifiBroadcastReceiver.getLastWifiSsid()), 3);
 								return false;
 							}
 							else
@@ -580,13 +623,29 @@ public class Rule implements Comparable<Rule>
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.phoneCall))
 				{
-					if(oneTrigger.getPhoneNumber().equals("any") | oneTrigger.getPhoneNumber().equals(PhoneStatusListener.getLastPhoneNumber()))
+					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+					// state dir number
+
+					if(elements[2].equals(Trigger.triggerPhoneCallNumberAny) || Miscellaneous.comparePhoneNumbers(PhoneStatusListener.getLastPhoneNumber(), elements[2]) || (Miscellaneous.isRegularExpression(elements[2]) && PhoneStatusListener.getLastPhoneNumber().matches(elements[2])))
 					{
-						if(PhoneStatusListener.isInACall() == oneTrigger.getTriggerParameter())
+						//if(PhoneStatusListener.isInACall() == oneTrigger.getTriggerParameter())
+						if(
+								(elements[0].equals(Trigger.triggerPhoneCallStateRinging) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_RINGING)
+										||
+								(elements[0].equals(Trigger.triggerPhoneCallStateStarted) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_OFFHOOK)
+										||
+								(elements[0].equals(Trigger.triggerPhoneCallStateStopped) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_IDLE)
+						)
 						{
-							if(oneTrigger.getPhoneDirection() == 0 | (oneTrigger.getPhoneDirection() == PhoneStatusListener.getLastPhoneDirection()))
+							if(
+									elements[1].equals(Trigger.triggerPhoneCallDirectionAny)
+											||
+									(elements[1].equals(Trigger.triggerPhoneCallDirectionIncoming) && PhoneStatusListener.getLastPhoneDirection() == 1)
+											||
+									(elements[1].equals(Trigger.triggerPhoneCallDirectionOutgoing) && PhoneStatusListener.getLastPhoneDirection() == 2)
+							)
 							{
-								// Everything's allright
+								// Trigger conditions are met
 							}
 							else
 							{
@@ -601,7 +660,10 @@ public class Rule implements Comparable<Rule>
 						}
 					}
 					else
+					{
 						Miscellaneous.logEvent("i", "Rule", "Rule doesn't apply. Wrong phone number. Demanded: " + oneTrigger.getPhoneNumber() + ", got: " + PhoneStatusListener.getLastPhoneNumber(), 4);
+						return false;
+					}
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.nfcTag))
 				{
@@ -648,109 +710,69 @@ public class Rule implements Comparable<Rule>
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.bluetoothConnection))
 				{
 					Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Checking for bluetooth...", 4);
-					
-//					if(	// connected / disconnected
-//							(oneTrigger.getTriggerParameter() && (BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_CONNECTED) | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACL_CONNECTED")))
-//								|
-//							(!oneTrigger.getTriggerParameter() && (BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED) | BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_ACL_DISCONNECTED) | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACTION_ACL_DISCONNECT_REQUESTED") | BluetoothReceiver.getLastAction().equals("android.bluetooth.device.action.ACTION_ACL_DISCONNECTED")))
-//						)
-//					{
-//						if(oneTrigger.getBluetoothDeviceAddress() != null)
-//						{
-//							if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
-//							{								
-//								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "No bluetooth address specified, any will do.", 4);
-//							}
-//							else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
-//							{
-//								// ???
-//							}
-//							else
-//							{
-//								Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Bluetooth address specified, checking that.", 4);
-//								if(!BluetoothReceiver.getLastAffectedDevice().getAddress().equals(oneTrigger.getBluetoothDeviceAddress()))
-//								{
-//									Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyNotTheCorrectDeviceAddress), 3);
-//									return false;								
-//								}
-//								else
-//									Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), "Bluetooth address matches. Rule will apply.", 4);
-//							}
-//						}
-//					}
-//					else if(BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_FOUND) | BluetoothReceiver.getLastAction().equals(android.bluetooth.BluetoothDevice.ACTION_FOUND))
-//					{
-//						if(!oneTrigger.getTriggerParameter())
-//						{
-//							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyDeviceInRangeButShouldNotBe), 3);
-//							return false;
-//						}
-//					}
-//					else		// above only checks for last action, this checks for things in the past
+
+					if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
 					{
-						if(oneTrigger.getBluetoothDeviceAddress().equals("<any>"))
-						{	
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isAnyDeviceInRange() != oneTrigger.getTriggerParameter())
-									return false;
-							}
-						}
-						else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
 						{
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isAnyDeviceInRange() == oneTrigger.getTriggerParameter())
-									return false;
-							}
+							if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
+								return false;
 						}
-						else if(oneTrigger.getBluetoothDeviceAddress().length() > 0)
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
 						{
-							if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
-							{
-								if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
-							{
-								if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
-							else
-							{
-								// range
-								if(BluetoothReceiver.isDeviceInRange(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
-									return false;
-							}
+							if(BluetoothReceiver.isAnyDeviceConnected() != oneTrigger.getTriggerParameter())
+								return false;
 						}
 						else
 						{
-							Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyStateNotCorrect), 3);
-							return false;
+							// range
+							if(BluetoothReceiver.isAnyDeviceInRange() != oneTrigger.getTriggerParameter())
+								return false;
 						}
 					}
+					else if(oneTrigger.getBluetoothDeviceAddress().equals("<none>"))
+					{
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
+						{
+							if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
+						{
+							if(BluetoothReceiver.isAnyDeviceConnected() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else
+						{
+							// range
+							if(BluetoothReceiver.isAnyDeviceInRange() == oneTrigger.getTriggerParameter())
+								return false;
+						}
+					}
+					else if(oneTrigger.getBluetoothDeviceAddress().length() > 0)
+					{
+						if(oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_CONNECTED))
+						{
+							if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else if((oneTrigger.getBluetoothEvent().equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)))
+						{
+							if(BluetoothReceiver.isDeviceCurrentlyConnected(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+						else
+						{
+							// range
+							if(BluetoothReceiver.isDeviceInRange(BluetoothReceiver.getDeviceByAddress(oneTrigger.getBluetoothDeviceAddress())) != oneTrigger.getTriggerParameter())
+								return false;
+						}
+					}
+					else
+					{
+						Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), context.getResources().getString(R.string.ruleDoesntApplyStateNotCorrect), 3);
+						return false;
+					}
 				}
 				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.headsetPlugged))
 				{
@@ -763,6 +785,109 @@ public class Rule implements Comparable<Rule>
 							return false;
 						}
 				}
+				else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.notification))
+				{
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+					{
+						String[] params = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+
+						String myApp = params[0];
+						String myTitleDir = params[1];
+						String myTitle = params[2];
+						String myTextDir = params[3];
+						String myText;
+						if (params.length >= 5)
+							myText = params[4];
+						else
+							myText = "";
+
+						if(oneTrigger.getTriggerParameter())
+						{
+							// Check an active notification that is still there
+
+							boolean foundMatch = false;
+
+							for (StatusBarNotification sbn : NotificationListener.getInstance().getActiveNotifications())
+							{
+								if(getLastExecution() == null || sbn.getPostTime() > this.lastExecution.getTimeInMillis())
+								{
+									String app = sbn.getPackageName();
+									String title = sbn.getNotification().extras.getString(EXTRA_TITLE);
+									String text = sbn.getNotification().extras.getString(EXTRA_TEXT);
+
+									Miscellaneous.logEvent("i", "NotificationCheck", "Checking if this notification matches our rule " + this.getName() + ". App: " + app + ", title: " + title + ", text: " + text, 5);
+
+									if (!myApp.equals("-1"))
+									{
+										if (!app.equalsIgnoreCase(myApp))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification app name does not match rule.", 5);
+											continue;
+										}
+									}
+
+									if (myTitle.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTitleDir, myTitle, title))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification title does not match rule.", 5);
+											continue;
+										}
+									}
+
+									if (myText.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTextDir, myText, text))
+										{
+											Miscellaneous.logEvent("i", "NotificationCheck", "Notification text does not match rule.", 5);
+											continue;
+										}
+									}
+
+									foundMatch = true;
+									break;
+								}
+							}
+
+							if(!foundMatch)
+								return false;
+						}
+						else
+						{
+							// check a notification that is gone
+
+							if(NotificationListener.getLastNotification() != null)
+							{
+								if(!NotificationListener.getLastNotification().isCreated())
+								{
+									String app = NotificationListener.getLastNotification().getApp();
+									String title = NotificationListener.getLastNotification().getTitle();
+									String text = NotificationListener.getLastNotification().getText();
+
+									if (!myApp.equals("-1"))
+									{
+										if (!app.equalsIgnoreCase(myApp))
+											return false;
+									}
+
+									if (myTitle.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTitleDir, title, myTitle))
+											return false;
+									}
+
+									if (myText.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTextDir, text, myText))
+											return false;
+									}
+								}
+								else
+									return false;
+							}
+						}
+					}
+				}
 			}
 			
 			return true;
@@ -774,6 +899,8 @@ public class Rule implements Comparable<Rule>
 	
 	private class ActivateRuleTask extends AsyncTask<Object, String, Void>
 	{
+		boolean wasActivated = false;
+
 		@Override
 		protected Void doInBackground(Object... params)
 		{
@@ -788,7 +915,7 @@ public class Rule implements Comparable<Rule>
 	        if (Looper.myLooper() == null)
 	        	Looper.prepare();
 	        
-			activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
 
 			return null;
 		}
@@ -806,27 +933,35 @@ public class Rule implements Comparable<Rule>
 		@Override
 		protected void onPostExecute(Void result)
 		{
-			AutomationService.updateNotification();
-			ActivityMainScreen.updateMainScreen();
-			super.onPostExecute(result);
-		}	
-		
+			/*
+			 	Only update if the rules was actually executed. Became necessary for the notification trigger. If a user created a rule
+			 	with a notification trigger and this app creates a notification itself this will otherwise end in an infinite loop.
+			 */
+			if(wasActivated)
+			{
+				setLastExecution(Calendar.getInstance());
+				AutomationService.updateNotification();
+				ActivityMainScreen.updateMainScreen();
+				super.onPostExecute(result);
+			}
+		}
+
 		/**
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected void activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService, boolean force)
 		{
 			boolean isActuallyToggable = isActuallyToggable();
-			
+
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
 			boolean doToggle = ruleToggle && isActuallyToggable;
-			
-			if(notLastActive | force | doToggle)
+
+			if(notLastActive || force || doToggle)
 			{
 				String message;
 				if(!doToggle)
-					 message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
 				else
 					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 				Miscellaneous.logEvent("i", "Rule", message, 2);
@@ -834,10 +969,19 @@ public class Rule implements Comparable<Rule>
 //				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
 				if(Settings.startNewThreadForRuleActivation)
 					publishProgress(message);
-				
+
 				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-					Rule.this.getActionSet().get(i).run(automationService, doToggle);
-				
+				{
+					try
+					{
+						Rule.this.getActionSet().get(i).run(automationService, doToggle);
+					}
+					catch(Exception e)
+					{
+						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
+					}
+				}
+
 				// Keep log of last x rule activations (Settings)
 				try
 				{
@@ -862,9 +1006,12 @@ public class Rule implements Comparable<Rule>
 			else
 			{
 				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
+				return false;
 			}
-		}	
-	}	
+
+			return true;
+		}
+	}
 	
 	public void activate(AutomationService automationService, boolean force)
 	{
@@ -963,7 +1110,7 @@ public class Rule implements Comparable<Rule>
 					if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() > oneTrigger.getTimeFrame().getTriggerTimeStop().getTime())
 					{
 						Miscellaneous.logEvent("i", "Timeframe search", "Rule goes over midnight.", 5);
-						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() | searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
+						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() || searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
 						{
 							ruleCandidates.add(oneRule);
 							break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
@@ -1234,10 +1381,10 @@ public class Rule implements Comparable<Rule>
 		return ruleCandidates;
 	}
 	
-	public static ArrayList<Rule> findRuleCandidatesByPhoneCall(boolean triggerParameter)
+	public static ArrayList<Rule> findRuleCandidatesByPhoneCall(String direction)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
+
 		for(Rule oneRule : ruleCollection)
 		{
 			innerloop:
@@ -1245,7 +1392,8 @@ public class Rule implements Comparable<Rule>
 			{
 				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.phoneCall)
 				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
+					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
+					if(elements[1].equals(Trigger.triggerPhoneCallDirectionAny) || elements[1].equals(direction))
 					{
 						ruleCandidates.add(oneRule);
 						break innerloop; //we don't need to search the other triggers in the same rule
@@ -1253,7 +1401,7 @@ public class Rule implements Comparable<Rule>
 				}
 			}
 		}
-		
+
 		return ruleCandidates;
 	}
 	
@@ -1279,6 +1427,26 @@ public class Rule implements Comparable<Rule>
 		
 		return ruleCandidates;
 	}
+
+	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
+	{
+		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
+
+		for(Rule oneRule : ruleCollection)
+		{
+			innerloop:
+			for(Trigger oneTrigger : oneRule.getTriggerSet())
+			{
+				if(oneTrigger.getTriggerType() == triggerType)
+				{
+					ruleCandidates.add(oneRule);
+					break innerloop; //we don't need to search the other triggers in the same rule
+				}
+			}
+		}
+
+		return ruleCandidates;
+	}
 	
 	public static ArrayList<Rule> findRuleCandidatesByActivityDetection()
 	{

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

@@ -3,6 +3,7 @@ package com.jens.automation2;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
+import android.widget.Toast;
 
 import org.apache.http.client.methods.HttpGet;
 
@@ -12,6 +13,10 @@ import java.util.Locale;
 
 public class Action
 {
+	public static final String actionParameter2Split = "ap2split";
+	public static final String intentPairSeperator = "intPairSplit";
+	public static final String vibrateSeparator = ",";
+
 	public enum Action_Enum {	
 								setWifi,
 								setBluetooth,
@@ -33,6 +38,8 @@ public class Action
 								speakText,
 								playMusic,
 								setScreenBrightness,
+								playSound,
+								vibrate,
 								sendTextMessage;
 								
 								public String getFullName(Context context)
@@ -79,6 +86,8 @@ public class Action
 											return context.getResources().getString(R.string.waitBeforeNextAction);
 										case wakeupDevice:
 											return context.getResources().getString(R.string.wakeupDevice);
+										case vibrate:
+											return context.getResources().getString(R.string.vibrate);
 										case setAirplaneMode:
 											return context.getResources().getString(R.string.airplaneMode);
 										case setDataConnection:
@@ -87,6 +96,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:
@@ -210,9 +221,13 @@ public class Action
 		{
 			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.wakeupDevice));
 		}
+		else if(this.getAction().equals(Action_Enum.playSound))
+		{
+			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playSound));
+		}
 		else
 			returnString.append(action.toString());
-		
+
 		if(this.getAction().equals(Action_Enum.triggerUrl))
 		{
 			String[] components = parameter2.split(";");
@@ -226,6 +241,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);
@@ -320,84 +339,91 @@ 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.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(getParameter1(), getParameter2());
+					break;
+				case waitBeforeNextAction:
+					Actions.waitBeforeNextAction(Long.parseLong(this.getParameter2()));
+					break;
+				case wakeupDevice:
+					Actions.wakeupDevice(Long.parseLong(this.getParameter2()));
+					// wakeupDevice() will create a seperate thread. That'll take some time, we wait 100ms.
+					try
+					{
+						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;
+				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 +459,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 +490,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/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

@@ -26,10 +26,14 @@ 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)
@@ -249,4 +261,4 @@ public class ActivityMainRules extends ActivityGeneric
 			// 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;
@@ -29,6 +31,8 @@ import com.jens.automation2.AutomationService.serviceCommands;
 import com.jens.automation2.Trigger.Trigger_Enum;
 import com.jens.automation2.location.LocationProvider;
 
+import java.io.File;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Calendar;
 
@@ -39,8 +43,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;
+	private TextView tvActivePoi, tvClosestPoi, tvLastRule, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvlockSoundDuration;
+	private static boolean updateNoteDisplayed = false;
 
 	private ListView lvRuleHistory;
 	private ArrayAdapter<Rule> ruleHistoryListViewAdapter;
@@ -74,7 +79,6 @@ 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);
 		toggleService.setChecked(AutomationService.isMyServiceRunning(this));
@@ -130,19 +134,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 +171,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 +234,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 +325,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 +408,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 +474,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 +598,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 +636,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();
 		

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

@@ -0,0 +1,370 @@
+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();
+                    }
+                    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";
+
+                StringBuilder emailBody = new StringBuilder();
+                emailBody.append("Device details" + Miscellaneous.lineSeparator);
+                emailBody.append("OS version: " + System.getProperty("os.version") + Miscellaneous.lineSeparator);
+                emailBody.append("API Level: " + android.os.Build.VERSION.SDK + Miscellaneous.lineSeparator);
+                emailBody.append("Device: " + android.os.Build.DEVICE + Miscellaneous.lineSeparator);
+                emailBody.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
+                emailBody.append("Product: " + android.os.Build.PRODUCT);
+                emailBody.append("Flavor: " + BuildConfig.FLAVOR);
+
+                Uri uri = Uri.parse("content://com.jens.automation2/" + Settings.zipFileName);
+
+                Miscellaneous.sendEmail(ActivityMaintenance.this, "android-development@gmx.de", "Automation logs", emailBody.toString(), uri);
+            }
+        });
+        alertDialogBuilder.setNegativeButton(context.getResources().getString(R.string.no), null);
+        AlertDialog alertDialog = alertDialogBuilder.create();
+
+        return alertDialog;
+    }
+
+    @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);
@@ -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);
@@ -48,9 +48,9 @@ public class ActivityEditSpeakText extends Activity
 			}
 		});
 		
-		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,10 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
+import java.util.Calendar;
+import java.util.Timer;
+import java.util.TimerTask;
+
 public class ActivityManagePoi extends Activity
 {
 	public LocationManager myLocationManager;
@@ -31,6 +36,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 +57,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 +114,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 +124,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 +160,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)
+			{
+				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 +307,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 +317,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 +346,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 +380,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 +408,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 +451,6 @@ public class ActivityManagePoi extends Activity
 			// TODO Auto-generated method stub
 			
 		}
-		
 	}
 	
 	public void editPoi(PointOfInterest poi)
@@ -380,19 +461,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 +499,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

@@ -82,7 +82,7 @@ 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);
 		checkBoxChangeVolumeMusicVideoGameMedia = (CheckBox)findViewById(R.id.checkBoxChangeVolumeMusicVideoGameMedia);

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

@@ -95,6 +95,17 @@ public class ActivityManageRule extends Activity
 	final static int requestCodeActionScreenBrightnessAdd = 401;
 	final static int requestCodeActionScreenBrightnessEdit = 402;
 	final static int requestCodeActionSendTextMessage = 7001;
+	final static int requestCodeTriggerNotificationAdd = 8000;
+	final static int requestCodeTriggerNfcNotificationEdit = 8001;
+	final static int requestCodeActionPlaySoundAdd = 501;
+	final static int requestCodeActionPlaySoundEdit = 502;
+	final static int requestCodeTriggerPhoneCallAdd = 601;
+	final static int requestCodeTriggerPhoneCallEdit = 602;
+	final static int requestCodeTriggerWifiAdd = 723;
+	final static int requestCodeTriggerWifiEdit = 724;
+	final static int requestCodeActionSendTextMessageAdd = 5001;
+	final static int requestCodeActionVibrateAdd = 801;
+	final static int requestCodeActionVibrateEdit = 802;
 	
 	public static ActivityManageRule getInstance()
 	{
@@ -220,32 +231,35 @@ public class ActivityManageRule extends Activity
 				Trigger selectedTrigger = (Trigger)triggerListView.getItemAtPosition(arg2);
 				switch(selectedTrigger.getTriggerType())
 				{
-//					case batteryLevel:
-//						break;
-//					case charging:
-//						break;
-//					case noiseLevel:
-//						break;
-//					case pointOfInterest:
-//						break;
-//					case process_started_stopped:
-//						break;
-//					case speed:
-//						break;
 					case timeFrame:
-						ActivityManageTimeFrame.editedTimeFrameTrigger = selectedTrigger;
-						Intent timeFrameEditor = new Intent(ActivityManageRule.this, ActivityManageTimeFrame.class);
+						ActivityManageTriggerTimeFrame.editedTimeFrameTrigger = selectedTrigger;
+						Intent timeFrameEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerTimeFrame.class);
 						startActivityForResult(timeFrameEditor, requestCodeTriggerTimeframeEdit);
 						break;
-//					case usb_host_connection:
-//						break;
-//					case wifiConnection:
-//						break;
 					case bluetoothConnection:
-						ActivityManageBluetoothTrigger.editedBluetoothTrigger = selectedTrigger;
-						Intent bluetoothEditor = new Intent(ActivityManageRule.this, ActivityManageBluetoothTrigger.class);
+						ActivityManageTriggerBluetooth.editedBluetoothTrigger = selectedTrigger;
+						Intent bluetoothEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerBluetooth.class);
 						startActivityForResult(bluetoothEditor, requestCodeTriggerBluetoothEdit);
 						break;
+					case notification:
+						ActivityManageTriggerNotification.editedNotificationTrigger = selectedTrigger;
+						Intent notificationEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerNotification.class);
+						notificationEditor.putExtra("edit", true);
+						startActivityForResult(notificationEditor, requestCodeTriggerNfcNotificationEdit);
+						break;
+					case phoneCall:
+						ActivityManageTriggerPhoneCall.editedPhoneCallTrigger = selectedTrigger;
+						Intent phoneCallEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerPhoneCall.class);
+						phoneCallEditor.putExtra("edit", true);
+						startActivityForResult(phoneCallEditor, requestCodeTriggerPhoneCallEdit);
+						break;
+					case wifiConnection:
+						Intent wifiEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerWifi.class);
+						wifiEditor.putExtra("edit", true);
+						wifiEditor.putExtra("wifiState", selectedTrigger.getTriggerParameter());
+						wifiEditor.putExtra("wifiName", selectedTrigger.getTriggerParameter2());
+						startActivityForResult(wifiEditor, requestCodeTriggerWifiEdit);
+						break;
 					default:
 						break;				
 				}
@@ -279,66 +293,48 @@ public class ActivityManageRule extends Activity
 				Action a = (Action)actionListView.getItemAtPosition(arg2);
 				switch(a.getAction())
 				{
-//					case changeSoundProfile:
-//						break;
-//					case disableScreenRotation:
-//						break;
-//					case enableScreenRotation:
-//						break;
-//					case setAirplaneMode:
-//						break;
 					case startOtherActivity:
-						Intent intent = new Intent(ActivityManageRule.this, ActivityManageStartActivity.class);
-						ActivityManageStartActivity.resultingAction = a;
+						Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionStartActivity.class);
+						ActivityManageActionStartActivity.resultingAction = a;
 						intent.putExtra("edit", true);
 						startActivityForResult(intent, requestCodeActionStartActivityEdit);
 						break;
 					case triggerUrl:
-						Intent activityEditTriggerUrlIntent = new Intent(ActivityManageRule.this, ActivityEditTriggerUrl.class);
-//						activityEditTriggerUrlIntent.putExtra("urlToTrigger", a.getParameter2());
-						ActivityEditTriggerUrl.resultingAction = a;
+						Intent activityEditTriggerUrlIntent = new Intent(ActivityManageRule.this, ActivityManageActionTriggerUrl.class);
+						ActivityManageActionTriggerUrl.resultingAction = a;
 						activityEditTriggerUrlIntent.putExtra("edit", true);
 						startActivityForResult(activityEditTriggerUrlIntent, requestCodeActionTriggerUrlEdit);
 						break;
-//					case turnBluetoothOff:
-//						break;
-//					case turnBluetoothOn:
-//						break;
-//					case turnUsbTetheringOff:
-//						break;
-//					case turnUsbTetheringOn:
-//						break;
-//					case turnWifiOff:
-//						break;
-//					case turnWifiOn:
-//						break;
-//					case turnWifiTetheringOff:
-//						break;
-//					case turnWifiTetheringOn:
-//						break;
-//					case waitBeforeNextAction:
-//						break;
-//					case wakeupDevice:
-//						break;
 					case speakText:
-						Intent activitySpeakTextIntent = new Intent(ActivityManageRule.this, ActivityEditSpeakText.class);
-						ActivityEditSpeakText.resultingAction = a;
+						Intent activitySpeakTextIntent = new Intent(ActivityManageRule.this, ActivityManageActionSpeakText.class);
+						ActivityManageActionSpeakText.resultingAction = a;
 						activitySpeakTextIntent.putExtra("edit", true);
 						startActivityForResult(activitySpeakTextIntent, requestCodeActionSpeakTextEdit);
 						break;
 					case sendTextMessage:
-						Intent activitySendTextMessageIntent = new Intent(ActivityManageRule.this, ActivityEditSendTextMessage.class);
-						ActivityEditSendTextMessage.resultingAction = a;
+						Intent activitySendTextMessageIntent = new Intent(ActivityManageRule.this, ActivityManageActionSendTextMessage.class);
+						ActivityManageActionSendTextMessage.resultingAction = a;
 						activitySendTextMessageIntent.putExtra("edit", true);
 						startActivityForResult(activitySendTextMessageIntent, requestCodeActionSendTextMessage);
 						break;
 					case setScreenBrightness:
-						Intent activityEditScreenBrightnessIntent = new Intent(ActivityManageRule.this, ActivityManageBrightnessSetting.class);
-//						ActivityEditTriggerUrl.resultingAction = a;
+						Intent activityEditScreenBrightnessIntent = new Intent(ActivityManageRule.this, ActivityManageActionBrightnessSetting.class);
 						activityEditScreenBrightnessIntent.putExtra("autoBrightness", a.getParameter1());
 						activityEditScreenBrightnessIntent.putExtra("brightnessValue", Integer.parseInt(a.getParameter2()));
 						startActivityForResult(activityEditScreenBrightnessIntent, requestCodeActionScreenBrightnessEdit);
 						break;
+					case vibrate:
+						Intent activityEditVibrateIntent = new Intent(ActivityManageRule.this, ActivityManageActionVibrate.class);
+						activityEditVibrateIntent.putExtra("vibratePattern", a.getParameter2());
+						startActivityForResult(activityEditVibrateIntent, requestCodeActionVibrateEdit);
+						break;
+					case playSound:
+						Intent actionPlaySoundIntent = new Intent(context, ActivityManageActionPlaySound.class);
+						actionPlaySoundIntent.putExtra("edit", true);
+						actionPlaySoundIntent.putExtra("actionParameter1", a.getParameter1());
+						actionPlaySoundIntent.putExtra("actionParameter2", a.getParameter2());
+						startActivityForResult(actionPlaySoundIntent, requestCodeActionPlaySoundEdit);
+						break;
 					default:
 						Miscellaneous.logEvent("w", "Edit action", "Editing of action type " + a.getAction().toString() + " not implemented, yet.", 4);
 						break;				
@@ -466,6 +462,8 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.bluetooth));
 			else if(types[i].toString().equals(Trigger_Enum.headsetPlugged.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.headphone));
+			else if(types[i].toString().equals(Trigger_Enum.notification.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.notification));
 			else
 				items.add(new Item(typesLong[i].toString(), R.drawable.placeholder));
 		}
@@ -521,8 +519,8 @@ public class ActivityManageRule extends Activity
 						else if(triggerType == Trigger_Enum.timeFrame)
 						{
 							newTrigger.setTriggerType(Trigger_Enum.timeFrame);
-							ActivityManageTimeFrame.editedTimeFrameTrigger = newTrigger;
-							Intent timeFrameEditor = new Intent(myContext, ActivityManageTimeFrame.class);
+							ActivityManageTriggerTimeFrame.editedTimeFrameTrigger = newTrigger;
+							Intent timeFrameEditor = new Intent(myContext, ActivityManageTriggerTimeFrame.class);
 							startActivityForResult(timeFrameEditor, requestCodeTriggerTimeframeAdd);
 							return;
 						}
@@ -533,15 +531,36 @@ public class ActivityManageRule extends Activity
 						else if(triggerType == Trigger_Enum.speed | triggerType == Trigger_Enum.noiseLevel | triggerType == Trigger_Enum.batteryLevel)
 							booleanChoices = new String[]{getResources().getString(R.string.exceeds), getResources().getString(R.string.dropsBelow)};
 						else if(triggerType == Trigger_Enum.wifiConnection)
-							booleanChoices = new String[]{getResources().getString(R.string.connected), getResources().getString(R.string.disconnected)};
+						{
+							newTrigger.setTriggerType(Trigger_Enum.wifiConnection);
+							Intent wifiTriggerEditor = new Intent(myContext, ActivityManageTriggerWifi.class);
+							startActivityForResult(wifiTriggerEditor, requestCodeTriggerWifiAdd);
+							return;
+//							booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
+						}
+//						else if(triggerType == Trigger_Enum.wifiConnection)
+//							booleanChoices = new String[]{getResources().getString(R.string.connected), getResources().getString(R.string.disconnected)};
 						else if(triggerType == Trigger_Enum.process_started_stopped)
 							booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
+						else if(triggerType == Trigger_Enum.notification)
+						{
+							newTrigger.setTriggerType(Trigger_Enum.notification);
+							Intent nfcEditor = new Intent(myContext, ActivityManageTriggerNotification.class);
+							startActivityForResult(nfcEditor, requestCodeTriggerNotificationAdd);
+							return;
+						}
 						else if(triggerType == Trigger_Enum.airplaneMode)
 							booleanChoices = new String[]{getResources().getString(R.string.activated), getResources().getString(R.string.deactivated)};
 						else if(triggerType == Trigger_Enum.roaming)
 							booleanChoices = new String[]{getResources().getString(R.string.activated), getResources().getString(R.string.deactivated)};
 						else if(triggerType == Trigger_Enum.phoneCall)
-							booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
+						{
+							newTrigger.setTriggerType(Trigger_Enum.phoneCall);
+							Intent phoneTriggerEditor = new Intent(myContext, ActivityManageTriggerPhoneCall.class);
+							startActivityForResult(phoneTriggerEditor, requestCodeTriggerPhoneCallAdd);
+							return;
+//							booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
+						}
 						else if(triggerType == Trigger_Enum.activityDetection)
 						{
 							try
@@ -572,7 +591,7 @@ public class ActivityManageRule extends Activity
 							if(NfcReceiver.checkNfcRequirements(ActivityManageRule.this, true))
 							{
 								newTrigger.setTriggerType(Trigger_Enum.nfcTag);
-								Intent nfcEditor = new Intent(myContext, ActivityManageNfc.class);
+								Intent nfcEditor = new Intent(myContext, ActivityManageTriggerNfc.class);
 								startActivityForResult(nfcEditor, requestCodeTriggerNfcTagAdd);
 								return;
 							}
@@ -583,8 +602,8 @@ public class ActivityManageRule extends Activity
 								Miscellaneous.messageBox("Bluetooth", getResources().getString(R.string.deviceDoesNotHaveBluetooth), ActivityManageRule.this).show();;
 
 							newTrigger.setTriggerType(Trigger_Enum.bluetoothConnection);
-							ActivityManageBluetoothTrigger.editedBluetoothTrigger = newTrigger;
-							Intent bluetoothEditor = new Intent(myContext, ActivityManageBluetoothTrigger.class);
+							ActivityManageTriggerBluetooth.editedBluetoothTrigger = newTrigger;
+							Intent bluetoothEditor = new Intent(myContext, ActivityManageTriggerBluetooth.class);
 							startActivityForResult(bluetoothEditor, requestCodeTriggerBluetoothAdd);
 							return;
 						}
@@ -650,13 +669,6 @@ public class ActivityManageRule extends Activity
 					String[] choices = (String[]) choicesList.toArray(new String[choicesList.size()]);
 					getTriggerNoiseDialog(myContext, choices).show();
 				}
-//				else if(triggerType.equals(Trigger.Event_Enum.timeFrame))
-//				{
-//					newTrigger.setTriggerType(Trigger.Event_Enum.timeFrame);
-//					ActivityManageTimeFrame.editedTimeFrameTrigger = null;
-//					Intent timeFrameEditor = new Intent(myContext, ActivityManageTimeFrame.class);
-//					startActivityForResult(timeFrameEditor, 2000);
-//				}
 				else if(triggerType.equals(Trigger_Enum.wifiConnection))
 				{
 					newTrigger.setTriggerType(Trigger_Enum.wifiConnection);
@@ -667,7 +679,6 @@ public class ActivityManageRule extends Activity
 					progressDialog = ProgressDialog.show(myContext, null, getResources().getString(R.string.gettingListOfInstalledApplications), true, false);
 					newTrigger.setTriggerType(Trigger_Enum.process_started_stopped);
 					new GenerateApplicationSelectionsDialogTask().execute(ActivityManageRule.this);
-//					getTriggerRunningProcessDialog1(myContext).show();
 				}
 				else if(triggerType.equals(Trigger_Enum.phoneCall))
 				{
@@ -800,7 +811,7 @@ public class ActivityManageRule extends Activity
 		{
 			public void onClick(DialogInterface dialog, int whichButton)
 			{
-				newTrigger.setWifiName(input.getText().toString());
+//				newTrigger.setWifiName(input.getText().toString());
 				ruleToEdit.getTriggerSet().add(newTrigger);
 				refreshTriggerList();
 			}
@@ -979,7 +990,7 @@ public class ActivityManageRule extends Activity
 		protected String[] doInBackground(ActivityManageRule... params)
 		{
 //			Looper.prepare();
-			final String[] applicationArray = ActivityManageStartActivity.getApplicationNameListString(params[0]);
+			final String[] applicationArray = ActivityManageActionStartActivity.getApplicationNameListString(params[0]);
 			return applicationArray;
 		}
 
@@ -1026,7 +1037,7 @@ public class ActivityManageRule extends Activity
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(myContext);
 		alertDialogBuilder.setTitle(myContext.getResources().getString(R.string.selectPackageOfApplication));
-		final String[] packageArray = ActivityManageStartActivity.getPackageListString(myContext, applicationName);
+		final String[] packageArray = ActivityManageActionStartActivity.getPackageListString(myContext, applicationName);
 		alertDialogBuilder.setItems(packageArray, new DialogInterface.OnClickListener()
 		{			
 			@Override
@@ -1046,7 +1057,7 @@ public class ActivityManageRule extends Activity
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(myContext);
 		alertDialogBuilder.setTitle(myContext.getResources().getString(R.string.selectActivityToBeStarted));
-		final String activityArray[] = ActivityManageStartActivity.getActivityListForPackageName(packageName);
+		final String activityArray[] = ActivityManageActionStartActivity.getActivityListForPackageName(packageName);
 		alertDialogBuilder.setItems(activityArray, new DialogInterface.OnClickListener()
 		{			
 			@Override
@@ -1074,7 +1085,7 @@ public class ActivityManageRule extends Activity
 			if(resultCode == RESULT_OK)
 			{
 				//add TriggerUrl
-				ruleToEdit.getActionSet().add(ActivityEditTriggerUrl.resultingAction);
+				ruleToEdit.getActionSet().add(ActivityManageActionTriggerUrl.resultingAction);
 				this.refreshActionList();
 			}
 		}
@@ -1089,7 +1100,7 @@ public class ActivityManageRule extends Activity
 		else if(requestCode == requestCodeTriggerTimeframeAdd)
 		{
 			//add TimeFrame
-			if(resultCode == RESULT_OK && ActivityManageTimeFrame.editedTimeFrameTrigger != null)
+			if(resultCode == RESULT_OK && ActivityManageTriggerTimeFrame.editedTimeFrameTrigger != null)
 			{
 				ruleToEdit.getTriggerSet().add(newTrigger);
 				this.refreshTriggerList();
@@ -1100,19 +1111,38 @@ public class ActivityManageRule extends Activity
 		else if(requestCode == requestCodeTriggerTimeframeEdit)
 		{
 			//edit TimeFrame
-			if(resultCode == RESULT_OK && ActivityManageTimeFrame.editedTimeFrameTrigger != null)
+			if(resultCode == RESULT_OK && ActivityManageTriggerTimeFrame.editedTimeFrameTrigger != null)
 			{
 				this.refreshTriggerList();
 			}
 			else
 				Miscellaneous.logEvent("w", "TimeFrameEdit", "No timeframe returned. Assuming abort.", 5);
 		}
+		else if(requestCode == requestCodeTriggerWifiAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newTrigger.setTriggerParameter(data.getBooleanExtra("wifiState", false));
+				newTrigger.setTriggerParameter2(data.getStringExtra("wifiName"));
+				ruleToEdit.getTriggerSet().add(newTrigger);
+				this.refreshTriggerList();
+			}
+		}
+		else if(requestCode == requestCodeTriggerWifiEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newTrigger.setTriggerParameter(data.getBooleanExtra("wifiState", false));
+				newTrigger.setTriggerParameter2(data.getStringExtra("wifiName"));
+				this.refreshTriggerList();
+			}
+		}
 		else if(requestCode == requestCodeActionStartActivityAdd)
 		{
 			// manage start of other activity
 			if(resultCode == RESULT_OK)
 			{
-				newAction = ActivityManageStartActivity.resultingAction;
+				newAction = ActivityManageActionStartActivity.resultingAction;
 				ruleToEdit.getActionSet().add(newAction);
 				this.refreshActionList();
 			}
@@ -1122,7 +1152,7 @@ public class ActivityManageRule extends Activity
 			// manage start of other activity
 			if(resultCode == RESULT_OK)
 			{
-				newAction = ActivityManageStartActivity.resultingAction;
+				newAction = ActivityManageActionStartActivity.resultingAction;
 //				ruleToEdit.getActionSet().add(newAction);
 				this.refreshActionList();
 			}
@@ -1130,21 +1160,63 @@ public class ActivityManageRule extends Activity
 		else if(requestCode == requestCodeTriggerNfcTagAdd)
 		{
 			//add TimeFrame
-			if(resultCode == RESULT_OK && ActivityManageNfc.generatedId != null)
+			if(resultCode == RESULT_OK && ActivityManageTriggerNfc.generatedId != null)
 			{
-				newTrigger.setNfcTagId(ActivityManageNfc.generatedId);
+				newTrigger.setNfcTagId(ActivityManageTriggerNfc.generatedId);
 				ruleToEdit.getTriggerSet().add(newTrigger);
 				this.refreshTriggerList();
 			}
 			else
 				Miscellaneous.logEvent("w", "ActivityManageNfc", "No nfc id returned. Assuming abort.", 5);
 		}
+		else if(requestCode == requestCodeTriggerNotificationAdd)
+		{
+			//add notification
+			if(resultCode == RESULT_OK)
+			{
+				ruleToEdit.getTriggerSet().add(newTrigger);
+
+				newTrigger.setTriggerParameter2(
+													data.getStringExtra("app") + Trigger.triggerParameter2Split +
+													data.getStringExtra("titleDir") + Trigger.triggerParameter2Split +
+													data.getStringExtra("title") + Trigger.triggerParameter2Split +
+													data.getStringExtra("textDir") + Trigger.triggerParameter2Split +
+													data.getStringExtra("text")
+												);
+				this.refreshTriggerList();
+			}
+		}
+		else if(requestCode == requestCodeTriggerNfcNotificationEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newTrigger = ActivityManageTriggerNotification.resultingTrigger;
+				this.refreshTriggerList();
+			}
+		}
+		else if(requestCode == requestCodeTriggerPhoneCallAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				ruleToEdit.getTriggerSet().add(newTrigger);
+				newTrigger.setTriggerParameter2(data.getStringExtra("triggerParameter2"));
+				this.refreshTriggerList();
+			}
+		}
+		else if(requestCode == requestCodeTriggerPhoneCallEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newTrigger = ActivityManageTriggerPhoneCall.resultingTrigger;
+				this.refreshTriggerList();
+			}
+		}
 		else if(requestCode == requestCodeActionSpeakTextAdd)
 		{
 			if(resultCode == RESULT_OK)
 			{
 				//add SpeakText
-				ruleToEdit.getActionSet().add(ActivityEditSpeakText.resultingAction);
+				ruleToEdit.getActionSet().add(ActivityManageActionSpeakText.resultingAction);
 				this.refreshActionList();
 			}
 		}
@@ -1153,14 +1225,14 @@ public class ActivityManageRule extends Activity
 			if(resultCode == RESULT_OK)
 			{
 				//add SpeakText
-				ruleToEdit.getActionSet().add(ActivityEditSendTextMessage.resultingAction);
+				ruleToEdit.getActionSet().add(ActivityManageActionSendTextMessage.resultingAction);
 				this.refreshActionList();
 			}
 		}
 		else if(requestCode == requestCodeTriggerBluetoothAdd)
 		{
 			//add bluetooth trigger
-			if(resultCode == RESULT_OK && ActivityManageBluetoothTrigger.editedBluetoothTrigger != null)
+			if(resultCode == RESULT_OK && ActivityManageTriggerBluetooth.editedBluetoothTrigger != null)
 			{
 				ruleToEdit.getTriggerSet().add(newTrigger);
 				this.refreshTriggerList();
@@ -1171,7 +1243,7 @@ public class ActivityManageRule extends Activity
 		else if(requestCode == requestCodeTriggerBluetoothEdit)
 		{
 			//edit bluetooth trigger
-			if(resultCode == RESULT_OK && ActivityManageBluetoothTrigger.editedBluetoothTrigger != null)
+			if(resultCode == RESULT_OK && ActivityManageTriggerBluetooth.editedBluetoothTrigger != null)
 			{
 				this.refreshTriggerList();
 			}
@@ -1201,6 +1273,48 @@ public class ActivityManageRule extends Activity
 				this.refreshActionList();
 			}
 		}
+		else if(requestCode == requestCodeActionVibrateAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newAction.setParameter2(data.getStringExtra("vibratePattern"));
+				ruleToEdit.getActionSet().add(newAction);
+				this.refreshActionList();
+			}
+		}
+		else if(requestCode == requestCodeActionVibrateEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				if(data.hasExtra("vibratePattern"))
+					ruleToEdit.getActionSet().get(editIndex).setParameter2(data.getStringExtra("vibratePattern"));
+
+				this.refreshActionList();
+			}
+		}
+		else if(requestCode == requestCodeActionPlaySoundAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newAction.setParameter1(data.getBooleanExtra("actionParameter1", false));
+				newAction.setParameter2(data.getStringExtra("actionParameter2"));
+				ruleToEdit.getActionSet().add(newAction);
+				this.refreshActionList();
+			}
+		}
+		else if(requestCode == requestCodeActionPlaySoundEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				if(data.hasExtra("actionParameter1"))
+					ruleToEdit.getActionSet().get(editIndex).setParameter1(data.getBooleanExtra("actionParameter1", false));
+
+				if(data.hasExtra("actionParameter2"))
+					ruleToEdit.getActionSet().get(editIndex).setParameter2(data.getStringExtra("actionParameter2"));
+
+				this.refreshActionList();
+			}
+		}
 
 		//TODO: Check with has data been changed or something like that.
 		/*try
@@ -1253,6 +1367,10 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.tune));
 			else if(types[i].toString().equals(Action_Enum.setScreenBrightness.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.brightness));
+			else if(types[i].toString().equals(Action_Enum.playSound.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.sound));
+			else if(types[i].toString().equals(Action_Enum.vibrate.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.vibrate));
 			else if(types[i].toString().equals(Action_Enum.sendTextMessage.toString()))
 			{
 //			    if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageSpecificRule.this, "android.permission.SEND_SMS") && !Miscellaneous.isGooglePlayInstalled(ActivityManageSpecificRule.this))
@@ -1262,159 +1380,163 @@ public class ActivityManageRule extends Activity
 			else
 				items.add(new Item(typesLong[i].toString(), R.drawable.placeholder));
 		}
-			
-//			= 	{
-//								    new Item("Bluetooth", R.drawable.bluetooth),
-//								    new Item("Wifi", R.drawable.wifi),
-//								    new Item("...", 0), //no icon for this one
-//								};
 
-//			ListAdapter adapter = new ArrayAdapter<Item>(this, android.R.layout.select_dialog_item, android.R.id.text1, items)
-			ListAdapter adapter = new ArrayAdapter<Item>(this, android.R.layout.select_dialog_item, android.R.id.text1, items)
-		    {
-		        public View getView(int position, View convertView, ViewGroup parent)
-		        {
-		            //User super class to create the View
-		        	View v = super.getView(position, convertView, parent);
-		        	
-		        	TextView tv = (TextView)v.findViewById(android.R.id.text1);		            
+		ListAdapter adapter = new ArrayAdapter<Item>(this, android.R.layout.select_dialog_item, android.R.id.text1, items)
+		{
+			public View getView(int position, View convertView, ViewGroup parent)
+			{
+				//User super class to create the View
+				View v = super.getView(position, convertView, parent);
 
-		            //Put the image on the TextView
-		            tv.setCompoundDrawablesWithIntrinsicBounds(items.get(position).icon, 0, 0, 0);
+				TextView tv = (TextView)v.findViewById(android.R.id.text1);
 
-		            //Add margin between image and text (support various screen densities)
-		            int dp5 = (int) (5 * getResources().getDisplayMetrics().density + 0.5f);
-		            tv.setCompoundDrawablePadding(dp5);
+				//Put the image on the TextView
+				tv.setCompoundDrawablesWithIntrinsicBounds(items.get(position).icon, 0, 0, 0);
 
-		            return v;
-		        }
-		    };
+				//Add margin between image and text (support various screen densities)
+				int dp5 = (int) (5 * getResources().getDisplayMetrics().density + 0.5f);
+				tv.setCompoundDrawablePadding(dp5);
 
-			AlertDialog.Builder builder = new AlertDialog.Builder(this)
-			    .setTitle(getResources().getString(R.string.selectTypeOfAction))
-			    .setAdapter(adapter, new DialogInterface.OnClickListener()
-			    {
-			        public void onClick(DialogInterface dialog, int which)
-			        {	
-						newAction = new Action();
-						
-						if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.triggerUrl.toString()))
+				return v;
+			}
+		};
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(this)
+			.setTitle(getResources().getString(R.string.selectTypeOfAction))
+			.setAdapter(adapter, new DialogInterface.OnClickListener()
+			{
+				public void onClick(DialogInterface dialog, int which)
+				{
+					newAction = new Action();
+
+					if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.triggerUrl.toString()))
+					{
+						//launch other activity to enter a url and parameters;
+						newAction.setAction(Action_Enum.triggerUrl);
+						ActivityManageActionTriggerUrl.resultingAction = null;
+						Intent editTriggerIntent = new Intent(context, ActivityManageActionTriggerUrl.class);
+						startActivityForResult(editTriggerIntent, 1000);
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setWifi.toString()))
+					{
+						newAction.setAction(Action_Enum.setWifi);
+						if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+							Toast.makeText(context, context.getResources().getString(R.string.android10WifiToggleNotice), Toast.LENGTH_LONG).show();
+						getActionParameter1Dialog(ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setBluetooth.toString()))
+					{
+						if(!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH))
+							Miscellaneous.messageBox("Bluetooth", getResources().getString(R.string.deviceDoesNotHaveBluetooth), ActivityManageRule.this).show();;
+						newAction.setAction(Action_Enum.setBluetooth);
+						getActionParameter1Dialog(ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setUsbTethering.toString()))
+					{
+						newAction.setAction(Action_Enum.setUsbTethering);
+						if(Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1)
+							Miscellaneous.messageBox(context.getResources().getString(R.string.warning), context.getResources().getString(R.string.usbTetheringFailForAboveGingerbread), context).show();
+						getActionParameter1Dialog(ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setWifiTethering.toString()))
+					{
+						newAction.setAction(Action_Enum.setWifiTethering);
+						getActionParameter1Dialog(ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setDisplayRotation.toString()))
+					{
+						newAction.setAction(Action_Enum.setDisplayRotation);
+						getActionParameter1Dialog(ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.changeSoundProfile.toString()))
+					{
+						if(Profile.getProfileCollection().size() > 0)
 						{
-							//launch other activity to enter a url and parameters;
-							newAction.setAction(Action_Enum.triggerUrl);
-							ActivityEditTriggerUrl.resultingAction = null;
-							Intent editTriggerIntent = new Intent(context, ActivityEditTriggerUrl.class);
-							startActivityForResult(editTriggerIntent, 1000);
+							newAction.setAction(Action_Enum.changeSoundProfile);
+							getActionSoundProfileDialog(context).show();
 						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setWifi.toString()))
+						else
+							Toast.makeText(context, getResources().getString(R.string.noProfilesCreateOneFirst), Toast.LENGTH_LONG).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.startOtherActivity.toString()))
+					{
+						newAction.setAction(Action_Enum.startOtherActivity);
+						Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionStartActivity.class);
+						startActivityForResult(intent, 3000);
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.waitBeforeNextAction.toString()))
+					{
+						newAction.setAction(Action_Enum.waitBeforeNextAction);