Spanish translation

Crash resolved when trying display an unknown translation for a permission
2021-05-13 14:40:23 +02:00 · 2021-05-13 14:33:44 +02:00 · 2021-05-13 12:06:15 +02:00 · 2021-05-13 02:44:10 +02:00 · 2021-05-12 22:55:44 +02:00 · 2021-05-12 19:41:04 +02:00
79 changed files with 4649 additions and 1757 deletions
@@ -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>
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
@@ -11,8 +11,8 @@ android {
        compileSdkVersion 29
        buildToolsVersion '29.0.2'
        useLibrary  'org.apache.http.legacy'
-        versionCode 100
-        versionName "1.6.24"
+        versionCode 104
+        versionName "1.6.33"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -42,7 +42,7 @@ android {
                            dimension "version"
 //                            applicationIdSuffix ".googlePlay"
                            versionNameSuffix "-googlePlay"
-                            targetSdkVersion 30
+                            targetSdkVersion 29
                        }

                fdroidFlavor
@@ -10,8 +10,8 @@
    {
      "type": "SINGLE",
      "filters": [],
-      "versionCode": 98,
-      "versionName": "1.6.22-googlePlay",
+      "versionCode": 102,
+      "versionName": "1.6.30-googlePlay",
      "outputFile": "app-googlePlayFlavor-release.apk"
    }
  ]
@@ -62,8 +62,8 @@
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-
-    <!-- Commented out because of Google Play policy -->
+    <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
+    <uses-permission android:name="com.wireguard.android.permission.CONTROL_TUNNELS"/>

    <uses-feature
        android:name="android.hardware.telephony"
@@ -76,7 +76,7 @@
        android:allowBackup="true"
        android:allowClearUserData="true"
        android:icon="@drawable/gears"
-        android:label="@string/title_activity_main"
+        android:label="@string/app_name"
        android:theme="@style/AppTheme"
        android:networkSecurityConfig="@xml/network_security_config">

@@ -95,15 +95,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,11 +136,14 @@
        <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=".ActivityTriggerPhoneCall" />
+        <activity android:name=".ActivityManageActionBrightnessSetting" />
        <activity android:name=".ActivityHelp" />
        <activity
            android:name=".ActivityMainTabLayout"
@@ -178,13 +181,26 @@
        <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=".ActivityVolumeTest" />
+        <activity android:name=".ActivityPermissions"></activity>
+        <activity android:name=".ActivityManageTriggerNotification"></activity>
+
+        <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>

        <service
            android:name=".receivers.ActivityDetectionReceiver"
@@ -203,6 +219,13 @@

        <service android:name=".location.GeofenceIntentService"/>

+
+        <provider
+            android:name=".FileShareProvider"
+            android:authorities="com.jens.automation2"
+            android:exported="true"
+            />
+
    </application>

 </manifest>
@@ -1,13 +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.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 +20,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 +29,10 @@ 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 = "";
@@ -469,7 +490,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 +498,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 +509,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 +517,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;
@@ -648,109 +669,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 +744,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 +858,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 +874,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 +892,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)
 			{
 				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 +928,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 +965,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)
 	{
@@ -1279,6 +1385,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()
 	{
@@ -60,6 +60,8 @@
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
+    <uses-permission android:name="com.wireguard.android.permission.CONTROL_TUNNELS"/>

    <uses-feature
        android:name="android.hardware.telephony"
@@ -72,7 +74,7 @@
        android:allowBackup="true"
        android:allowClearUserData="true"
        android:icon="@drawable/gears"
-        android:label="@string/title_activity_main"
+        android:label="@string/app_name"
        android:theme="@style/AppTheme"
        android:networkSecurityConfig="@xml/network_security_config">

@@ -91,15 +93,15 @@
            android:label="@string/app_name"></activity>
        <activity
            android:name=".ActivityManagePoi"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/app_name"></activity>
        <activity
            android:name=".ActivitySettings"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/app_name"></activity>

        <service
            android:name=".AutomationService"
            android:exported="false"
-            android:label="@string/title_activity_main" />
+            android:label="@string/app_name" />

        <receiver android:name=".receivers.StartupIntentReceiver" android:enabled="true" android:exported="true">
            <intent-filter>
@@ -132,11 +134,14 @@
        <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=".ActivityTriggerPhoneCall" />
+        <activity android:name=".ActivityManageActionBrightnessSetting" />
        <activity android:name=".ActivityHelp" />
        <activity
            android:name=".ActivityMainTabLayout"
@@ -173,18 +178,41 @@
        <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=".ActivityVolumeTest" />
-
        <activity android:name=".ActivityPermissions"></activity>

+
+<!--        https://developer.android.com/about/versions/pie/android-9.0-changes-28#apache-p-->
        <uses-library android:name="org.apache.http.legacy" android:required="false"/>

+        <service android:name=".location.GeofenceIntentService"/>
+
+
+        <activity android:name=".ActivityManageTriggerNotification" />
+
+        <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>
+
+        <provider
+            android:name=".FileShareProvider"
+            android:authorities="com.jens.automation2"
+            android:exported="true"
+            />
+
    </application>

 </manifest>
@@ -1,12 +1,16 @@
 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.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 +18,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 +27,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 +48,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 +131,7 @@ public class Rule implements Comparable<Rule>
 	{
 		return this.getName();
 	}
+	@SuppressLint("NewApi")
 	public String toStringLong()
 	{
 		String returnString = "";
@@ -467,7 +487,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 +495,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 +506,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 +514,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;
@@ -617,109 +637,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 +712,108 @@ 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;
+								}
+							}
+
+							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 +825,8 @@ public class Rule implements Comparable<Rule>
 	
 	private class ActivateRuleTask extends AsyncTask<Object, String, Void>
 	{
+		boolean wasActivated = false;
+
 		@Override
 		protected Void doInBackground(Object... params)
 		{
@@ -756,8 +840,8 @@ 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,16 +859,24 @@ 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();
 			
@@ -805,8 +897,17 @@ public class Rule implements Comparable<Rule>
 					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 +932,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)
 	{
@@ -1248,6 +1352,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()
 	{
@@ -61,12 +61,14 @@
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
+    <uses-permission android:name="com.wireguard.android.permission.CONTROL_TUNNELS"/>

    <application
        android:allowBackup="true"
        android:allowClearUserData="true"
        android:icon="@drawable/gears"
-        android:label="@string/title_activity_main"
+        android:label="@string/app_name"
        android:theme="@style/AppTheme"
        android:networkSecurityConfig="@xml/network_security_config">

@@ -85,15 +87,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,11 +128,14 @@
        <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=".ActivityTriggerPhoneCall" />
+        <activity android:name=".ActivityManageActionBrightnessSetting" />
        <activity android:name=".ActivityHelp" />
        <activity
            android:name=".ActivityMainTabLayout"
@@ -168,13 +173,26 @@
        <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=".ActivityVolumeTest" />
+        <activity android:name=".ActivityPermissions"></activity>
+        <activity android:name=".ActivityManageTriggerNotification"></activity>
+
+        <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>

        <service
            android:name=".receivers.ActivityDetectionReceiver"
@@ -187,9 +205,18 @@

        <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"/>

-        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+        <provider
+            android:name=".FileShareProvider"
+            android:authorities="com.jens.automation2"
+            android:exported="true"
+            />

    </application>

@@ -1,13 +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.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 +20,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 +29,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,8 +50,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()
 	{
@@ -114,6 +133,7 @@ public class Rule implements Comparable<Rule>
 	{
 		return this.getName();
 	}
+	@SuppressLint("NewApi")
 	public String toStringLong()
 	{
 		String returnString = "";
@@ -469,7 +489,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 +497,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 +508,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 +516,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;
@@ -648,109 +668,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 +743,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 +857,8 @@ public class Rule implements Comparable<Rule>
 	
 	private class ActivateRuleTask extends AsyncTask<Object, String, Void>
 	{
+		boolean wasActivated = false;
+
 		@Override
 		protected Void doInBackground(Object... params)
 		{
@@ -787,8 +872,8 @@ 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 +891,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)
 			{
 				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 +927,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 +964,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)
 	{
@@ -1279,6 +1384,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()
 	{
@@ -2,7 +2,9 @@ package com.jens.automation2;

 import android.content.Context;
 import android.os.AsyncTask;
+import android.text.style.TabStopSpan;
 import android.util.Log;
+import android.widget.Toast;

 import org.apache.http.client.methods.HttpGet;

@@ -12,6 +14,9 @@ import java.util.Locale;

 public class Action
 {
+	public static final String actionParameter2Split = "ap2split";
+	public static final String intentPairSeperator = "intPairSplit";
+
 	public enum Action_Enum {	
 								setWifi,
 								setBluetooth,
@@ -33,6 +38,7 @@ public class Action
 								speakText,
 								playMusic,
 								setScreenBrightness,
+								playSound,
 								sendTextMessage;
 								
 								public String getFullName(Context context)
@@ -87,6 +93,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 +218,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 +238,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,14 +336,16 @@ 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.
-				 */			 
+			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.
+					 */
 //				if(this.getParameter2().equals("silent"))
 //					Actions.setSound(context, AudioManager.RINGER_MODE_SILENT);
 //				else if(this.getParameter2().equals("vibrate"))
@@ -337,67 +355,76 @@ public class Action
 //				else
 //				{
 					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 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();
 		}
 	}
 	
@@ -8,7 +8,9 @@ import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
+import android.media.MediaPlayer;
 import android.net.ConnectivityManager;
+import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.PowerManager;
@@ -32,6 +34,7 @@ import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.conn.util.InetAddressUtils;
 import org.apache.http.impl.client.DefaultHttpClient;

+import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
@@ -53,7 +56,12 @@ public class Actions
 	private static String suVersion = null;
    private static String suVersionInternal = null;
    private static List<String> suResult = null;
-	final static String smsSeparator = "&sms&";
+	public final static String smsSeparator = "&sms&";
+	public final static String dummyPackageString = "dummyPkg239asd";
+
+	public static final String wireguard_tunnel_up = "com.wireguard.android.action.SET_TUNNEL_UP";
+	public static final String wireguard_tunnel_down = "com.wireguard.android.action.SET_TUNNEL_DOWN";
+	public static final String wireguard_tunnel_refresh = "com.wireguard.android.action.REFRESH_TUNNEL_STATES";

 	public static Boolean setWifi(Context context, Boolean desiredState, boolean toggleActionIfPossible)
 	{
@@ -465,6 +473,45 @@ public class Actions
 	    return "";
 	}

+	public static void playSound(boolean alwaysPlay, String soundFileLocation)
+	{
+		if(alwaysPlay || ((AudioManager) Miscellaneous.getAnyContext().getSystemService(Context.AUDIO_SERVICE)).getRingerMode() == AudioManager.RINGER_MODE_NORMAL)
+		{
+			MediaPlayer mp = new MediaPlayer();
+			try
+			{
+				File file = new File(soundFileLocation);
+				if(file.exists())
+				{
+					Uri fileUri = Uri.parse(soundFileLocation);
+					mp.setLooping(false);
+					mp.setDataSource(Miscellaneous.getAnyContext(), fileUri);
+					mp.setOnCompletionListener(new MediaPlayer.OnCompletionListener()
+					{
+						@Override
+						public void onCompletion(MediaPlayer mp)
+						{
+							mp.release();
+						}
+					});
+					mp.prepare();
+					mp.start();
+				}
+				else
+				{
+					Miscellaneous.logEvent("w", "Play sound file", "Sound file " + soundFileLocation + " does not exist. Can't play it.", 2);
+					Toast.makeText(context, String.format(context.getResources().getString(R.string.cantFindSoundFile), soundFileLocation), Toast.LENGTH_SHORT).show();
+				}
+			}
+			catch (Exception e)
+			{
+				Miscellaneous.logEvent("e", "Play sound file", "Error playing sound: " + Log.getStackTraceString(e), 2);
+			}
+		}
+		else
+			Miscellaneous.logEvent("i", "Play sound file", "Not playing sound file because phone is on some kind of mute state.", 2);
+	}
+
 	public void useDownloadedWebpage(String result)
 	{
 //		Toast.makeText(context, "Result: " + result, Toast.LENGTH_LONG).show();
@@ -522,28 +569,62 @@ public class Actions
 	    }
 	}

-	public static void startOtherActivity(String param)
+	public static void startOtherActivity(boolean startByAction, String param)
 	{
 		Miscellaneous.logEvent("i", "StartOtherActivity", "Starting other Activity...", 4);

-		String packageName, className;
 		String params[] = param.split(";");
-		packageName = params[0];
-		className = params[1];

 		try
 		{
-	    	Miscellaneous.logEvent("i", "StartOtherApp", "Starting " + packageName + " " + className, 3);
-			Intent externalActivityIntent = new Intent(Intent.ACTION_MAIN);
-			externalActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-	    	externalActivityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-	    	externalActivityIntent.setClassName(packageName, className);
+			Intent externalActivityIntent;
+
+			int paramsStartIndex;
+
+			if(!startByAction)
+			{
+				// selected by activity
+
+				String packageName, className;
+
+				packageName = params[0];
+				className = params[1];
+
+				Miscellaneous.logEvent("i", "StartOtherApp", "Starting app by activity: " + packageName + " " + className, 3);
+
+				paramsStartIndex = 2;
+
+				externalActivityIntent = new Intent(Intent.ACTION_MAIN);
+				externalActivityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+
+//				if(packageName.equals("dummyPkg"))
+//					externalActivityIntent.setAction(className);
+//				else
+					externalActivityIntent.setClassName(packageName, className);
+
+				if(!Miscellaneous.doesActivityExist(externalActivityIntent, Miscellaneous.getAnyContext()))
+					Miscellaneous.logEvent("w", "StartOtherApp", "Activity not found: " + className, 2);
+			}
+			else
+			{
+				// selected by action
+				Miscellaneous.logEvent("i", "StartOtherApp", "Starting app by action: " + param, 3);
+
+				externalActivityIntent = new Intent();
+
+				if(!params[0].equals(dummyPackageString))
+					externalActivityIntent.setPackage(params[0]);
+
+				externalActivityIntent.setAction(params[1]);
+			}
+
+			externalActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+			// Pack intents
+			for (int i = 3; i < params.length; i++)
+			{
+				String[] singleParam = params[i].split(Action.intentPairSeperator);

-    		// has intent values to deliver
-    		for(int i=2; i<params.length; i++)
-    		{
-    			String[] singleParam = params[i].split("/");
-    			
    			/*Class c = Class.forName(singleParam[0]);
 				for(Method m : c.getMethods())
 				{
@@ -554,63 +635,79 @@ public class Actions
 					}
 				}*/

-    			if(singleParam[0].equals("boolean"))
-    			{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], Boolean.parseBoolean(singleParam[2]));
-    			}
-    			else if(singleParam[0].equals("byte"))
-    			{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], Byte.parseByte(singleParam[2]));
-    			}
-    			else if(singleParam[0].equals("char"))
-    			{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], singleParam[2].charAt(0));
-    			}
-    			else if(singleParam[0].equals("CharSequence"))
-    			{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], (CharSequence)singleParam[2]);
-    			}
-    			else if(singleParam[0].equals("double"))
-    			{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], Double.parseDouble(singleParam[2]));
-    			}
-    			else if(singleParam[0].equals("float"))
-    			{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], Float.parseFloat(singleParam[2]));
-    			}
-    			else if(singleParam[0].equals("int"))
+				if (singleParam[0].equals("boolean"))
 				{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], Integer.parseInt(singleParam[2]));
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], Boolean.parseBoolean(singleParam[2]));
 				}
-    			else if(singleParam[0].equals("long"))
+				else if (singleParam[0].equals("byte"))
 				{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], Long.parseLong(singleParam[2]));
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], Byte.parseByte(singleParam[2]));
 				}
-    			else if(singleParam[0].equals("short"))
+				else if (singleParam[0].equals("char"))
 				{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], Short.parseShort(singleParam[2]));
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], singleParam[2].charAt(0));
 				}
-    			else if(singleParam[0].equals("String"))
+				else if (singleParam[0].equals("CharSequence"))
 				{
-    				Miscellaneous.logEvent("i", "StartOtherApp" , "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-    				externalActivityIntent.putExtra(singleParam[1], singleParam[2]);
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], (CharSequence) singleParam[2]);
 				}
-    			else
-    				Miscellaneous.logEvent("w", "StartOtherApp" , "Unknown type of parameter " + singleParam[0] + " found.  Name " + singleParam[1] + " and value " + singleParam[2], 3);
-    		}
+				else if (singleParam[0].equals("double"))
+				{
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], Double.parseDouble(singleParam[2]));
+				}
+				else if (singleParam[0].equals("float"))
+				{
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], Float.parseFloat(singleParam[2]));
+				}
+				else if (singleParam[0].equals("int"))
+				{
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], Integer.parseInt(singleParam[2]));
+				}
+				else if (singleParam[0].equals("long"))
+				{
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], Long.parseLong(singleParam[2]));
+				}
+				else if (singleParam[0].equals("short"))
+				{
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], Short.parseShort(singleParam[2]));
+				}
+				else if (singleParam[0].equals("Uri"))
+				{
+					if(singleParam[1].equalsIgnoreCase("IntentData"))
+					{
+						Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with value " + singleParam[2] + " as standard data parameter.", 3);
+						externalActivityIntent.setData(Uri.parse(singleParam[2]));
+					}
+					else
+					{
+						Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+						externalActivityIntent.putExtra(singleParam[1], Uri.parse(singleParam[2]));
+					}
+				}
+				else if (singleParam[0].equals("String"))
+				{
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					externalActivityIntent.putExtra(singleParam[1], singleParam[2]);
+				}
+				else
+					Miscellaneous.logEvent("w", "StartOtherApp", "Unknown type of parameter " + singleParam[0] + " found.  Name " + singleParam[1] + " and value " + singleParam[2], 3);
+			}

-	    	autoMationServerRef.startActivity(externalActivityIntent);
+			if(params[2].equals(ActivityManageActionStartActivity.startByActivityString))
+				autoMationServerRef.startActivity(externalActivityIntent);
+			else
+				autoMationServerRef.sendBroadcast(externalActivityIntent);
 		}
-		catch(ActivityNotFoundException | SecurityException e)
+		catch(Exception e)
 		{
 			Miscellaneous.logEvent("e", "StartOtherApp", autoMationServerRef.getResources().getString(R.string.errorStartingOtherActivity) + ": " + Log.getStackTraceString(e), 2);
 			Toast.makeText(autoMationServerRef, autoMationServerRef.getResources().getString(R.string.errorStartingOtherActivity) + ": " + e.getMessage(), Toast.LENGTH_LONG).show();
@@ -1009,7 +1106,7 @@ public class Actions
            	if(enable)
            		desiredState = 1;

-				if(MobileDataStuff.setMobileNetworkfromLollipop(desiredState, autoMationServerRef))
+				if(MobileDataStuff.setMobileNetworkFromLollipop(desiredState, autoMationServerRef))
 				{
 					Miscellaneous.logEvent("i", "setDataConnectionWithRoot()", Miscellaneous.getAnyContext().getResources().getString(R.string.dataConWithRootSuccess), 2);
 					return true;
@@ -1034,7 +1131,7 @@ public class Actions
 	    }

 		@SuppressLint("NewApi")
-		public static boolean setMobileNetworkfromLollipop(int desiredState, Context context) throws Exception
+		public static boolean setMobileNetworkFromLollipop(int desiredState, Context context) throws Exception
 		{
 		    String command = null;
 		    int state = 0;
@@ -10,6 +10,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 +30,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 +42,8 @@ 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 ListView lvRuleHistory;
 	private ArrayAdapter<Rule> ruleHistoryListViewAdapter;
@@ -74,7 +77,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 +132,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 +169,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 +232,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 +323,9 @@ public class ActivityMainScreen extends ActivityGeneric
 						if(
 								Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest)
 										&&
-								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationCoarse, AutomationService.getInstance())
+								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationCoarse, Miscellaneous.getAnyContext())
 										&&
-								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationFine, AutomationService.getInstance())
+								ActivityPermissions.havePermission(ActivityPermissions.permissionNameLocationFine, Miscellaneous.getAnyContext())
 						  )
 							activityMainScreenInstance.tvActivePoi.setText(activityMainScreenInstance.getResources().getString(R.string.stillGettingPosition));
 						else
@@ -455,10 +408,6 @@ public class ActivityMainScreen extends ActivityGeneric

 			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 +463,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))
@@ -0,0 +1,353 @@
+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 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;
+    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);
+    }
+
+    @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())
+        {
+            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);
+
+                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();
+                    }
+
+                }
+            });
+        }
+    }
+}
@@ -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;
@@ -0,0 +1,110 @@
+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.TextView;
+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_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);
+            }
+        }
+    }
+}
@@ -19,7 +19,7 @@ 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;
@@ -67,7 +67,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,10 +76,10 @@ 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]);
 		}
@@ -99,7 +99,7 @@ public class ActivityEditSendTextMessage extends Activity
 		
 		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);
@@ -162,7 +162,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())
                {
@@ -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;
@@ -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);
 		
@@ -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;
 		}

@@ -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;
@@ -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()
@@ -95,6 +95,10 @@ 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;
 	
 	public static ActivityManageRule getInstance()
 	{
@@ -233,8 +237,8 @@ public class ActivityManageRule extends Activity
 //					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:
@@ -242,10 +246,16 @@ public class ActivityManageRule extends Activity
 //					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;
 					default:
 						break;				
 				}
@@ -288,15 +298,15 @@ public class ActivityManageRule extends Activity
 //					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);
+						Intent activityEditTriggerUrlIntent = new Intent(ActivityManageRule.this, ActivityManageActionTriggerUrl.class);
 //						activityEditTriggerUrlIntent.putExtra("urlToTrigger", a.getParameter2());
-						ActivityEditTriggerUrl.resultingAction = a;
+						ActivityManageActionTriggerUrl.resultingAction = a;
 						activityEditTriggerUrlIntent.putExtra("edit", true);
 						startActivityForResult(activityEditTriggerUrlIntent, requestCodeActionTriggerUrlEdit);
 						break;
@@ -321,24 +331,31 @@ public class ActivityManageRule extends Activity
 //					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);
+						Intent activityEditScreenBrightnessIntent = new Intent(ActivityManageRule.this, ActivityManageActionBrightnessSetting.class);
 //						ActivityEditTriggerUrl.resultingAction = a;
 						activityEditScreenBrightnessIntent.putExtra("autoBrightness", a.getParameter1());
 						activityEditScreenBrightnessIntent.putExtra("brightnessValue", Integer.parseInt(a.getParameter2()));
 						startActivityForResult(activityEditScreenBrightnessIntent, requestCodeActionScreenBrightnessEdit);
 						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 +483,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 +540,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;
 						}
@@ -536,6 +555,13 @@ public class ActivityManageRule extends Activity
 							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)
@@ -572,7 +598,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 +609,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;
 						}
@@ -979,7 +1005,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 +1052,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 +1072,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 +1100,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 +1115,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,7 +1126,7 @@ 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();
 			}
@@ -1112,7 +1138,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();
 			}
@@ -1122,7 +1148,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 +1156,49 @@ 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)
+			{
+				//newTrigger.setNfcTagId(ActivityManageNfc.generatedId);
+				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
+				Miscellaneous.logEvent("w", "ActivityManageNfc", "No nfc id returned. Assuming abort.", 5);
+		}
+		else if(requestCode == requestCodeTriggerNfcNotificationEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newTrigger = ActivityManageTriggerNotification.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 +1207,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 +1225,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 +1255,29 @@ public class ActivityManageRule extends Activity
 				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 +1330,8 @@ 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.sendTextMessage.toString()))
 			{
 //			    if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageSpecificRule.this, "android.permission.SEND_SMS") && !Miscellaneous.isGooglePlayInstalled(ActivityManageSpecificRule.this))
@@ -1262,159 +1341,158 @@ 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)
+							Toast.makeText(context, context.getResources().getString(R.string.usbTetheringFailForAboveGingerbread), Toast.LENGTH_LONG).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);
+						getActionWaitBeforeNextActionDialog(ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.wakeupDevice.toString()))
+					{
+						newAction.setAction(Action_Enum.wakeupDevice);
+						getActionWakeupDeviceDialog(ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setAirplaneMode.toString()))
+					{
+						if(Build.VERSION.SDK_INT >= 17)
 						{
-							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();
+							Toast.makeText(context, getResources().getString(R.string.airplaneModeSdk17Warning), Toast.LENGTH_LONG).show();
+							Miscellaneous.messageBox(getResources().getString(R.string.airplaneMode), getResources().getString(R.string.rootExplanation), 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)
-								Toast.makeText(context, context.getResources().getString(R.string.usbTetheringFailForAboveGingerbread), Toast.LENGTH_LONG).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)
-							{
-								newAction.setAction(Action_Enum.changeSoundProfile);
-								getActionSoundProfileDialog(context).show();
-							}
-							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, ActivityManageStartActivity.class);
-							startActivityForResult(intent, 3000);
-						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.waitBeforeNextAction.toString()))
-						{
-							newAction.setAction(Action_Enum.waitBeforeNextAction);
-							getActionWaitBeforeNextActionDialog(ActivityManageRule.this).show();
-						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.wakeupDevice.toString()))
-						{
-							newAction.setAction(Action_Enum.wakeupDevice);
-							getActionWakeupDeviceDialog(ActivityManageRule.this).show();
-						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setAirplaneMode.toString()))
-						{
-							if(Build.VERSION.SDK_INT >= 17)
-							{
-								Toast.makeText(context, getResources().getString(R.string.airplaneModeSdk17Warning), Toast.LENGTH_LONG).show();
-								Miscellaneous.messageBox(getResources().getString(R.string.airplaneMode), getResources().getString(R.string.rootExplanation), ActivityManageRule.this).show();
-							}
-							newAction.setAction(Action_Enum.setAirplaneMode);
-							getActionParameter1Dialog(ActivityManageRule.this).show();
-						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setDataConnection.toString()))
-						{
-							newAction.setAction(Action_Enum.setDataConnection);
-							getActionParameter1Dialog(ActivityManageRule.this).show();
-							Miscellaneous.messageBox(getResources().getString(R.string.actionDataConnection), getResources().getString(R.string.rootExplanation), ActivityManageRule.this).show();
-						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.speakText.toString()))
-						{
-							//launch other activity to enter a url and parameters;
-							newAction.setAction(Action_Enum.speakText);
-							ActivityEditSpeakText.resultingAction = null;
-							Intent editTriggerIntent = new Intent(context, ActivityEditSpeakText.class);
-							startActivityForResult(editTriggerIntent, 5000);
-						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.sendTextMessage.toString()))
-						{
+						newAction.setAction(Action_Enum.setAirplaneMode);
+						getActionParameter1Dialog(ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setDataConnection.toString()))
+					{
+						newAction.setAction(Action_Enum.setDataConnection);
+						getActionParameter1Dialog(ActivityManageRule.this).show();
+						Miscellaneous.messageBox(getResources().getString(R.string.actionDataConnection), getResources().getString(R.string.rootExplanation), ActivityManageRule.this).show();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.speakText.toString()))
+					{
+						//launch other activity to enter a url and parameters;
+						newAction.setAction(Action_Enum.speakText);
+						ActivityManageActionSpeakText.resultingAction = null;
+						Intent editTriggerIntent = new Intent(context, ActivityManageActionSpeakText.class);
+						startActivityForResult(editTriggerIntent, 5000);
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.sendTextMessage.toString()))
+					{
 //                            if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageSpecificRule.this, "android.permission.SEND_SMS") && !Miscellaneous.isGooglePlayInstalled(ActivityManageSpecificRule.this))
-							if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageRule.this, "android.permission.SEND_SMS"))
-                            {
-                                //launch other activity to enter parameters;
-                                newAction.setAction(Action_Enum.sendTextMessage);
-                                ActivityEditSendTextMessage.resultingAction = null;
-                                Intent editTriggerIntent = new Intent(context, ActivityEditSendTextMessage.class);
-                                startActivityForResult(editTriggerIntent, 5001);
-                            }
-						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.playMusic.toString()))
+						if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageRule.this, "android.permission.SEND_SMS"))
 						{
-							newAction.setAction(Action_Enum.playMusic);
-							ruleToEdit.getActionSet().add(newAction);
-							refreshActionList();
+							//launch other activity to enter parameters;
+							newAction.setAction(Action_Enum.sendTextMessage);
+							ActivityManageActionSendTextMessage.resultingAction = null;
+							Intent editTriggerIntent = new Intent(context, ActivityManageActionSendTextMessage.class);
+							startActivityForResult(editTriggerIntent, 5001);
 						}
-						else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setScreenBrightness.toString()))
-						{
-							newAction.setAction(Action_Enum.setScreenBrightness);
-							Intent actionScreenBrightnessIntent = new Intent(context, ActivityManageBrightnessSetting.class);
-							startActivityForResult(actionScreenBrightnessIntent, requestCodeActionScreenBrightnessAdd);
-						}
-			        }
-			    });
-			
-			return builder.create();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.playMusic.toString()))
+					{
+						newAction.setAction(Action_Enum.playMusic);
+						ruleToEdit.getActionSet().add(newAction);
+						refreshActionList();
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setScreenBrightness.toString()))
+					{
+						newAction.setAction(Action_Enum.setScreenBrightness);
+						Intent actionScreenBrightnessIntent = new Intent(context, ActivityManageActionBrightnessSetting.class);
+						startActivityForResult(actionScreenBrightnessIntent, requestCodeActionScreenBrightnessAdd);
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.playSound.toString()))
+					{
+						newAction.setAction(Action_Enum.playSound);
+						Intent actionPlaySoundIntent = new Intent(context, ActivityManageActionPlaySound.class);
+						startActivityForResult(actionPlaySoundIntent, requestCodeActionPlaySoundAdd);
+					}
+				}
+			});
+
+		return builder.create();
 	}
 	private AlertDialog getActionSoundProfileDialog(final Context myContext)
 	{
@@ -16,7 +16,7 @@ import android.widget.Toast;

 import com.jens.automation2.receivers.BluetoothReceiver;

-public class ActivityManageBluetoothTrigger extends Activity
+public class ActivityManageTriggerBluetooth extends Activity
 {
 	protected static Trigger editedBluetoothTrigger;
 	RadioButton radioAnyBluetoothDevice, radioNoDevice, radioDeviceFromList, radioBluetoothConnected, radioBluetoothDisconnected, radioBluetoothInRange, radioBluetoothOutRange;
@@ -109,7 +109,7 @@ public class ActivityManageBluetoothTrigger extends Activity
 			}
 			else
 			{
-				Toast.makeText(ActivityManageBluetoothTrigger.this, getResources().getString(R.string.selectDeviceOption), Toast.LENGTH_LONG).show();
+				Toast.makeText(ActivityManageTriggerBluetooth.this, getResources().getString(R.string.selectDeviceOption), Toast.LENGTH_LONG).show();
 				return false;
 			}
 			
@@ -138,7 +138,7 @@ public class ActivityManageBluetoothTrigger extends Activity
 			}
 			else
 			{
-				Toast.makeText(ActivityManageBluetoothTrigger.this, getResources().getString(R.string.selectConnectionOption), Toast.LENGTH_LONG).show();
+				Toast.makeText(ActivityManageTriggerBluetooth.this, getResources().getString(R.string.selectConnectionOption), Toast.LENGTH_LONG).show();
 				return false;
 			}
 			
@@ -21,7 +21,7 @@ import android.widget.Toast;
 import com.jens.automation2.receivers.NfcReceiver;

@SuppressLint("NewApi")
-public class ActivityManageNfc extends Activity
+public class ActivityManageTriggerNfc extends Activity
 {
 	public static String generatedId = null;
 	private static Tag discoveredTag = null;
@@ -39,7 +39,7 @@ public class ActivityManageNfc extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.manage_nfc);
+		setContentView(R.layout.activity_manage_trigger_nfc);
 		
 		etNewNfcIdValue = (EditText)findViewById(R.id.etNewNfcIdValue);
 		bReadNfcTag = (Button)findViewById(R.id.bReadNfcTag);
@@ -59,7 +59,7 @@ public class ActivityManageNfc extends Activity
 				}
 				else
 				{
-					progressDialog = ProgressDialog.show(ActivityManageNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
+					progressDialog = ProgressDialog.show(ActivityManageTriggerNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
 					{							
 						@Override
 						public void onCancel(DialogInterface dialog)
@@ -88,7 +88,7 @@ public class ActivityManageNfc extends Activity
 				}
 				else
 				{
-					progressDialog = ProgressDialog.show(ActivityManageNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
+					progressDialog = ProgressDialog.show(ActivityManageTriggerNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
 					{							
 						@Override
 						public void onCancel(DialogInterface dialog)
@@ -118,7 +118,7 @@ public class ActivityManageNfc extends Activity
 					}
 					else
 					{
-						progressDialog = ProgressDialog.show(ActivityManageNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
+						progressDialog = ProgressDialog.show(ActivityManageTriggerNfc.this, null, getResources().getString(R.string.nfcBringTagIntoRange), false, true, new OnCancelListener()
 						{							
 							@Override
 							public void onCancel(DialogInterface dialog)
@@ -255,7 +255,7 @@ public class ActivityManageNfc extends Activity
 		if(generatedId.length() == 0)
 		{
 			generatedId = null;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcEnterValidIdentifier), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcEnterValidIdentifier), Toast.LENGTH_LONG).show();
 			return false;
 		}
 		else
@@ -267,14 +267,14 @@ public class ActivityManageNfc extends Activity
 		if(NfcReceiver.writeTag(generatedId, discoveredTag))
 		{
 			currentStatus = 0;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcTagWrittenSuccessfully), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcTagWrittenSuccessfully), Toast.LENGTH_LONG).show();
 			setResult(RESULT_OK);
 			finish();
 		}
 		else
 		{
 			currentStatus = 0;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcTagWriteError), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcTagWriteError), Toast.LENGTH_LONG).show();
 			Miscellaneous.logEvent("e", "NFC", getResources().getString(R.string.nfcTagWriteError), 2);
 		}		
 	}
@@ -285,14 +285,14 @@ public class ActivityManageNfc extends Activity
 		if(checkEnteredText(false))
 		{
 			currentStatus = 0;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcTagReadSuccessfully), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcTagReadSuccessfully), Toast.LENGTH_LONG).show();
 			setResult(RESULT_OK);
 			finish();
 		}
 		else
 		{
 			currentStatus = 0;
-			Toast.makeText(ActivityManageNfc.this, getResources().getString(R.string.nfcValueNotSuitable), Toast.LENGTH_LONG).show();
+			Toast.makeText(ActivityManageTriggerNfc.this, getResources().getString(R.string.nfcValueNotSuitable), Toast.LENGTH_LONG).show();
 			generatedId = null;
 		}
 	}
@@ -0,0 +1,399 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import static com.jens.automation2.Trigger.triggerParameter2Split;
+
+public class ActivityManageTriggerNotification extends Activity
+{
+	public static Trigger editedNotificationTrigger;
+	EditText etNotificationTitle, etNotificationText;
+	Button bSelectApp, bSaveTriggerNotification;
+	Spinner spinnerTitleDirection, spinnerTextDirection;
+	TextView tvSelectedApplication;
+	CheckBox chkNotificationDirection;
+	boolean edit = false;
+	ProgressDialog progressDialog = null;
+	
+	private static List<PackageInfo> pInfos = null;
+	public static Trigger resultingTrigger;
+
+	private static String[] directions;
+
+	ArrayAdapter<String> directionSpinnerAdapter;
+	
+	public static void getActivityList(final Context context)
+	{
+		if(pInfos == null)
+		{
+			pInfos = context.getPackageManager().getInstalledPackages(PackageManager.GET_ACTIVITIES);
+			Collections.sort(pInfos, new Comparator<PackageInfo>()
+			{
+			    public int compare(PackageInfo obj1, PackageInfo obj2)
+			    {
+			    	String name1 = "";
+					String name2 = "";
+
+					ApplicationInfo aInfo1 = obj1.applicationInfo;
+					if (aInfo1 != null)
+					{
+						name1 = (String) context.getPackageManager().getApplicationLabel(aInfo1);
+					}
+					ApplicationInfo aInfo2 = obj2.applicationInfo;
+					if (aInfo2 != null)
+					{
+						name2 = (String) context.getPackageManager().getApplicationLabel(aInfo2);
+					}
+
+					return name1.compareTo(name2);
+			    }
+			});
+		}
+	}
+ 
+	public static String[] getApplicationNameListString(Context myContext)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			ApplicationInfo aInfo = pInfo.applicationInfo;
+			if (aInfo != null)
+			{
+				String aLabel;
+	
+				aLabel = (String) myContext.getPackageManager().getApplicationLabel(aInfo);
+
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null && aInfos.length > 0)		// Only put Applications into the list that have packages.
+				{
+					if(!returnList.contains(aLabel))
+						returnList.add(aLabel);
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+
+	public static String[] getPackageListString(Context myContext, String applicationLabel)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(myContext.getPackageManager().getApplicationLabel(pInfo.applicationInfo).equals(applicationLabel))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null && aInfos.length > 0)
+				{
+					returnList.add(pInfo.packageName);
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+
+	public static String[] getPackageListString(Context myContext)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			ActivityInfo[] aInfos = pInfo.activities;
+			if (aInfos != null && aInfos.length > 0)
+			{
+				returnList.add(pInfo.packageName);
+			}
+			else
+				Miscellaneous.logEvent("w", "Empty Application", "Application " + myContext.getPackageManager().getApplicationLabel(pInfo.applicationInfo) + " doesn\'t have packages.", 5);
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+	
+	public static String[] getActivityListForPackageName(String packageName)
+	{
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(pInfo.packageName.equals(packageName))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null)
+				{
+					for (ActivityInfo activityInfo : aInfos)
+					{
+						returnList.add(activityInfo.name);
+					}
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+	
+	public static ActivityInfo getActivityInfoForPackageNameAndActivityName(String packageName, String activityName)
+	{
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(pInfo.packageName.equals(packageName))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null)
+				{
+					for (ActivityInfo activityInfo : aInfos)
+					{
+						if(activityInfo.name.equals(activityName))
+							return activityInfo;
+					}
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	private AlertDialog getActionStartActivityDialog1()
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		alertDialogBuilder.setTitle(getResources().getString(R.string.selectApplication));
+		final String[] applicationArray = ActivityManageTriggerNotification.getApplicationNameListString(this);
+		alertDialogBuilder.setItems(applicationArray, new DialogInterface.OnClickListener()
+		{			
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				dialog.dismiss();
+				getActionStartActivityDialog2(applicationArray[which]).show();
+			}
+		});
+		AlertDialog alertDialog = alertDialogBuilder.create();
+		
+		return alertDialog;
+	}
+	private AlertDialog getActionStartActivityDialog2(String applicationName)
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		alertDialogBuilder.setTitle(getResources().getString(R.string.selectPackageOfApplication));
+		final String[] packageArray = ActivityManageTriggerNotification.getPackageListString(this, applicationName);
+		alertDialogBuilder.setItems(packageArray, new DialogInterface.OnClickListener()
+		{			
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				//getActionStartActivityDialog3(packageArray[which]).show();
+				//Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageNotificationTrigger.this).show();
+				tvSelectedApplication.setText(packageArray[which]);
+			}
+		});
+		AlertDialog alertDialog = alertDialogBuilder.create();
+		
+		return alertDialog;
+	}
+	private AlertDialog getActionStartActivityDialog3(final String packageName)
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		alertDialogBuilder.setTitle(getResources().getString(R.string.selectActivityToBeStarted));
+		final String activityArray[] = ActivityManageTriggerNotification.getActivityListForPackageName(packageName);
+		alertDialogBuilder.setItems(activityArray, new DialogInterface.OnClickListener()
+		{			
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				ActivityInfo ai = ActivityManageTriggerNotification.getActivityInfoForPackageNameAndActivityName(packageName, activityArray[which]);
+				tvSelectedApplication.setText(ai.packageName + ";" + ai.name);
+			}
+		});
+		AlertDialog alertDialog = alertDialogBuilder.create();
+		
+		return alertDialog;
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.manage_trigger_notification);
+
+		etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle);
+		etNotificationText = (EditText)findViewById(R.id.etNotificationText);
+		bSelectApp = (Button)findViewById(R.id.bSelectApp);
+		bSaveTriggerNotification = (Button)findViewById(R.id.bSaveTriggerNotification);
+		spinnerTitleDirection = (Spinner)findViewById(R.id.spinnerTitleDirection);
+		spinnerTextDirection = (Spinner)findViewById(R.id.spinnerTextDirection);
+		tvSelectedApplication = (TextView)findViewById(R.id.etActivityOrActionPath);
+		chkNotificationDirection = (CheckBox)findViewById(R.id.chkNotificationDirection);
+
+		directions = new String[] {
+									getResources().getString(R.string.directionStringEquals),
+									getResources().getString(R.string.directionStringContains),
+									getResources().getString(R.string.directionStringStartsWith),
+									getResources().getString(R.string.directionStringEndsWith),
+									getResources().getString(R.string.directionStringNotEquals)
+								};
+
+		directionSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageTriggerNotification.directions);
+		spinnerTitleDirection.setAdapter(directionSpinnerAdapter);
+		spinnerTextDirection.setAdapter(directionSpinnerAdapter);
+		directionSpinnerAdapter.notifyDataSetChanged();
+		
+		bSelectApp.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				GetActivityListTask getActivityListTask = new GetActivityListTask();
+				getActivityListTask.execute();
+				progressDialog = ProgressDialog.show(ActivityManageTriggerNotification.this, "", ActivityManageTriggerNotification.this.getResources().getString(R.string.gettingListOfInstalledApplications));
+			}
+		});
+
+		chkNotificationDirection.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+		{
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+			{
+				if(isChecked)
+					chkNotificationDirection.setText(getResources().getString(R.string.notificationAppears));
+				else
+					chkNotificationDirection.setText(getResources().getString(R.string.notificationDisappears));
+			}
+		});
+		
+		bSaveTriggerNotification.setOnClickListener(new OnClickListener()
+		{		
+			@Override
+			public void onClick(View v)
+			{
+				String app;
+				if(tvSelectedApplication.getText().toString().equalsIgnoreCase(getResources().getString(R.string.anyApp)))
+					app = "-1";
+				else
+					app = tvSelectedApplication.getText().toString();
+
+				String titleDir = Trigger.getMatchCode(spinnerTitleDirection.getSelectedItem().toString());
+				String title = etNotificationTitle.getText().toString();
+				String textDir = Trigger.getMatchCode(spinnerTextDirection.getSelectedItem().toString());
+				String text = etNotificationText.getText().toString();
+
+				if(edit)
+				{
+					editedNotificationTrigger.setTriggerParameter(chkNotificationDirection.isChecked());
+					editedNotificationTrigger.setTriggerParameter2(app + triggerParameter2Split + titleDir + triggerParameter2Split + title + triggerParameter2Split + textDir + triggerParameter2Split + text);
+					ActivityManageTriggerNotification.this.setResult(RESULT_OK);
+				}
+				else
+				{
+					Intent data = new Intent();
+					data.putExtra("direction", chkNotificationDirection.isChecked());
+					data.putExtra("app", app);
+					data.putExtra("titleDir", titleDir);
+					data.putExtra("title", title);
+					data.putExtra("textDir", textDir);
+					data.putExtra("text", text);
+					ActivityManageTriggerNotification.this.setResult(RESULT_OK, data);
+				}
+
+				finish();
+			}
+		});
+
+		Intent i = getIntent();
+		if(i.getBooleanExtra("edit", false) == true)
+		{
+			edit = true;
+			loadValuesIntoGui();
+		}
+	}
+	
+	private void loadValuesIntoGui()
+	{
+		chkNotificationDirection.setChecked(editedNotificationTrigger.getTriggerParameter());
+
+		String[] params = editedNotificationTrigger.getTriggerParameter2().split(triggerParameter2Split);
+
+		String app = params[0];
+		String titleDir = params[1];
+		String title = params[2];
+		String textDir = params[3];
+		String text;
+		if (params.length >= 5)
+			text = params[4];
+		else
+			text = "";
+
+		if(!app.equals("-1"))
+			tvSelectedApplication.setText(app);
+
+		for(int i = 0; i < directions.length; i++)
+		{
+			if(Trigger.getMatchCode(directions[i]).equalsIgnoreCase(titleDir))
+				spinnerTitleDirection.setSelection(i);
+
+			if(Trigger.getMatchCode(directions[i]).equalsIgnoreCase(textDir))
+				spinnerTextDirection.setSelection(i);
+		}
+
+		if(title.length() > 0)
+			etNotificationTitle.setText(title);
+
+		if(text.length() > 0)
+			etNotificationText.setText(text);
+	}
+	
+	private class GetActivityListTask extends AsyncTask<Void, Void, Void>
+	{
+		@Override
+		protected Void doInBackground(Void... params)
+		{
+			getActivityList(ActivityManageTriggerNotification.this);
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(Void result)
+		{
+			progressDialog.dismiss();
+			getActionStartActivityDialog1().show();
+		}
+		
+		
+	}
+}
@@ -14,7 +14,7 @@ import java.sql.Time;
 import java.util.ArrayList;
 import java.util.Calendar;

-public class ActivityManageTimeFrame extends Activity
+public class ActivityManageTriggerTimeFrame extends Activity
 {
 	Button bSaveTimeFrame;
 	TimePicker startPicker, stopPicker;
@@ -27,7 +27,7 @@ public class ActivityManageTimeFrame extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.trigger_timeframe_editor);
+		setContentView(R.layout.manage_trigger_timeframe);
 		
 		startPicker = (TimePicker)findViewById(R.id.tpTimeFrameStart);
 		stopPicker = (TimePicker)findViewById(R.id.tpTimeFrameStop);
@@ -2,10 +2,12 @@ package com.jens.automation2;

 import android.app.Activity;
 import android.app.NotificationManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -15,6 +17,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;

+import com.jens.automation2.receivers.NotificationListener;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -34,12 +38,13 @@ public class ActivityPermissions extends Activity
    private static final int requestCodeForPermissionsWriteSettings = 12043;
    private static final int requestCodeForPermissionsNotificationPolicy = 12044;
    private static final int requestCodeForPermissionsBackgroundLocation = 12045;
+    private static final int requestCodeForPermissionsNotifications = 12046;
    protected String[] specificPermissionsToRequest = null;

    public static String intentExtraName = "permissionsToBeRequested";

    Button bCancelPermissions, bRequestPermissions;
-    TextView tvPermissionsExplanation, tvPermissionosExplanationSystemSettings, tvPermissionsExplanationLong;
+    TextView tvPermissionsExplanation, tvPermissionsExplanationSystemSettings, tvPermissionsExplanationLong;
    static ActivityPermissions instance = null;

    public static final String writeSystemSettingsPermissionName = "android.permission.WRITE_SETTINGS";
@@ -50,6 +55,8 @@ public class ActivityPermissions extends Activity
    public static final String permissionNameLocationBackground = "android.permission.ACCESS_BACKGROUND_LOCATION";
    public static final String permissionNameCall = "android.permission.PROCESS_OUTGOING_CALLS";
    public static final String permissionNameStartService = "android.permission.FOREGROUND_SERVICE";
+    public static final String permissionNameReadNotifications = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
+    public static final String permissionNameWireguard = "com.wireguard.android.permission.CONTROL_TUNNELS";
    
    public static ActivityPermissions getInstance()
    {
@@ -72,7 +79,7 @@ public class ActivityPermissions extends Activity
            bCancelPermissions = (Button)findViewById(R.id.bCancelPermissions);
            bRequestPermissions = (Button)findViewById(R.id.bRequestPermissions);
            tvPermissionsExplanation = (TextView)findViewById(R.id.tvPermissionsExplanation);
-            tvPermissionosExplanationSystemSettings = (TextView)findViewById(R.id.tvPermissionsExplanationSystemSettings);
+            tvPermissionsExplanationSystemSettings = (TextView)findViewById(R.id.tvPermissionsExplanationSystemSettings);
            tvPermissionsExplanationLong = (TextView)findViewById(R.id.tvPermissionsExplanationLong);

            bCancelPermissions.setOnClickListener(new View.OnClickListener()
@@ -168,8 +175,6 @@ public class ActivityPermissions extends Activity
                    explanation.append(

                            "<br />" +
-
-
                                    "<u>" +
                                        getResources().getString(R.string.readLocation)
                                    + "</u>"
@@ -185,16 +190,19 @@ public class ActivityPermissions extends Activity
            }
            else
            {
-                explanation.append(
+                explanation.append("<br /><u>");

-                        "<br />" +
+                try
+                {
+                    explanation.append(getResources().getString(getResources().getIdentifier(s, "string", getPackageName())));
+                }
+                catch(Resources.NotFoundException e)
+                {
+                    Miscellaneous.logEvent("w", "ActivityPermissions", "Could not find translation for " + s, 4);
+                    explanation.append(s);
+                }

-
-                                "<u>" +
-                                getResources().getString(getResources().getIdentifier(s, "string", getPackageName()))
-                                + "</u>"
-
-                                + "<br />");
+                explanation.append("</u><br />");

                for (String reason : getReasonForPermission(s))
                    explanation.append(reason + "<br />");
@@ -208,15 +216,16 @@ public class ActivityPermissions extends Activity
            if (s.equalsIgnoreCase(writeSystemSettingsPermissionName))
            {
                if (requiredPerms.length == 1)
-                    tvPermissionosExplanationSystemSettings.setText(getResources().getString(R.string.systemSettingsNote1));
+                    tvPermissionsExplanationSystemSettings.setText(getResources().getString(R.string.systemSettingsNote1));
                else if (requiredPerms.length > 1)
-                    tvPermissionosExplanationSystemSettings.setText(getResources().getString(R.string.systemSettingsNote1) + getResources().getString(R.string.systemSettingsNote2));
+                    tvPermissionsExplanationSystemSettings.setText(getResources().getString(R.string.systemSettingsNote1) + getResources().getString(R.string.systemSettingsNote2));

                break;
            }
        }

        ActivityMainScreen.updateMainScreen();
+        ActivityMainRules.getInstance().updateListView();
    }

    protected static void addToArrayListUnique(String value, ArrayList<String> list)
@@ -231,7 +240,25 @@ public class ActivityPermissions extends Activity
        {
            for (String s : getRequiredPermissions(false))
            {
-                if(!s.equalsIgnoreCase(permissionNameLocationBackground) && !s.equalsIgnoreCase(permissionNameLocationFine) && !s.equalsIgnoreCase(permissionNameLocationCoarse) && Miscellaneous.googleToBlameForLocation(true))
+                if(
+                        s.equalsIgnoreCase(permissionNameLocationBackground)
+                            ||
+                        s.equalsIgnoreCase(permissionNameLocationFine)
+                            ||
+                        s.equalsIgnoreCase(permissionNameLocationCoarse)
+                )
+                {
+                    if (!Miscellaneous.googleToBlameForLocation(true))
+                        if (!havePermission(s, context))
+                            return true;
+                }
+                else if(s.equalsIgnoreCase("android.permission.ACTIVITY_RECOGNITION") || s.equalsIgnoreCase("com.google.android.gms.permission.ACTIVITY_RECOGNITION"))
+                {
+                    if(!BuildConfig.FLAVOR.equalsIgnoreCase("fdroidFlavor"))
+                        if (!havePermission(s, context))
+                            return true;
+                }
+                else
                    if (!havePermission(s, context))
                        return true;
            }
@@ -256,6 +283,10 @@ public class ActivityPermissions extends Activity
                else
                    return true;
            }
+            else if (s.equals(permissionNameReadNotifications))
+            {
+                return verifyNotificationPermission();
+            }
            else
            {
                int res = context.checkCallingOrSelfPermission(s);
@@ -285,12 +316,15 @@ public class ActivityPermissions extends Activity
 //            if (!havePermission(ActivityPermissions.writeExternalStoragePermissionName, workingContext))
 //                addToArrayListUnique(ActivityPermissions.writeExternalStoragePermissionName, requiredPermissions);

-            for(Profile profile : Profile.getProfileCollection())
+            if(!havePermission(writeSystemSettingsPermissionName, workingContext))
            {
-               if(profile.changeIncomingCallsRingtone)
-               {
-                   addToArrayListUnique("android.permission.WRITE_SETTINGS", requiredPermissions);
-               }
+                for (Profile profile : Profile.getProfileCollection())
+                {
+                    if (profile.changeIncomingCallsRingtone)
+                    {
+                        addToArrayListUnique(writeSystemSettingsPermissionName, requiredPermissions);
+                    }
+                }
            }

            if (!onlyGeneral)
@@ -300,7 +334,24 @@ public class ActivityPermissions extends Activity
                    for (String singlePermission : getPermissionsForRule(rule))
                        if (!havePermission(singlePermission, workingContext))
                        {
-                            if(!singlePermission.equalsIgnoreCase(permissionNameLocationBackground) && !singlePermission.equalsIgnoreCase(permissionNameLocationFine) && !singlePermission.equalsIgnoreCase(permissionNameLocationCoarse) && Miscellaneous.googleToBlameForLocation(true))
+                            if(
+
+                                        singlePermission.equalsIgnoreCase(permissionNameLocationBackground)
+                                                ||
+                                        singlePermission.equalsIgnoreCase(permissionNameLocationFine)
+                                                ||
+                                        singlePermission.equalsIgnoreCase(permissionNameLocationCoarse)
+                            )
+                            {
+                                if (!Miscellaneous.googleToBlameForLocation(true))
+                                    addToArrayListUnique(singlePermission, requiredPermissions);
+                            }
+                            else if(singlePermission.equalsIgnoreCase("android.permission.ACTIVITY_RECOGNITION") || singlePermission.equalsIgnoreCase("com.google.android.gms.permission.ACTIVITY_RECOGNITION"))
+                            {
+                                if(!BuildConfig.FLAVOR.equalsIgnoreCase("fdroidFlavor"))
+                                    addToArrayListUnique(singlePermission, requiredPermissions);
+                            }
+                            else
                                addToArrayListUnique(singlePermission, requiredPermissions);
                        }
                }
@@ -360,7 +411,7 @@ public class ActivityPermissions extends Activity
                        addToArrayListUnique("android.permission.ACCESS_NETWORK_STATE", requiredPermissions);
                        break;
                    case batteryLevel:
-                        addToArrayListUnique("android.permission.READ_PHONE_STATE", requiredPermissions);
+//                        addToArrayListUnique("android.permission.READ_PHONE_STATE", requiredPermissions);
 //                        addToArrayListUnique("android.permission.BATTERY_STATS", requiredPermissions);
                        break;
                    case bluetoothConnection:
@@ -425,6 +476,9 @@ public class ActivityPermissions extends Activity
                        addToArrayListUnique("android.permission.ACCESS_NETWORK_STATE", requiredPermissions);
                        addToArrayListUnique("android.permission.ACCESS_WIFI_STATE", requiredPermissions);
                        break;
+                    case notification:
+                        addToArrayListUnique(permissionNameReadNotifications, requiredPermissions);
+                        break;
                    default:
                        break;
                }
@@ -488,6 +542,20 @@ public class ActivityPermissions extends Activity
                    case speakText:
                        break;
                    case startOtherActivity:
+                        if(
+                                action.getParameter2().contains(Actions.wireguard_tunnel_up)
+                                    ||
+                                action.getParameter2().contains(Actions.wireguard_tunnel_down)
+                                    ||
+                                action.getParameter2().contains(Actions.wireguard_tunnel_refresh)
+                                )
+                            addToArrayListUnique(ActivityPermissions.permissionNameWireguard, requiredPermissions);
+//                        if(
+//                                action.getParameter2().contains("eu.faircode.netguard.START_PORT_FORWARD")
+//                                    ||
+//                                action.getParameter2().contains("eu.faircode.netguard.STOP_PORT_FORWARD")
+//                        )
+//                            addToArrayListUnique("net.kollnig.missioncontrol.permission.ADMIN", requiredPermissions);
                        break;
                    case triggerUrl:
                        addToArrayListUnique("android.permission.INTERNET", requiredPermissions);
@@ -600,6 +668,11 @@ public class ActivityPermissions extends Activity
                break;
            case "android.permission.WRITE_EXTERNAL_STORAGE":
                usingElements.add(getResources().getString(R.string.storeSettings));
+                break;
+            case permissionNameReadNotifications:
+                for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.notification))
+                    usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
+
                break;
            case "com.google.android.gms.permission.ACTIVITY_RECOGNITION":
                for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.activityDetection))
@@ -783,6 +856,10 @@ public class ActivityPermissions extends Activity
                        requestPermissions(cachedPermissionsToRequest, true);
                }
            }
+
+            if (requestCode == requestCodeForPermissionsNotifications)
+                if(havePermission(permissionNameReadNotifications, ActivityPermissions.this))
+                    requestPermissions(cachedPermissionsToRequest, true);
        }
    }

@@ -842,6 +919,14 @@ public class ActivityPermissions extends Activity
                        startActivityForResult(intent, requestCodeForPermissionsNotificationPolicy);
                        return;
                    }
+                    else if (s.equalsIgnoreCase(permissionNameReadNotifications))
+                    {
+                        requiredPermissions.remove(s);
+                        cachedPermissionsToRequest = requiredPermissions;
+                        Intent intent = new Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS");
+                        startActivityForResult(intent, requestCodeForPermissionsNotifications);
+                        return;
+                    }
 //                    else if (s.equalsIgnoreCase(permissionNameLocationBackground) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
 //                    {
 //                        requiredPermissions.remove(s);
@@ -1003,6 +1088,7 @@ public class ActivityPermissions extends Activity
        NotificationManager mNotificationManager = (NotificationManager) Miscellaneous.getAnyContext().getSystemService(Context.NOTIFICATION_SERVICE);
        mNotificationManager.cancel(notificationIdPermissions);
        ActivityMainScreen.updateMainScreen();
+        ActivityMainRules.getInstance().updateListView();
        this.finish();
    }

@@ -1392,4 +1478,24 @@ public class ActivityPermissions extends Activity

        return false;
    }
-}
+
+    public static Boolean verifyNotificationPermission()
+    {
+        try
+        {
+            String theList = android.provider.Settings.Secure.getString(Miscellaneous.getAnyContext().getContentResolver(), "enabled_notification_listeners");
+            String[] theListList = theList.split(":");
+            String me = (new ComponentName(Miscellaneous.getAnyContext(), NotificationListener.class)).flattenToString();
+            for (String next : theListList)
+            {
+                if (me.equals(next))
+                    return true;
+            }
+            return false;
+        }
+        catch(Exception e)
+        {
+            return false;
+        }
+    }
+}
@@ -0,0 +1,16 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+public class ActivityTriggerPhoneCall extends Activity
+{
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.trigger_phone_call);
+    }
+}
@@ -581,11 +581,11 @@ public class AutomationService extends Service implements OnInitListener
 						if(activePoi == null)
 						{
 							PointOfInterest closestPoi = PointOfInterest.getClosestPOI(instance.getLocationProvider().getCurrentLocation());
-							bodyText = "Active POI: none" + "\n" + "Closest POI: " + closestPoi.getName() + lastRuleString;
+							bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + AutomationService.getInstance().getResources().getString(R.string.none) + "\n" + AutomationService.getInstance().getResources().getString(R.string.closestPoi) + ": " + closestPoi.getName() + lastRuleString;
 						}
 						else
 						{
-							bodyText = "Active POI: " + activePoi.getName() + lastRuleString;
+							bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + activePoi.getName() + lastRuleString;
 						}
 					}
 					catch(NullPointerException e)
@@ -33,7 +33,8 @@ public class CompensateCrappyAndroidPaths
     * @param uri     The Uri to query.
     */
    @SuppressLint("NewApi")
-    public static String getPath(final Context context, final Uri uri) {
+    public static String getPath(final Context context, final Uri uri)
+    {
        // check here to KITKAT or new version
        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
        String selection = null;
@@ -0,0 +1,65 @@
+package com.jens.automation2;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.security.Provider;
+
+public class FileShareProvider extends ContentProvider
+{
+    @Override
+    public boolean onCreate()
+    {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder)
+    {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri)
+    {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values)
+    {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs)
+    {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs)
+    {
+        return 0;
+    }
+
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException
+    {
+        File cacheDir = getContext().getCacheDir();
+        File privateFile = new File(cacheDir, Settings.zipFileName);
+
+        return ParcelFileDescriptor.open(privateFile, ParcelFileDescriptor.MODE_READ_ONLY);
+    }
+}
@@ -7,6 +7,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.ContentProvider;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -22,8 +23,10 @@ import android.provider.MediaStore;
 import android.provider.Settings.Secure;
 import android.util.Base64;
 import android.util.Log;
+import android.widget.Toast;

 import com.jens.automation2.location.LocationProvider;
+import com.jens.automation2.receivers.NotificationListener;
 import com.jens.automation2.receivers.PhoneStatusListener;

 import org.apache.http.HttpEntity;
@@ -42,6 +45,8 @@ import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;

+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -71,6 +76,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Scanner;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;

 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -83,12 +91,14 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;

 import androidx.core.app.NotificationCompat;
+import androidx.documentfile.provider.DocumentFile;

+import static android.provider.CalendarContract.CalendarCache.URI;
 import static com.jens.automation2.AutomationService.NOTIFICATION_CHANNEL_ID;
 import static com.jens.automation2.AutomationService.channelName;

 public class Miscellaneous extends Service
-{	
+{
 	protected static String writeableFolderStringCache = null;
 	public static final String lineSeparator = System.getProperty("line.separator");
 	
@@ -440,6 +450,25 @@ public class Miscellaneous extends Service
 //	    Miscellaneous.logEvent("i", TAG, "isEmulator=" + isEmulator);
 	    return isEmulator;
 	}
+
+	public static boolean compare(String direction, String needle, String haystack)
+	{
+		switch(direction)
+		{
+			case Trigger.directionEquals:
+				return haystack.equalsIgnoreCase(needle);
+			case Trigger.directionNotEquals:
+				return !haystack.equalsIgnoreCase(needle);
+			case Trigger.directionContains:
+				return haystack.toLowerCase().contains(needle.toLowerCase());
+			case Trigger.directionStartsWith:
+				return haystack.toLowerCase().startsWith(needle.toLowerCase());
+			case Trigger.directionEndsWith:
+				return haystack.toLowerCase().endsWith(needle.toLowerCase());
+			default:
+				return false;
+		}
+	}
 	
 	public static int compareTimes(Time time1, Time time2)
 	{
@@ -568,6 +597,26 @@ public class Miscellaneous extends Service
 			source = source.replace("[s]", String.valueOf(cal.get(Calendar.SECOND)));
 			source = source.replace("[ms]", String.valueOf(cal.get(Calendar.MILLISECOND)));
 		}
+
+		if(source.contains("[notificationTitle]"))
+		{
+			String notificationTitle = NotificationListener.getLastNotification().getTitle();
+
+			if(notificationTitle != null && notificationTitle.length() > 0)
+				source = source.replace("[notificationTitle]", notificationTitle);
+			else
+				Miscellaneous.logEvent("w", "Variable replacement", "notificationTitle was empty.", 3);
+		}
+
+		if(source.contains("[notificationText]"))
+		{
+			String notificationText = NotificationListener.getLastNotification().getText();
+
+			if(notificationText != null && notificationText.length() > 0)
+				source = source.replace("[notificationText]", notificationText);
+			else
+				Miscellaneous.logEvent("w", "Variable replacement", "notificationText was empty.", 3);
+		}
 		
 //		Miscellaneous.logEvent("i", "URL after replace", source);
 		
@@ -848,7 +897,7 @@ public class Miscellaneous extends Service
 				mNotificationManager.notify(0, dismissableNotification);*/
 	}

-	public static void createDismissableNotificationSdk26(String textToDisplay, int notificationId, PendingIntent pendingIntent)
+	static void createDismissableNotificationSdk26(String textToDisplay, int notificationId, PendingIntent pendingIntent)
 	{
 		NotificationManager mNotificationManager = (NotificationManager) AutomationService.getInstance().getSystemService(Context.NOTIFICATION_SERVICE);

@@ -1187,6 +1236,122 @@ public class Miscellaneous extends Service
 		return returnValue;
 	}

+	public static boolean copyDocumentFileToFile(DocumentFile src, File dst)
+	{
+		InputStream in = null;
+		OutputStream out = null;
+		String error = null;
+
+		try
+		{
+			in = Miscellaneous.getAnyContext().getContentResolver().openInputStream(src.getUri());
+			out = new FileOutputStream(dst);
+
+			byte[] buffer = new byte[1024];
+			int read;
+
+			while ((read = in.read(buffer)) != -1)
+			{
+				out.write(buffer, 0, read);
+			}
+
+			in.close();
+			// write the output file (You have now copied the file)
+			out.flush();
+			out.close();
+
+			return true;
+		}
+		catch (FileNotFoundException fnfe1)
+		{
+			error = fnfe1.getMessage();
+		}
+		catch (Exception e)
+		{
+			error = e.getMessage();
+		}
+
+		return false;
+//		return error;
+	}
+
+	public static boolean copyFileToDocumentFile(File src, DocumentFile dst)
+	{
+		InputStream in = null;
+		OutputStream out = null;
+		String error = null;
+
+		try
+		{
+			in = new FileInputStream(src);
+			out = Miscellaneous.getAnyContext().getContentResolver().openOutputStream(dst.getUri());
+
+			byte[] buffer = new byte[1024];
+			int read;
+
+			while ((read = in.read(buffer)) != -1)
+			{
+				out.write(buffer, 0, read);
+			}
+
+			in.close();
+			// write the output file (You have now copied the file)
+			out.flush();
+			out.close();
+
+			return true;
+		}
+		catch (FileNotFoundException fnfe1)
+		{
+			error = fnfe1.getMessage();
+		}
+		catch (Exception e)
+		{
+			error = e.getMessage();
+		}
+
+		return false;
+//		return error;
+	}
+
+	/*public static String copyDocumentFile(String inputPath, String inputFile, Uri treeUri)
+	{
+		InputStream in = null;
+		OutputStream out = null;
+		String error = null;
+		DocumentFile pickedDir = DocumentFile.fromTreeUri(getActivity(), treeUri);
+		String extension = inputFile.substring(inputFile.lastIndexOf(".")+1,inputFile.length());
+
+		try
+		{
+			DocumentFile newFile = pickedDir.createFile("audio/"+extension, inputFile);
+			out = getActivity().getContentResolver().openOutputStream(newFile.getUri());
+			in = new FileInputStream(inputPath + inputFile);
+
+			byte[] buffer = new byte[1024];
+			int read;
+			while ((read = in.read(buffer)) != -1)
+			{
+				out.write(buffer, 0, read);
+			}
+			in.close();
+			// write the output file (You have now copied the file)
+			out.flush();
+			out.close();
+
+		}
+		catch (FileNotFoundException fnfe1)
+		{
+			error = fnfe1.getMessage();
+		}
+		catch (Exception e)
+		{
+			error = e.getMessage();
+		}
+
+		return error;
+	}*/
+
 	public static boolean googleToBlameForLocation(boolean checkExistingRules)
 	{
 		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
@@ -1207,4 +1372,103 @@ public class Miscellaneous extends Service

 		return false;
 	}
+
+	public static void zip(String[] _files, String zipFileName)
+	{
+		int BUFFER = 2048;
+		try
+		{
+			BufferedInputStream origin = null;
+			FileOutputStream dest = new FileOutputStream(zipFileName);
+			ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(
+					dest));
+			byte data[] = new byte[BUFFER];
+
+			for (int i = 0; i < _files.length; i++)
+			{
+				Log.v("Compress", "Adding: " + _files[i]);
+				FileInputStream fi = new FileInputStream(_files[i]);
+				origin = new BufferedInputStream(fi, BUFFER);
+
+				ZipEntry entry = new ZipEntry(_files[i].substring(_files[i].lastIndexOf("/") + 1));
+				out.putNextEntry(entry);
+				int count;
+
+				while ((count = origin.read(data, 0, BUFFER)) != -1)
+				{
+					out.write(data, 0, count);
+				}
+				origin.close();
+			}
+
+			out.close();
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	public static void unzip(String _zipFile, String _targetLocation)
+	{
+		int BUFFER = 2048;
+
+		try
+		{
+			FileInputStream fin = new FileInputStream(_zipFile);
+			ZipInputStream zin = new ZipInputStream(fin);
+			ZipEntry ze = null;
+			while ((ze = zin.getNextEntry()) != null)
+			{
+				//create dir if required while unzipping
+				if (ze.isDirectory())
+				{
+			//		dirChecker(ze.getName());
+				}
+				else
+				{
+					FileOutputStream fout = new FileOutputStream(_targetLocation + ze.getName());
+					for (int c = zin.read(); c != -1; c = zin.read())
+					{
+						fout.write(c);
+					}
+
+					zin.closeEntry();
+					fout.close();
+				}
+
+			}
+			zin.close();
+		}
+		catch (Exception e)
+		{
+			System.out.println(e);
+		}
+	}
+
+	public static void sendEmail(Context context, String targetAddress, String subject, String message, Uri fileAttachment)
+	{
+		try
+		{
+			final Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND);
+			emailIntent.setType("plain/text");
+			emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL, new String[]{targetAddress});
+			emailIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, subject);
+			if (fileAttachment != null)
+			{
+				emailIntent.putExtra(Intent.EXTRA_STREAM, fileAttachment);
+			}
+			emailIntent.putExtra(android.content.Intent.EXTRA_TEXT, message);
+			context.startActivity(Intent.createChooser(emailIntent, "Sending email..."));
+		}
+		catch (Throwable t)
+		{
+			Toast.makeText(context, "Request failed try again: "+ t.toString(), Toast.LENGTH_LONG).show();
+		}
+	}
+
+	public static boolean doesActivityExist(Intent intent, Context context)
+	{
+		return intent.resolveActivityInfo(context.getPackageManager(), 0) != null;
+	}
 }
@@ -68,7 +68,13 @@ public class News
        Calendar now = Calendar.getInstance();
        String newsContent;

-        String filePath = context.getFilesDir() + "/appNews.xml";
+        String newsFileName = "appNews.xml";
+
+        String filePath = context.getCacheDir() + "/" + newsFileName;
+
+        File oldFilePath = new File(context.getFilesDir() + "/" + newsFileName);
+        if(oldFilePath.exists())
+            oldFilePath.delete();

        if (!(new File(filePath)).exists() || Settings.lastNewsPolltime == -1 || now.getTimeInMillis() >= Settings.lastNewsPolltime + (long)(Settings.newsDisplayForXDays * 24 * 60 * 60 * 1000))
        {
@@ -80,14 +86,14 @@ public class News
            {
                Settings.lastNewsPolltime = now.getTimeInMillis();
                Settings.writeSettings(context);
-                Miscellaneous.logEvent("i", "appNews.xml", "File stored to " + filePath, 5);
+                Miscellaneous.logEvent("i", newsFileName, "File stored to " + filePath, 5);
            }
        }
        else
        {
            // Just read local cache file
            newsContent = Miscellaneous.readFileToString(filePath);
-            Miscellaneous.logEvent("i", "appNews.xml", "Using cache to retrieve news: " + filePath, 5);
+            Miscellaneous.logEvent("i", newsFileName, "Using cache to retrieve news: " + filePath, 5);
        }

        ArrayList<News> returnList = new ArrayList<>();
@@ -273,32 +273,40 @@ public class ReceiverCoordinator

        if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.activityDetection))
        {
-            boolean isRunning = (Boolean)Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "isActivityDetectionReceiverRunning", null);
-            if(isRunning)
+            Object runResult = Miscellaneous.runMethodReflective(activityDetectionClassPath, "isActivityDetectionReceiverRunning", null);;
+            if(runResult instanceof Boolean)
            {
-                Miscellaneous.logEvent("i", "LocationProvider", "Restarting ActivityDetectionReceiver because used in a new/changed rule.", 4);
-                boolean haveAllPerms = (Boolean)Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "haveAllPermission", null);
-                if(haveAllPerms)
-                    Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "restartActivityDetectionReceiver", null);
+                boolean isRunning = (Boolean) runResult;
+                if (isRunning)
+                {
+                    Miscellaneous.logEvent("i", "LocationProvider", "Restarting ActivityDetectionReceiver because used in a new/changed rule.", 4);
+                    boolean haveAllPerms = (Boolean) Miscellaneous.runMethodReflective(activityDetectionClassPath, "haveAllPermission", null);
+                    if (haveAllPerms)
+                        Miscellaneous.runMethodReflective(activityDetectionClassPath, "restartActivityDetectionReceiver", null);
 //                    ActivityDetectionReceiver.restartActivityDetectionReceiver();
-            }
-            else
-            {
-                Miscellaneous.logEvent("i", "LocationProvider", "Starting ActivityDetectionReceiver because used in a new/changed rule.", 4);
-                boolean haveAllPerms = (Boolean)Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "haveAllPermission", null);
-                if(haveAllPerms)
-                    Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "startActivityDetectionReceiver", null);
+                }
+                else
+                {
+                    Miscellaneous.logEvent("i", "LocationProvider", "Starting ActivityDetectionReceiver because used in a new/changed rule.", 4);
+                    boolean haveAllPerms = (Boolean) Miscellaneous.runMethodReflective(activityDetectionClassPath, "haveAllPermission", null);
+                    if (haveAllPerms)
+                        Miscellaneous.runMethodReflective(activityDetectionClassPath, "startActivityDetectionReceiver", null);
 //                    ActivityDetectionReceiver.startActivityDetectionReceiver();
+                }
            }
        }
        else
        {
-            boolean isRunning = (Boolean)Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "isActivityDetectionReceiverRunning", null);
-            if(isRunning)
+            Object runResult = Miscellaneous.runMethodReflective(activityDetectionClassPath, "isActivityDetectionReceiverRunning", null);
+            if(runResult instanceof Boolean)
            {
-                Miscellaneous.logEvent("i", "LocationProvider", "Shutting down ActivityDetectionReceiver because not used in any rule.", 4);
-                Miscellaneous.runMethodReflective("ActivityDetectionReceiver", "stopActivityDetectionReceiver", null);
+                boolean isRunning = (Boolean) runResult;
+                if (isRunning)
+                {
+                    Miscellaneous.logEvent("i", "LocationProvider", "Shutting down ActivityDetectionReceiver because not used in any rule.", 4);
+                    Miscellaneous.runMethodReflective(activityDetectionClassPath, "stopActivityDetectionReceiver", null);
 //                ActivityDetectionReceiver.stopActivityDetectionReceiver();
+                }
            }
        }

@@ -16,6 +16,7 @@ public class Settings implements SharedPreferences
 	public static final int newsPollEveryXDays = 3;
 	public static final int newsDisplayForXDays = 3;
 	public static final String folderName = "Automation";
+	public static final String zipFileName = "automation.zip";

 	public static final String constNewsOptInDone ="newsOptInDone";

@@ -21,7 +21,7 @@ public class Trigger
 	 */
 	
 	public enum Trigger_Enum { 
-								pointOfInterest, timeFrame, charging, batteryLevel, usb_host_connection, speed, noiseLevel, wifiConnection, process_started_stopped, airplaneMode, roaming, nfcTag, activityDetection, bluetoothConnection, headsetPlugged, phoneCall; //phoneCall always needs to be at the very end because of Google's shitty so called privacy
+								pointOfInterest, timeFrame, charging, batteryLevel, usb_host_connection, speed, noiseLevel, wifiConnection, process_started_stopped, airplaneMode, roaming, nfcTag, activityDetection, bluetoothConnection, headsetPlugged, notification, phoneCall; //phoneCall always needs to be at the very end because of Google's shitty so called privacy
 								
 								public String getFullName(Context context)
 								{
@@ -59,6 +59,8 @@ public class Trigger
 											return context.getResources().getString(R.string.bluetoothConnection);
 										case headsetPlugged:
 											return context.getResources().getString(R.string.triggerHeadsetPlugged);
+										case notification:
+											return context.getResources().getString(R.string.notification);
 										default:
 											return "Unknown";
 									}
@@ -67,6 +69,9 @@ public class Trigger
 							};

 	private boolean triggerParameter; //if true->started event, if false->stopped
+	private String triggerParameter2;
+
+	public static final String triggerParameter2Split = "tp2split";
 	
    private Trigger_Enum triggerType = null;
    private PointOfInterest pointOfInterest = null;
@@ -206,6 +211,16 @@ public class Trigger
 		this.triggerParameter = triggerParameter;
 	}

+	public String getTriggerParameter2()
+	{
+		return triggerParameter2;
+	}
+
+	public void setTriggerParameter2(String triggerParameter2)
+	{
+		this.triggerParameter2 = triggerParameter2;
+	}
+
 	public TimeFrame getTimeFrame()
 	{
 		return timeFrame;
@@ -216,7 +231,6 @@ public class Trigger
 		this.timeFrame = timeFrame;
 	}

-
 	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
 	@SuppressWarnings("unused")
 	@Override
@@ -440,6 +454,46 @@ public class Trigger
 				else
 					returnString.append(String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.headsetDisconnected), type));
 				break;
+			case notification:
+				if(this.getTriggerParameter2().contains(triggerParameter2Split))
+				{
+					String[] params = getTriggerParameter2().split(triggerParameter2Split);
+
+					String app = params[0];
+					String titleDir = params[1];
+					String title = params[2];
+					String textDir = params[3];
+					String text;
+					if (params.length >= 5)
+						text = params[4];
+					else
+						text = "";
+					StringBuilder triggerBuilder = new StringBuilder();
+
+					String appString;
+					if (app.equalsIgnoreCase("-1"))
+						appString = Miscellaneous.getAnyContext().getResources().getString(R.string.anyApp);
+					else
+						appString = "app " + app;
+
+					if(triggerParameter)
+						triggerBuilder.append(String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.postsNotification), appString));
+					else
+						triggerBuilder.append(String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.removedNotification), appString));
+
+					if (title.length() > 0)
+						triggerBuilder.append(", " + Miscellaneous.getAnyContext().getString(R.string.title) + " " + Trigger.getMatchString(titleDir) + " " + title);
+
+					if (text.length() > 0)
+						triggerBuilder.append(", " + Miscellaneous.getAnyContext().getString(R.string.text) + " " + Trigger.getMatchString(textDir) + " " + text);
+
+					returnString.append(triggerBuilder.toString());
+				}
+				else
+				{
+					setTriggerParameter2("-1" + triggerParameter2Split + directionEquals + triggerParameter2Split + triggerParameter2Split + directionEquals + triggerParameter2Split + triggerParameter2Split);
+				}
+				break;
 			default:
 				returnString.append("error");
 				break;
@@ -447,7 +501,47 @@ public class Trigger

 		return returnString.toString();
 	}
-	
+
+	public static final String directionEquals = "eq";
+	public static final String directionContains = "ct";
+	public static final String directionStartsWith = "sw";
+	public static final String directionEndsWith = "ew";
+	public static final String directionNotEquals = "ne";
+
+	public static String getMatchString(String direction)
+	{
+		switch(direction)
+		{
+			case directionEquals:
+				return Miscellaneous.getAnyContext().getString(R.string.directionStringEquals);
+			case directionContains:
+				return Miscellaneous.getAnyContext().getString(R.string.directionStringContains);
+			case directionStartsWith:
+				return Miscellaneous.getAnyContext().getString(R.string.directionStringStartsWith);
+			case directionEndsWith:
+				return Miscellaneous.getAnyContext().getString(R.string.directionStringEndsWith);
+			case directionNotEquals:
+				return Miscellaneous.getAnyContext().getString(R.string.directionStringNotEquals);
+			default:
+				return Miscellaneous.getAnyContext().getString(R.string.error);
+		}
+	}
+
+	public static String getMatchCode(String direction)
+	{
+		if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringEquals)))
+			return directionEquals;
+		else if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringContains)))
+			return directionContains;
+		else if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringStartsWith)))
+			return directionStartsWith;
+		else if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringEndsWith)))
+			return directionEndsWith;
+		else if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringNotEquals)))
+			return directionNotEquals;
+		else
+			return Miscellaneous.getAnyContext().getString(R.string.error);
+	}

 	public static String[] getTriggerTypesAsArray()
 	{
@@ -271,6 +271,8 @@ public class XmlFileInterface
 		    	            			}
 		    	            			else if(Rule.getRuleCollection().get(i).getTriggerSet().get(j).getTriggerType() == Trigger_Enum.headsetPlugged)
 		    	            				serializer.text(String.valueOf(Rule.getRuleCollection().get(i).getTriggerSet().get(j).getHeadphoneType()));
+										else
Author	SHA1	Message	Date
jens	e57b888393	Spanish translation	2021-05-13 14:40:23 +02:00
jens	c922f8c7fc	Spanish translation	2021-05-13 14:33:44 +02:00
jens	357c7f894f	Crash resolved when trying display an unknown translation for a permission	2021-05-13 12:06:15 +02:00
jens	34091a7b73	Spanish translation.	2021-05-13 02:44:10 +02:00
jens	8d26abdede	Spanish translation	2021-05-12 22:55:44 +02:00
jens	8d42bb48d2	WG now works. Many small changes and fixes.	2021-05-12 19:41:04 +02:00
jens	f79efa7739	WG now works. Many small changes and fixes.	2021-05-12 17:16:56 +02:00
jens	d257c4ccb0	Miscellaneous changes.	2021-05-11 22:49:41 +02:00
jens	e39f0c2497	startApp changes	2021-05-11 20:00:50 +02:00
jens	327a992cac	Synced manifests.	2021-05-11 17:02:06 +02:00
jens	9021b03732	Export/import finished.	2021-05-11 16:53:19 +02:00
jens	514a9ae0e4	Import/export configuration and Spanish translation.	2021-05-10 22:42:16 +02:00
jens	09298bce55	UI changes.	2021-05-10 19:56:54 +02:00
jens	74f50d3e13	Wireguard integration	2021-05-09 23:10:58 +02:00
jens	1946fb6b9f	Start app changed	2021-05-09 14:42:24 +02:00
jens	acc0f592d1	Wireguard integration	2021-05-08 22:48:05 +02:00
jens	2e09ea1c90	Start app changed	2021-05-08 19:58:44 +02:00
jens	769f227689	Start app changed	2021-05-08 15:14:31 +02:00
jens	22533fcfee	Merge remote-tracking branch 'origin/development' into development	2021-05-08 02:03:18 +02:00
jens	004ca6993a	Small fixes and layout corrections.	2021-05-08 02:03:11 +02:00
jens	0bea81a630	Small fixes and layout corrections.	2021-05-08 02:00:57 +02:00
jens	88decce426	Wireguard integration	2021-05-07 23:11:43 +02:00
jens	2341d714c0	Small fixes and layout corrections.	2021-04-30 13:56:59 +02:00
jens	34c0067736	Small fixes and layout corrections.	2021-04-30 13:52:06 +02:00
jens	e0c3b9d450	Changelog updated and translated to German.	2021-04-27 15:51:02 +02:00
jens	c134b15ab1	Changelog updated and translated to German.	2021-04-27 15:43:52 +02:00
jens	6ef6277976	Changelog updated and translated to German.	2021-04-27 15:30:46 +02:00
jens	10e6c74ba8	Cleanups.	2021-04-27 14:49:34 +02:00
jens	b6f3d928ae	Cleanups.	2021-04-27 14:42:29 +02:00
jens	e898264178	StartAppChanges	2021-04-20 19:49:19 +02:00
jens	0891dca98d	StartAppChanges	2021-04-17 14:52:58 +02:00
jens	8843a97b79	StartAppChanges	2021-04-13 20:00:36 +02:00
jens	1c24af7bcb	StartAppChanges	2021-04-11 19:37:50 +02:00
jens	ee43e109da	StartAppChanges	2021-04-09 17:39:59 +02:00
jens	13bcb02ffc	Notification trigger.	2021-03-30 23:06:07 +02:00
jens	864ed2111e	Notification listener finished.	2021-03-30 19:52:31 +02:00
jens	67e6a38ddc	Notification listener finished.	2021-03-29 16:36:21 +02:00
jens	fb44196a0d	Notification trigger.	2021-03-28 23:23:29 +02:00
jens	7894504791	Notification listener started.	2021-03-28 20:33:44 +02:00
jens	0df5342036	Notification trigger.	2021-03-27 22:52:42 +01:00
jens	712a374adb	Notification listener started.	2021-03-27 19:57:39 +01:00
jens	80f8f9cfe2	Notification listener started.	2021-03-27 14:11:39 +01:00
jens	1d9ed8b3ff	Notification trigger.	2021-03-26 23:11:36 +01:00
jens	5d6221888a	Notification listener started.	2021-03-26 19:58:27 +01:00
jens	56806f0349	Merge remote-tracking branch 'origin/master' into development # Conflicts: # app/googlePlayFlavor/release/output-metadata.json	2021-03-21 22:45:34 +01:00
jens	7127ac45bc	Fixed app crashing when saving rules while service is running.	2021-03-21 22:44:40 +01:00
jens	8a43741b21	Merge remote-tracking branch 'origin/master' into development	2021-03-21 22:30:20 +01:00
jens	b7ebf2cdcd	Fixed app crashing when saving rules while service is running.	2021-03-21 22:27:34 +01:00
jens	054ab6d84b	Background location notifications in googlePlayFlavor	2021-03-20 22:49:05 +01:00
jens	47b56d4978	Google shit again.	2021-03-20 13:37:18 +01:00