Translations and integrated BT tethering

.gitignore

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

.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-09-24T23:07:53.935197300Z" />
+    <timeTargetWasSelectedWithDropDown value="2021-11-26T17:59:37.692012Z" />
   </component>
 </project>

app/src/apkFlavor/AndroidManifest.xml

@@ -132,7 +132,7 @@
                     android:scheme="package" />-->
             </intent-filter>
         </receiver>
-        <receiver android:name=".receivers.AlarmListener" />
+        <receiver android:name=".receivers.DateTimeListener" />
         <receiver android:name=".receivers.ConnectivityReceiver" />
         <receiver android:name=".receivers.TimeZoneListener" />
 

app/src/apkFlavor/java/com/jens/automation2/Rule.java

@@ -349,6 +349,8 @@ public class Rule implements Comparable<Rule>
 					return true;
 				case setWifiTethering:
 					return true;
+				case setBluetoothTethering:
+					return true;
 				default:
 					break;					
 			}
@@ -833,6 +835,13 @@ public class Rule implements Comparable<Rule>
 											continue;
 										}
 									}
+									else
+									{
+										if(myApp.equals(BuildConfig.APPLICATION_ID))
+										{
+											return false;
+										}
+									}
 
 									/*
 										If there are multiple notifications ("stacked") title or text might be null:
@@ -897,6 +906,13 @@ public class Rule implements Comparable<Rule>
 										if (!app.equalsIgnoreCase(myApp))
 											return false;
 									}
+									else
+									{
+										if(myApp.equals(BuildConfig.APPLICATION_ID))
+										{
+											return false;
+										}
+									}
 
 									if (requiredTitle.length() > 0)
 									{
@@ -974,6 +990,32 @@ public class Rule implements Comparable<Rule>
 			}
 		}
 
+		public boolean haveTriggersReallyChanged(Object triggeringObject)
+		{
+			boolean returnValue = false;
+
+			try
+			{
+				for(int i=0; i < triggerSet.size(); i++)
+				{
+					Trigger t = (Trigger) triggerSet.get(i);
+
+					if(t.hasStateRecentlyNotApplied(triggeringObject))
+					{
+						Miscellaneous.logEvent("i", "Rule", "Rule \"" + getName() + "\" has trigger that flipped: " + t.toString(), 4);
+						returnValue = true;				// only 1 trigger needs to have flipped recently
+					}
+				}
+
+				return returnValue;
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule", "Error while checking if rule \"" + getName() + "\" haveTriggersReallyChanged(): " + Log.getStackTraceString(e), 1);
+				return false;
+			}
+		}
+
 		/**
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
@@ -984,8 +1026,9 @@ public class Rule implements Comparable<Rule>
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
 			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean triggersApplyAnew = haveTriggersReallyChanged(new Date());
 
-			if(notLastActive || force || doToggle)
+			if(notLastActive || force || doToggle || triggersApplyAnew)
 			{
 				String message;
 				if(!doToggle)

app/src/fdroidFlavor/AndroidManifest.xml

@@ -129,7 +129,7 @@
                     android:scheme="package" />-->
             </intent-filter>
         </receiver>
-        <receiver android:name=".receivers.AlarmListener" />
+        <receiver android:name=".receivers.DateTimeListener" />
         <receiver android:name=".receivers.ConnectivityReceiver" />
         <receiver android:name=".receivers.TimeZoneListener" />
 

app/src/fdroidFlavor/java/com/jens/automation2/Rule.java

@@ -1,11 +1,14 @@
 package com.jens.automation2;
 
 import android.annotation.SuppressLint;
+import android.app.Notification;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Looper;
+import android.os.Parcelable;
 import android.service.notification.StatusBarNotification;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -32,6 +35,11 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 import static com.jens.automation2.receivers.NotificationListener.EXTRA_TEXT;
 import static com.jens.automation2.receivers.NotificationListener.EXTRA_TITLE;
 
+import androidx.core.app.NotificationCompat;
+
+import org.apache.commons.lang3.StringUtils;
+
+
 public class Rule implements Comparable<Rule>
 {
 	private static ArrayList<Rule> ruleCollection = new ArrayList<Rule>();
@@ -762,13 +770,13 @@ public class Rule implements Comparable<Rule>
 
 						String myApp = params[0];
 						String myTitleDir = params[1];
-						String myTitle = params[2];
+						String requiredTitle = params[2];
 						String myTextDir = params[3];
-						String myText;
+						String requiredText;
 						if (params.length >= 5)
-							myText = params[4];
+							requiredText = params[4];
 						else
-							myText = "";
+							requiredText = "";
 
 						if(oneTrigger.getTriggerParameter())
 						{
@@ -780,38 +788,65 @@ public class Rule implements Comparable<Rule>
 							{
 								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);
+									String notificationApp = sbn.getPackageName();
+									String notificationTitle = null;
+									String notificationText = null;
 
-									Miscellaneous.logEvent("i", "NotificationCheck", "Checking if this notification matches our rule " + this.getName() + ". App: " + app + ", title: " + title + ", text: " + text, 5);
+									Miscellaneous.logEvent("i", "NotificationCheck", "Checking if this notification matches our rule " + this.getName() + ". App: " + notificationApp + ", title: " + notificationTitle + ", text: " + notificationText, 5);
 
 									if (!myApp.equals("-1"))
 									{
-										if (!app.equalsIgnoreCase(myApp))
+										if (!notificationApp.equalsIgnoreCase(myApp))
 										{
 											Miscellaneous.logEvent("i", "NotificationCheck", "Notification app name does not match rule.", 5);
 											continue;
 										}
 									}
-
-									if (myTitle.length() > 0)
+									else
 									{
-										if (!Miscellaneous.compare(myTitleDir, myTitle, title))
+										if(myApp.equals(BuildConfig.APPLICATION_ID))
+										{
+											return false;
+										}
+									}
+
+									/*
+										If there are multiple notifications ("stacked") title or text might be null:
+										https://stackoverflow.com/questions/28047767/notificationlistenerservice-not-reading-text-of-stacked-notifications
+									 */
+
+									Bundle extras = sbn.getNotification().extras;
+
+									// T I T L E
+									if (extras.containsKey(EXTRA_TITLE))
+										notificationTitle = sbn.getNotification().extras.getString(EXTRA_TITLE);
+
+									if (!StringUtils.isEmpty(requiredTitle))
+									{
+										if (!Miscellaneous.compare(myTitleDir, requiredTitle, notificationTitle))
 										{
 											Miscellaneous.logEvent("i", "NotificationCheck", "Notification title does not match rule.", 5);
 											continue;
 										}
 									}
+									else
+										Miscellaneous.logEvent("i", "NotificationCheck", "A required title for a notification trigger was not specified.", 5);
 
-									if (myText.length() > 0)
+									// T E X T
+
+									if (extras.containsKey(EXTRA_TEXT))
+										notificationText = sbn.getNotification().extras.getString(EXTRA_TEXT);
+
+									if (!StringUtils.isEmpty(requiredText))
 									{
-										if (!Miscellaneous.compare(myTextDir, myText, text))
+										if (!Miscellaneous.compare(myTextDir, requiredText, notificationText))
 										{
 											Miscellaneous.logEvent("i", "NotificationCheck", "Notification text does not match rule.", 5);
 											continue;
 										}
 									}
+									else
+										Miscellaneous.logEvent("i", "NotificationCheck", "A required text for a notification trigger was not specified.", 5);
 
 									foundMatch = true;
 									break;
@@ -838,16 +873,23 @@ public class Rule implements Comparable<Rule>
 										if (!app.equalsIgnoreCase(myApp))
 											return false;
 									}
-
-									if (myTitle.length() > 0)
+									else
 									{
-										if (!Miscellaneous.compare(myTitleDir, title, myTitle))
+										if(myApp.equals(BuildConfig.APPLICATION_ID))
+										{
+											return false;
+										}
+									}
+
+									if (requiredTitle.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTitleDir, title, requiredTitle))
 											return false;
 									}
 
-									if (myText.length() > 0)
+									if (requiredText.length() > 0)
 									{
-										if (!Miscellaneous.compare(myTextDir, text, myText))
+										if (!Miscellaneous.compare(myTextDir, text, requiredText))
 											return false;
 									}
 								}
@@ -915,6 +957,32 @@ public class Rule implements Comparable<Rule>
 			}
 		}
 
+		public boolean haveTriggersReallyChanged(Object triggeringObject)
+		{
+			boolean returnValue = false;
+
+			try
+			{
+				for(int i=0; i < triggerSet.size(); i++)
+				{
+					Trigger t = (Trigger) triggerSet.get(i);
+
+					if(t.hasStateRecentlyNotApplied(triggeringObject))
+					{
+						Miscellaneous.logEvent("i", "Rule", "Rule \"" + getName() + "\" has trigger that flipped: " + t.toString(), 4);
+						returnValue = true;				// only 1 trigger needs to have flipped recently
+					}
+				}
+
+				return returnValue;
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule", "Error while checking if rule \"" + getName() + "\" haveTriggersReallyChanged(): " + Log.getStackTraceString(e), 1);
+				return false;
+			}
+		}
+
 		/**
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
@@ -925,8 +993,9 @@ public class Rule implements Comparable<Rule>
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
 			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean triggersApplyAnew = haveTriggersReallyChanged(new Date());
 
-			if(notLastActive || force || doToggle)
+			if(notLastActive || force || doToggle || triggersApplyAnew)
 			{
 				String message;
 				if(!doToggle)

app/src/googlePlayFlavor/AndroidManifest.xml

@@ -123,7 +123,7 @@
                     android:scheme="package" />-->
             </intent-filter>
         </receiver>
-        <receiver android:name=".receivers.AlarmListener" />
+        <receiver android:name=".receivers.DateTimeListener" />
         <receiver android:name=".receivers.ConnectivityReceiver" />
         <receiver android:name=".receivers.TimeZoneListener" />
 

app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java

@@ -1,11 +1,14 @@
 package com.jens.automation2;
 
 import android.annotation.SuppressLint;
+import android.app.Notification;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Looper;
+import android.os.Parcelable;
 import android.service.notification.StatusBarNotification;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -34,6 +37,11 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 import static com.jens.automation2.receivers.NotificationListener.EXTRA_TEXT;
 import static com.jens.automation2.receivers.NotificationListener.EXTRA_TITLE;
 
+import androidx.core.app.NotificationCompat;
+
+import org.apache.commons.lang3.StringUtils;
+
+
 public class Rule implements Comparable<Rule>
 {
 	private static ArrayList<Rule> ruleCollection = new ArrayList<Rule>();
@@ -793,13 +801,13 @@ public class Rule implements Comparable<Rule>
 
 						String myApp = params[0];
 						String myTitleDir = params[1];
-						String myTitle = params[2];
+						String requiredTitle = params[2];
 						String myTextDir = params[3];
-						String myText;
+						String requiredText;
 						if (params.length >= 5)
-							myText = params[4];
+							requiredText = params[4];
 						else
-							myText = "";
+							requiredText = "";
 
 						if(oneTrigger.getTriggerParameter())
 						{
@@ -811,38 +819,65 @@ public class Rule implements Comparable<Rule>
 							{
 								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);
+									String notificationApp = sbn.getPackageName();
+									String notificationTitle = null;
+									String notificationText = null;
 
-									Miscellaneous.logEvent("i", "NotificationCheck", "Checking if this notification matches our rule " + this.getName() + ". App: " + app + ", title: " + title + ", text: " + text, 5);
+									Miscellaneous.logEvent("i", "NotificationCheck", "Checking if this notification matches our rule " + this.getName() + ". App: " + notificationApp + ", title: " + notificationTitle + ", text: " + notificationText, 5);
 
 									if (!myApp.equals("-1"))
 									{
-										if (!app.equalsIgnoreCase(myApp))
+										if (!notificationApp.equalsIgnoreCase(myApp))
 										{
 											Miscellaneous.logEvent("i", "NotificationCheck", "Notification app name does not match rule.", 5);
 											continue;
 										}
 									}
-
-									if (myTitle.length() > 0)
+									else
 									{
-										if (!Miscellaneous.compare(myTitleDir, myTitle, title))
+										if(myApp.equals(BuildConfig.APPLICATION_ID))
+										{
+											return false;
+										}
+									}
+
+									/*
+										If there are multiple notifications ("stacked") title or text might be null:
+										https://stackoverflow.com/questions/28047767/notificationlistenerservice-not-reading-text-of-stacked-notifications
+									 */
+
+									Bundle extras = sbn.getNotification().extras;
+
+									// T I T L E
+									if (extras.containsKey(EXTRA_TITLE))
+										notificationTitle = sbn.getNotification().extras.getString(EXTRA_TITLE);
+
+									if (!StringUtils.isEmpty(requiredTitle))
+									{
+										if (!Miscellaneous.compare(myTitleDir, requiredTitle, notificationTitle))
 										{
 											Miscellaneous.logEvent("i", "NotificationCheck", "Notification title does not match rule.", 5);
 											continue;
 										}
 									}
+									else
+										Miscellaneous.logEvent("i", "NotificationCheck", "A required title for a notification trigger was not specified.", 5);
 
-									if (myText.length() > 0)
+									// T E X T
+
+									if (extras.containsKey(EXTRA_TEXT))
+										notificationText = sbn.getNotification().extras.getString(EXTRA_TEXT);
+
+									if (!StringUtils.isEmpty(requiredText))
 									{
-										if (!Miscellaneous.compare(myTextDir, myText, text))
+										if (!Miscellaneous.compare(myTextDir, requiredText, notificationText))
 										{
 											Miscellaneous.logEvent("i", "NotificationCheck", "Notification text does not match rule.", 5);
 											continue;
 										}
 									}
+									else
+										Miscellaneous.logEvent("i", "NotificationCheck", "A required text for a notification trigger was not specified.", 5);
 
 									foundMatch = true;
 									break;
@@ -869,16 +904,23 @@ public class Rule implements Comparable<Rule>
 										if (!app.equalsIgnoreCase(myApp))
 											return false;
 									}
-
-									if (myTitle.length() > 0)
+									else
 									{
-										if (!Miscellaneous.compare(myTitleDir, title, myTitle))
+										if(myApp.equals(BuildConfig.APPLICATION_ID))
+										{
+											return false;
+										}
+									}
+
+									if (requiredTitle.length() > 0)
+									{
+										if (!Miscellaneous.compare(myTitleDir, title, requiredTitle))
 											return false;
 									}
 
-									if (myText.length() > 0)
+									if (requiredText.length() > 0)
 									{
-										if (!Miscellaneous.compare(myTextDir, text, myText))
+										if (!Miscellaneous.compare(myTextDir, text, requiredText))
 											return false;
 									}
 								}
@@ -946,6 +988,32 @@ public class Rule implements Comparable<Rule>
 			}
 		}
 
+		public boolean haveTriggersReallyChanged(Object triggeringObject)
+		{
+			boolean returnValue = false;
+
+			try
+			{
+				for(int i=0; i < triggerSet.size(); i++)
+				{
+					Trigger t = (Trigger) triggerSet.get(i);
+
+					if(t.hasStateRecentlyNotApplied(triggeringObject))
+					{
+						Miscellaneous.logEvent("i", "Rule", "Rule \"" + getName() + "\" has trigger that flipped: " + t.toString(), 4);
+						returnValue = true;				// only 1 trigger needs to have flipped recently
+					}
+				}
+
+				return returnValue;
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule", "Error while checking if rule \"" + getName() + "\" haveTriggersReallyChanged(): " + Log.getStackTraceString(e), 1);
+				return false;
+			}
+		}
+
 		/**
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
@@ -956,8 +1024,9 @@ public class Rule implements Comparable<Rule>
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
 			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean triggersApplyAnew = haveTriggersReallyChanged(new Date());
 
-			if(notLastActive || force || doToggle)
+			if(notLastActive || force || doToggle || triggersApplyAnew)
 			{
 				String message;
 				if(!doToggle)

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

@@ -13,6 +13,8 @@ import java.util.Locale;
 
 public class Action
 {
+	Rule parentRule = null;
+
 	public static final String actionParameter2Split = "ap2split";
 	public static final String intentPairSeperator = "intPairSplit";
 	public static final String vibrateSeparator = ",";
@@ -22,6 +24,7 @@ public class Action
 								setBluetooth,
 								setUsbTethering,
 								setWifiTethering,
+								setBluetoothTethering,
 								setDisplayRotation,
 								turnWifiOn,turnWifiOff,
 								turnBluetoothOn,turnBluetoothOff,
@@ -29,7 +32,7 @@ public class Action
 								changeSoundProfile,
 								turnUsbTetheringOn,turnUsbTetheringOff,
 								turnWifiTetheringOn,turnWifiTetheringOff,
-								enableScreenRotation, disableScreenRotation,
+								enableScreenRotation,disableScreenRotation,
 								startOtherActivity,
 								waitBeforeNextAction,
 								wakeupDevice,
@@ -52,6 +55,8 @@ public class Action
 											return context.getResources().getString(R.string.actionSetBluetooth);
 										case setWifiTethering:
 											return context.getResources().getString(R.string.actionSetWifiTethering);
+										case setBluetoothTethering:
+											return context.getResources().getString(R.string.actionSetBluetoothTethering);
 										case setUsbTethering:
 											return context.getResources().getString(R.string.actionSetUsbTethering);
 										case setDisplayRotation:
@@ -176,6 +181,13 @@ public class Action
 			else
 				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiTetheringOff));
 		}
+		else if(this.getAction().equals(Action_Enum.setBluetoothTethering))
+		{
+			if(this.getParameter1())
+				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothTetheringOn));
+			else
+				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothTetheringOff));
+		}
 		else if(this.getAction().equals(Action_Enum.setDisplayRotation))
 		{
 			if(this.getParameter1())
@@ -273,6 +285,16 @@ public class Action
 		return returnString.toString();
 	}
 
+	public Rule getParentRule()
+	{
+		return parentRule;
+	}
+
+	public void setParentRule(Rule parentRule)
+	{
+		this.parentRule = parentRule;
+	}
+
 	public static CharSequence[] getActionTypesAsArray()
 	{
 		ArrayList<String> actionTypesList = new ArrayList<String>();
@@ -370,6 +392,9 @@ public class Action
 				case setWifiTethering:
 					Actions.setWifiTethering(context, getParameter1(), toggleActionIfPossible);
 					break;
+				case setBluetoothTethering:
+					Actions.BluetoothTetheringClass.setBluetoothTethering(context, getParameter1(), toggleActionIfPossible);
+					break;
 				case setDisplayRotation:
 					Actions.setDisplayRotation(context, getParameter1(), toggleActionIfPossible);
 					break;

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

@@ -6,6 +6,9 @@ import android.annotation.TargetApi;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -43,13 +46,16 @@ import org.apache.http.conn.util.InetAddressUtils;
 import org.apache.http.impl.client.DefaultHttpClient;
 
 import java.io.File;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.security.KeyStore;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import javax.net.ssl.SSLContext;
 
@@ -304,6 +310,149 @@ public class Actions
 		return true;
 	}
 
+	public static class BluetoothTetheringClass
+	{
+		static Object instance = null;
+		static Method setTetheringOn = null;
+		static Method isTetheringOn = null;
+		static Object mutex = new Object();
+
+		public static Boolean setBluetoothTethering(Context context, Boolean desiredState, boolean toggleActionIfPossible)
+		{
+			Miscellaneous.logEvent("i", "Bluetooth Tethering", "Changing Bluetooth Tethering to " + String.valueOf(desiredState), 4);
+
+//			boolean state = isTetheringOn(context);
+
+//			if (toggleActionIfPossible)
+//			{
+//				Miscellaneous.logEvent("i", "Bluetooth Tethering", context.getResources().getString(R.string.toggling), 2);
+//				desiredState = !state;
+//			}
+
+//			if (((state && !desiredState) || (!state && desiredState)))
+//			{
+			BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+			Class<?> classBluetoothPan = null;
+			Constructor<?> BTPanCtor = null;
+			Object BTSrvInstance = null;
+			Method mBTPanConnect = null;
+
+			String sClassName = "android.bluetooth.BluetoothPan";
+			try
+			{
+				classBluetoothPan = Class.forName(sClassName);
+				Constructor<?> ctor = classBluetoothPan.getDeclaredConstructor(Context.class, BluetoothProfile.ServiceListener.class);
+
+				ctor.setAccessible(true);
+				//  Set Tethering ON
+
+				Class[] paramSet = new Class[1];
+				paramSet[0] = boolean.class;
+
+				synchronized (mutex)
+				{
+					setTetheringOn = classBluetoothPan.getDeclaredMethod("setBluetoothTethering", paramSet);
+					isTetheringOn = classBluetoothPan.getDeclaredMethod("isTetheringOn", null);
+					instance = ctor.newInstance(context, new BTPanServiceListener(context));
+				}
+
+				classBluetoothPan = Class.forName("android.bluetooth.BluetoothPan");
+				mBTPanConnect = classBluetoothPan.getDeclaredMethod("connect", BluetoothDevice.class);
+				BTPanCtor = classBluetoothPan.getDeclaredConstructor(Context.class, BluetoothProfile.ServiceListener.class);
+				BTPanCtor.setAccessible(true);
+				BTSrvInstance = BTPanCtor.newInstance(context, new BTPanServiceListener(context));
+
+				Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();
+
+				// If there are paired devices
+				if (pairedDevices.size() > 0)
+				{
+					// Loop through paired devices
+					for (BluetoothDevice device : pairedDevices)
+					{
+						try
+						{
+							mBTPanConnect.invoke(BTSrvInstance, device);
+						}
+						catch (Exception e)
+						{
+							Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+						}
+					}
+				}
+				return true;
+			}
+			catch (NoSuchMethodException e)
+			{
+				Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+			}
+			catch (ClassNotFoundException e)
+			{
+				Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+			}
+			catch(InvocationTargetException e)
+			{
+				/*
+					Exact error message: "Bluetooth binder is null"
+					This means this device doesn't have bluetooth.
+				 */
+				Miscellaneous.logEvent("e", "Bluetooth Tethering", "Device probably doesn't have bluetooth. " + Log.getStackTraceString(e), 1);
+				Toast.makeText(context, context.getResources().getString(R.string.deviceDoesNotHaveBluetooth), Toast.LENGTH_SHORT).show();
+			}
+			catch (Exception e)
+			{
+				Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+			}
+
+			return false;
+		}
+
+		public static class BTPanServiceListener implements BluetoothProfile.ServiceListener
+		{
+			private final Context context;
+
+			public BTPanServiceListener(final Context context)
+			{
+				this.context = context;
+			}
+
+			@Override
+			public void onServiceConnected(final int profile, final BluetoothProfile proxy)
+			{
+				//Some code must be here or the compiler will optimize away this callback.
+
+				try
+				{
+					synchronized (mutex)
+					{
+						setTetheringOn.invoke(instance, true);
+						if ((Boolean) isTetheringOn.invoke(instance, null))
+						{
+							Miscellaneous.logEvent("e", "Bluetooth Tethering", "BT Tethering is on", 1);
+						}
+						else
+						{
+							Miscellaneous.logEvent("e", "Bluetooth Tethering", "BT Tethering is off", 1);
+						}
+					}
+				}
+				catch (InvocationTargetException e)
+				{
+					Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+				}
+				catch (IllegalAccessException e)
+				{
+					Miscellaneous.logEvent("e", "Bluetooth Tethering", Log.getStackTraceString(e), 1);
+				}
+			}
+
+			@Override
+			public void onServiceDisconnected(final int profile)
+			{
+			}
+		}
+	}
+
 	public static boolean setUsbTethering(Context context2, Boolean desiredState, boolean toggleActionIfPossible)
 	{
 		//TODO:toggle not really implemented, yet

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

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

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

@@ -44,7 +44,7 @@ public class ActivityMainScreen extends ActivityGeneric
 
 	private static ActivityMainScreen activityMainScreenInstance = null;
 	private ToggleButton toggleService, tbLockSound;
-	private Button bShowHelp, bPrivacy, bSettingsErase, bAddSoundLockTIme;
+	private Button bShowHelp, bPrivacy, bSettingsErase, bAddSoundLockTIme, bDonate;
 	private TextView tvActivePoi, tvClosestPoi, tvLastRule, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvlockSoundDuration;
 	private static boolean updateNoteDisplayed = false;
 
@@ -82,6 +82,12 @@ public class ActivityMainScreen extends ActivityGeneric
 		tvlockSoundDuration = (TextView)findViewById(R.id.tvlockSoundDuration);
 		tbLockSound = (ToggleButton) findViewById(R.id.tbLockSound);
 		toggleService = (ToggleButton) findViewById(R.id.tbArmMastListener);
+
+		bDonate = (Button)findViewById(R.id.bDonate);
+
+		if(!BuildConfig.FLAVOR.equalsIgnoreCase("googlePlayFlavor"))
+			bDonate.setVisibility(View.VISIBLE);
+
 		toggleService.setChecked(AutomationService.isMyServiceRunning(this));
 		toggleService.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{
@@ -111,6 +117,18 @@ public class ActivityMainScreen extends ActivityGeneric
 			}
 		});
 
+		bDonate.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				String privacyPolicyUrl = "https://server47.de/donate";
+
+				Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(privacyPolicyUrl));
+				startActivity(browserIntent);
+			}
+		});
+
 		tbLockSound.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{
 			@Override

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

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

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

@@ -201,6 +201,9 @@ public class ActivityMaintenance extends Activity
                     try
                     {
                         XmlFileInterface.readFile();
+                        ActivityMainPoi.getInstance().updateListView();
+                        ActivityMainRules.getInstance().updateListView();
+                        ActivityMainProfiles.getInstance().updateListView();
                     }
                     catch (Exception e)
                     {
@@ -314,18 +317,9 @@ public class ActivityMaintenance extends Activity
 
                 String subject = "Automation logs";
 
-                StringBuilder emailBody = new StringBuilder();
-                emailBody.append("Device details" + Miscellaneous.lineSeparator);
-                emailBody.append("OS version: " + System.getProperty("os.version") + Miscellaneous.lineSeparator);
-                emailBody.append("API Level: " + android.os.Build.VERSION.SDK + Miscellaneous.lineSeparator);
-                emailBody.append("Device: " + android.os.Build.DEVICE + Miscellaneous.lineSeparator);
-                emailBody.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
-                emailBody.append("Product: " + android.os.Build.PRODUCT);
-                emailBody.append("Flavor: " + BuildConfig.FLAVOR);
-
                 Uri uri = Uri.parse("content://com.jens.automation2/" + Settings.zipFileName);
 
-                Miscellaneous.sendEmail(ActivityMaintenance.this, "android-development@gmx.de", "Automation logs", emailBody.toString(), uri);
+                Miscellaneous.sendEmail(ActivityMaintenance.this, "android-development@gmx.de", "Automation logs", getSystemInfo(), uri);
             }
         });
         alertDialogBuilder.setNegativeButton(context.getResources().getString(R.string.no), null);
@@ -334,6 +328,19 @@ public class ActivityMaintenance extends Activity
         return alertDialog;
     }
 
+    public static String getSystemInfo()
+    {
+        StringBuilder systemInfoText = new StringBuilder();
+        systemInfoText.append("Device details" + Miscellaneous.lineSeparator);
+        systemInfoText.append("OS version: " + System.getProperty("os.version") + Miscellaneous.lineSeparator);
+        systemInfoText.append("API Level: " + android.os.Build.VERSION.SDK + Miscellaneous.lineSeparator);
+        systemInfoText.append("Device: " + android.os.Build.DEVICE + Miscellaneous.lineSeparator);
+        systemInfoText.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
+        systemInfoText.append("Product: " + android.os.Build.PRODUCT + Miscellaneous.lineSeparator);
+        systemInfoText.append("Flavor: " + BuildConfig.FLAVOR);
+        return systemInfoText.toString();
+    }
+
     @Override
     protected void onResume()
     {

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

@@ -403,6 +403,11 @@ public class ActivityManageRule extends Activity
 		ruleToEdit.setName(etRuleName.getText().toString());
 		ruleToEdit.setRuleActive(chkRuleActive.isChecked());
 		ruleToEdit.setRuleToggle(chkRuleToggle.isChecked());
+
+		for(Trigger t : ruleToEdit.getTriggerSet())
+			t.setParentRule(ruleToEdit);
+		for(Action a : ruleToEdit.getActionSet())
+			a.setParentRule(ruleToEdit);
 	}
 
 	private void loadVariablesIntoGui()
@@ -1113,9 +1118,7 @@ public class ActivityManageRule extends Activity
 		{
 			//edit TimeFrame
 			if(resultCode == RESULT_OK && ActivityManageTriggerTimeFrame.editedTimeFrameTrigger != null)
-			{
 				this.refreshTriggerList();
-			}
 			else
 				Miscellaneous.logEvent("w", "TimeFrameEdit", "No timeframe returned. Assuming abort.", 5);
 		}
@@ -1133,8 +1136,11 @@ public class ActivityManageRule extends Activity
 		{
 			if(resultCode == RESULT_OK)
 			{
-				newTrigger.setTriggerParameter(data.getBooleanExtra("wifiState", false));
-				newTrigger.setTriggerParameter2(data.getStringExtra("wifiName"));
+				Trigger editedTrigger = new Trigger();
+				editedTrigger.setTriggerType(Trigger_Enum.wifiConnection);
+				editedTrigger.setTriggerParameter(data.getBooleanExtra("wifiState", false));
+				editedTrigger.setTriggerParameter2(data.getStringExtra("wifiName"));
+				ruleToEdit.getTriggerSet().set(editIndex, editedTrigger);
 				this.refreshTriggerList();
 			}
 		}
@@ -1355,6 +1361,8 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.router));
 			else if(types[i].toString().equals(Action_Enum.setWifiTethering.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.router));
+			else if(types[i].toString().equals(Action_Enum.setBluetoothTethering.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.router));
 			else if(types[i].toString().equals(Action_Enum.setDisplayRotation.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.displayrotation));
 			else if(types[i].toString().equals(Action_Enum.waitBeforeNextAction.toString()))
@@ -1455,6 +1463,17 @@ public class ActivityManageRule extends Activity
 						newAction.setAction(Action_Enum.setWifiTethering);
 						getActionParameter1Dialog(ActivityManageRule.this).show();
 					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setBluetoothTethering.toString()))
+					{
+						newAction.setAction(Action_Enum.setBluetoothTethering);
+						getActionParameter1Dialog(ActivityManageRule.this).show();
+
+						if(!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH))
+							Miscellaneous.messageBox("Bluetooth", getResources().getString(R.string.deviceDoesNotHaveBluetooth), ActivityManageRule.this).show();;
+
+						if(Build.VERSION.SDK_INT > Build.VERSION_CODES.O)
+							Miscellaneous.messageBox(context.getResources().getString(R.string.notice), context.getResources().getString(R.string.btTetheringNotice), context).show();
+					}
 					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setDisplayRotation.toString()))
 					{
 						newAction.setAction(Action_Enum.setDisplayRotation);

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

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

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

@@ -531,6 +531,12 @@ public class ActivityPermissions extends Activity
 //                        https://stackoverflow.com/questions/32185628/connectivitymanager-requestnetwork-in-android-6-0
 //                        addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
                         break;
+                    case setBluetoothTethering:
+                        //addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
+                        addToArrayListUnique(Manifest.permission.BLUETOOTH, requiredPermissions);
+                        addToArrayListUnique(Manifest.permission.BLUETOOTH_ADMIN, requiredPermissions);
+                        addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
+                        break;
                     case setWifi:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
 //                        https://stackoverflow.com/questions/32185628/connectivitymanager-requestnetwork-in-android-6-0

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

@@ -199,6 +199,7 @@ public class AutomationService extends Service implements OnInitListener
 		if (checkStartupRequirements(this, startAtBoot))
 		{
 			Miscellaneous.logEvent("i", "Service", this.getResources().getString(R.string.logServiceStarting) + " VERSION_CODE: " + BuildConfig.VERSION_CODE + ", VERSION_NAME: " + BuildConfig.VERSION_NAME + ", flavor: " + BuildConfig.FLAVOR, 1);
+			Miscellaneous.logEvent("i", "Service", ActivityMaintenance.getSystemInfo(), 1);
 
 			startUpRoutine();
 

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

@@ -77,6 +77,8 @@ import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.sql.Time;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -1532,4 +1534,21 @@ public class Miscellaneous extends Service
 		else*/
 			return PhoneNumberUtils.compare(number1, number2);
 	}
+
+	public static String formatDate(Date input)
+	{
+		DateFormat sdf = null;
+		SimpleDateFormat fallBackFormatter = new SimpleDateFormat(Settings.dateFormat);
+
+		if(sdf == null && Settings.dateFormat != null)
+			sdf = new SimpleDateFormat(Settings.dateFormat);
+
+		String formattedDate;
+		if(sdf != null)
+			formattedDate = sdf.format(input);
+		else
+			formattedDate = fallBackFormatter.format(input);
+
+		return formattedDate;
+	}
 }

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

@@ -5,7 +5,7 @@ import android.util.Log;
 
 import com.jens.automation2.location.CellLocationChangedReceiver;
 import com.jens.automation2.location.WifiBroadcastReceiver;
-import com.jens.automation2.receivers.AlarmListener;
+import com.jens.automation2.receivers.DateTimeListener;
 import com.jens.automation2.receivers.AutomationListenerInterface;
 import com.jens.automation2.receivers.BatteryReceiver;
 import com.jens.automation2.receivers.BluetoothReceiver;
@@ -42,7 +42,7 @@ public class ReceiverCoordinator
             Class adClass = Class.forName("ActivityDetectionReceiver");
             allImplementers = new Class[] {
                     adClass,
-                    AlarmListener.class,
+                    DateTimeListener.class,
                     BatteryReceiver.class,
                     BluetoothReceiver.class,
                     ConnectivityReceiver.class,
@@ -59,7 +59,7 @@ public class ReceiverCoordinator
 //            e.printStackTrace();
 
             allImplementers = new Class[] {
-                    AlarmListener.class,
+                    DateTimeListener.class,
                     BatteryReceiver.class,
                     BluetoothReceiver.class,
                     ConnectivityReceiver.class,
@@ -155,7 +155,7 @@ public class ReceiverCoordinator
             BatteryReceiver.startBatteryReceiver(AutomationService.getInstance());
 
         // startAlarmListener
-        AlarmListener.startAlarmListener(AutomationService.getInstance());
+        DateTimeListener.startAlarmListener(AutomationService.getInstance());
         TimeZoneListener.startTimeZoneListener(AutomationService.getInstance());
 
         // startNoiseListener
@@ -199,7 +199,7 @@ public class ReceiverCoordinator
             WifiBroadcastReceiver.stopWifiReceiver();
             BatteryReceiver.stopBatteryReceiver();
             TimeZoneListener.stopTimeZoneListener();
-            AlarmListener.stopAlarmListener(AutomationService.getInstance());
+            DateTimeListener.stopAlarmListener(AutomationService.getInstance());
             NoiseListener.stopNoiseListener();
             ProcessListener.stopProcessListener(AutomationService.getInstance());
 

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

@@ -6,70 +6,90 @@ import java.util.ArrayList;
 public class TimeFrame
 {
 	// Defines a timeframe
-		private Time triggerTimeStart;
-		private Time triggerTimeStop;
+	protected Time triggerTimeStart;
+	protected Time triggerTimeStop;
+	protected long repetition;
 
-		private ArrayList<Integer> dayList = new ArrayList<Integer>();
-		public ArrayList<Integer> getDayList()
+	protected final static String separator = "/";
+
+	private ArrayList<Integer> dayList = new ArrayList<Integer>();
+	public ArrayList<Integer> getDayList()
+	{
+		return dayList;
+	}
+	public void setDayList(ArrayList<Integer> dayList)
+	{
+		this.dayList = dayList;
+	}
+	public void setDayListFromString(String dayListString)
+	{
+//		Log.i("Parsing", "Full string: " + dayListString);
+		char[] dayListCharArray = dayListString.toCharArray();
+
+		dayList = new ArrayList<Integer>();
+		for(char item : dayListCharArray)
 		{
-			return dayList;
-		}
-		public void setDayList(ArrayList<Integer> dayList)
-		{
-			this.dayList = dayList;
-		}
-		public void setDayListFromString(String dayListString)
-		{
-//			Log.i("Parsing", "Full string: " + dayListString);
-			char[] dayListCharArray = dayListString.toCharArray();
-			
-			dayList = new ArrayList<Integer>();
-			for(char item : dayListCharArray)
-			{
 //				Log.i("Parsing", String.valueOf(item));
-				dayList.add(Integer.parseInt(String.valueOf(item)));
-			}
+			dayList.add(Integer.parseInt(String.valueOf(item)));
 		}
+	}
 		
-		
-		public Time getTriggerTimeStart()
-		{
-			return triggerTimeStart;
-		}
-		public void setTriggerTimeStart(Time triggerTimeStart)
-		{
-			this.triggerTimeStart = triggerTimeStart;
-		}
-		public Time getTriggerTimeStop()
-		{
-			return triggerTimeStop;
-		}
-		public void setTriggerTimeStop(Time triggerTimeStop)
-		{
-			this.triggerTimeStop = triggerTimeStop;
-		}
-		
-		public TimeFrame (Time timeStart, Time timeEnd, ArrayList<Integer> dayList2)
-		{
-			this.setTriggerTimeStart(timeStart);
-			this.setTriggerTimeStop(timeEnd);
-			this.setDayList(dayList2);
-		}
-		TimeFrame (String fileContent)
-		{
-			String[] dateArray = fileContent.split("/"); // example: timestart/timestop/days[int]
-			this.setTriggerTimeStart(Time.valueOf(dateArray[0]));
-			this.setTriggerTimeStop(Time.valueOf(dateArray[1]));
-			this.setDayListFromString(dateArray[2]);
-		}
-		@Override
-		public String toString()
-		{
-			String returnString = this.getTriggerTimeStart().toString() + "/" + this.getTriggerTimeStop().toString() + "/";
-			
-			for(Integer oneDay : this.getDayList())
-				returnString += String.valueOf(oneDay);
-			
-			return returnString;
-		}
-}
+	public Time getTriggerTimeStart()
+	{
+		return triggerTimeStart;
+	}
+	public void setTriggerTimeStart(Time triggerTimeStart)
+	{
+		this.triggerTimeStart = triggerTimeStart;
+	}
+
+	public Time getTriggerTimeStop()
+	{
+		return triggerTimeStop;
+	}
+	public void setTriggerTimeStop(Time triggerTimeStop)
+	{
+		this.triggerTimeStop = triggerTimeStop;
+	}
+
+	public long getRepetition()
+	{
+		return repetition;
+	}
+
+	public void setRepetition(long repetition)
+	{
+		this.repetition = repetition;
+	}
+
+	public TimeFrame (Time timeStart, Time timeEnd, ArrayList<Integer> dayList2, long repetition)
+	{
+		this.setTriggerTimeStart(timeStart);
+		this.setTriggerTimeStop(timeEnd);
+		this.setDayList(dayList2);
+		this.setRepetition(repetition);
+	}
+
+	public TimeFrame (String fileContent)
+	{
+		String[] dateArray = fileContent.split(separator); // example: timestart/timestop/days[int]/repetition
+		this.setTriggerTimeStart(Time.valueOf(dateArray[0]));
+		this.setTriggerTimeStop(Time.valueOf(dateArray[1]));
+		this.setDayListFromString(dateArray[2]);
+		if(dateArray.length > 3)	// may not exist in old config files
+			this.setRepetition(Long.parseLong(dateArray[3]));
+	}
+
+	@Override
+	public String toString()
+	{
+		String returnString = this.getTriggerTimeStart().toString() + separator + this.getTriggerTimeStop().toString() + separator;
+
+		for(Integer oneDay : this.getDayList())
+			returnString += String.valueOf(oneDay);
+
+		returnString += separator + String.valueOf(repetition);
+
+		return returnString;
+	}
+}

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

@@ -3,24 +3,315 @@ package com.jens.automation2;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.Build;
+import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 
 import com.jens.automation2.receivers.BluetoothReceiver;
 
+import java.sql.Time;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 
 
 public class Trigger
 {
-	/*
+	Rule parentRule = null;
+
+    public boolean applies(Object triggeringObject)
+    {
+		try
+		{
+			switch(this.getTriggerType())
+			{
+				case timeFrame:
+					if(!checkDateTime(triggeringObject, false))
+						return false;
+					break;
+				default:
+					break;
+			}
+
+			return true;
+		}
+		catch(Exception e)
+		{
+			Miscellaneous.logEvent("e", "Trigger", "Error while checking if rule " + getParentRule().getName() + " applies. Error occured in trigger " + this.toString() + "." + Miscellaneous.lineSeparator + Log.getStackTraceString(e), 1);
+			return false;
+		}
+    }
+
+	public boolean hasStateRecentlyNotApplied(Object triggeringObject)
+	{
+		// nur mit einem Trigger?
+
+		// door -> was state different in previous step
+
+		try
+		{
+			switch(getTriggerType())
+			{
+				case timeFrame:
+					if(!checkDateTime(triggeringObject, true))
+						return false;
+					break;
+				default:
+					break;
+			}
+
+			return true;
+		}
+		catch(Exception e)
+		{
+			Miscellaneous.logEvent("e", "Trigger", "Error while checking if rule " + getParentRule().getName() + " applies. Error occured in trigger " + this.toString() + "." + Miscellaneous.lineSeparator + Log.getStackTraceString(e), 1);
+			return false;
+		}
+	}
+
+	public boolean checkDateTime(Object triggeringObject, boolean checkifStateChangedSinceLastRuleExecution)
+	{
+		/*
+		 * Use format known from Automation
+		 * 07:30:00/17:30:00/23456/300	<-- last parameter is optional: repetition in seconds
+		 * Also required: inside or outside that interval
+		 */
+
+		Date triggeringTime;
+		if(triggeringObject instanceof Date)
+			triggeringTime = (Date)triggeringObject;
+		else
+			triggeringTime = new Date();
+
+		String timeString = String.valueOf(triggeringTime.getHours()) + ":" + String.valueOf(triggeringTime.getMinutes()) + ":" + String.valueOf(triggeringTime.getSeconds());
+		Time nowTime = Time.valueOf(timeString);
+		Calendar calNow = Calendar.getInstance();
+
+		try
+		{
+			TimeFrame tf = new TimeFrame(getTriggerParameter2());
+
+			if(tf.getDayList().contains(calNow.get(Calendar.DAY_OF_WEEK)))
+			{
+				if(
+					// Regular case, start time is lower than end time
+						(
+								Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0
+										&&
+								Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0
+						)
+								|
+								// Other case, start time higher than end time, timeframe goes over midnight
+								(
+										Miscellaneous.compareTimes(tf.getTriggerTimeStart(), tf.getTriggerTimeStop()) < 0
+												&&
+										(Miscellaneous.compareTimes(tf.getTriggerTimeStart(), nowTime) >= 0
+														|
+										Miscellaneous.compareTimes(nowTime, tf.getTriggerTimeStop()) > 0)
+								)
+
+				)
+				{
+					// We are in the timeframe
+					Miscellaneous.logEvent("i", "Trigger", "TimeFrame: We're currently (" + calNow.getTime().toString() + ") in the specified TimeFrame (" + tf.toString() + ").", 4);
+					if(getTriggerParameter())
+					{
+						if(checkifStateChangedSinceLastRuleExecution)
+						{
+							/*
+							 * Was there a target repetition time between last execution and now?
+							 * If not -> return false.
+							 */
+							Calendar compareCal = Calendar.getInstance();
+							compareCal.setTimeInMillis(triggeringTime.getTime());
+							if(tf.getRepetition() > 0)
+							{
+								if(!isSupposedToRepeatSinceLastExecution(compareCal))
+								{
+									Miscellaneous.logEvent("i", "TimeFrame", "TimeFrame: Trigger of rule " + this.getParentRule().getName() + " applies, but repeated execution is not due, yet.", 4);
+									return false;
+								}
+							}
+							else
+							{
+								/*
+								 * This is not a repeating rule. Have we left
+								 * the relevant timeframe since the last run?
+								 * Determine if it has ran today already. If yes
+								 * return false because every rule that is not
+								 * repeating can only be executed once per day.
+								 */
+
+								if(
+										getParentRule().getLastExecution().get(Calendar.YEAR) == calNow.get(Calendar.YEAR)
+												&&
+										getParentRule().getLastExecution().get(Calendar.MONTH) == calNow.get(Calendar.MONTH)
+												&&
+										getParentRule().getLastExecution().get(Calendar.DAY_OF_MONTH) == calNow.get(Calendar.DAY_OF_MONTH)
+								)
+								{
+									Miscellaneous.logEvent("i", "TimeFrame", "TimeFrame: Trigger of rule " + this.getParentRule().getName() + " applies, but it was already executed today.", 4);
+									return false;
+								}
+							}
+						}
+
+						Miscellaneous.logEvent("i", "Trigger", "TimeFrame: That's what's specified. Trigger of rule " + this.getParentRule().getName() + " applies.", 4);
+						return true;
+					}
+					else
+					{
+						Miscellaneous.logEvent("i", "Trigger", "TimeFrame: That's not what's specified. Trigger of rule " + this.getParentRule().getName() + " doesn't apply.", 4);
+						return false;
+					}
+				}
+				else
+				{
+					Miscellaneous.logEvent("i", "Trigger", "TimeFrame: We're currently (" + calNow.getTime().toString() + ", Day: " + String.valueOf(calNow.get(Calendar.DAY_OF_WEEK)) + ") not in the specified TimeFrame (" + tf.toString() + ") because of the time.", 5);
+					if(!getTriggerParameter())
+					{
+						if(checkifStateChangedSinceLastRuleExecution)
+						{
+							/*
+							 * Was there a target repetition time between last execution and now?
+							 * If not -> return false.
+							 */
+							Calendar compareCal = Calendar.getInstance();
+							compareCal.setTimeInMillis(triggeringTime.getTime());
+							if(tf.getRepetition() > 0)
+							{
+								if(!isSupposedToRepeatSinceLastExecution(compareCal))
+								{
+									Miscellaneous.logEvent("i", "Trigger", "TimeFrame: Trigger of rule " + this.getParentRule().getName() + " applies, but repeated execution is not due, yet.", 4);
+									return false;
+								}
+							}
+							else
+							{
+								/*
+								 * This is not a repeating rule. Have we left
+								 * the relevant timeframe since the last run?
+								 * Determine if it has ran today already. If yes
+								 * return false because every rule that is not
+								 * repeating can only be executed once per day.
+								 */
+
+								if(
+										getParentRule().getLastExecution().get(Calendar.YEAR) == calNow.get(Calendar.YEAR)
+												&&
+										getParentRule().getLastExecution().get(Calendar.MONTH) == calNow.get(Calendar.MONTH)
+												&&
+										getParentRule().getLastExecution().get(Calendar.DAY_OF_MONTH) == calNow.get(Calendar.DAY_OF_MONTH)
+								)
+								{
+									Miscellaneous.logEvent("i", "Trigger", "TimeFrame: Trigger of rule " + this.getParentRule().getName() + " applies, but it was already executed today.", 4);
+									return false;
+								}
+							}
+						}
+						Miscellaneous.logEvent("i", "Trigger", "TimeFrame: That's what's specified. Trigger of rule " + this.getParentRule().getName() + " applies.", 5);
+						return true;
+					}
+					else
+					{
+						Miscellaneous.logEvent("i", "Trigger", "TimeFrame: That's not what's specified. Trigger of rule " + this.getParentRule().getName() + " doesn't apply.", 5);
+						return false;
+					}
+				}
+			}
+			else
+			{
+				Miscellaneous.logEvent("i", "Trigger", "TimeFrame: We're currently (" + calNow.getTime().toString() + ", Day: " + String.valueOf(calNow.get(Calendar.DAY_OF_WEEK)) + ") not in the specified TimeFrame (" + tf.toString() + ") because of the day.", 5);
+				return false;
+			}
+		}
+		catch(Exception e)
+		{
+			Miscellaneous.logEvent("e", "Trigger", "There was an error while checking if the time based trigger applies: " + Log.getStackTraceString(e), 1);
+			return false;
+		}
+	}
+
+	public static Calendar getNextRepeatedExecutionAfter(Trigger trigger, Calendar now)
+	{
+		Calendar calSet;
+		Time setTime;
+		TimeFrame tf = new TimeFrame(trigger.getTriggerParameter2());
+
+		if(tf.getRepetition() > 0)
+		{
+			if(trigger.getTriggerParameter())
+				setTime = tf.getTriggerTimeStart();
+			else
+				setTime = tf.getTriggerTimeStop();
+
+			calSet = (Calendar) now.clone();
+			calSet.set(Calendar.HOUR_OF_DAY, setTime.getHours());
+			calSet.set(Calendar.MINUTE, setTime.getMinutes());
+			calSet.set(Calendar.SECOND, 0);
+			calSet.set(Calendar.MILLISECOND, 0);
+
+//				if(this.applies(null))
+//				{
+			// If the starting time is a day ahead remove 1 day.
+			if(calSet.getTimeInMillis() > now.getTimeInMillis())
+				calSet.add(Calendar.DAY_OF_MONTH, -1);
+
+			long differenceInSeconds = Math.abs(now.getTimeInMillis() - calSet.getTimeInMillis()) / 1000;
+			long nextExecutionMultiplier = Math.floorDiv(differenceInSeconds, tf.getRepetition()) + 1;
+			long nextScheduleTimestamp = (calSet.getTimeInMillis() / 1000) + (nextExecutionMultiplier * tf.getRepetition());
+			Calendar calSchedule = Calendar.getInstance();
+			calSchedule.setTimeInMillis(nextScheduleTimestamp * 1000);
+
+			/*
+			 * Das war mal aktiviert. Allerdings: Die ganze Funktion liefert zurück, wenn die Regel NOCH nicht
+			 * zutrifft, aber wir z.B. gleich den zeitlichen Bereich betreten.
+			 */
+//					if(trigger.checkDateTime(calSchedule.getTime(), false))
+//					{
+			return calSchedule;
+//					}
+//				}
+		}
+		else
+			Miscellaneous.logEvent("i", "Trigger", "Trigger " + trigger.toString() + " is not executed repeatedly.", 5);
+
+		return null;
+	}
+
+	boolean isSupposedToRepeatSinceLastExecution(Calendar now)
+	{
+		TimeFrame tf = new TimeFrame(getTriggerParameter2());
+		Calendar lastExec = getParentRule().getLastExecution();
+
+		// the simple stuff:
+
+		if(lastExec == null)				// rule never run, go any way
+			return true;
+		else if(tf.getRepetition() <= 0)	// is not set to repeat at all
+			return false;
+
+		/*
+		 * We don't need to check if the trigger currently applies, that has
+		 * been done externally via the applies() function. We can safely assume
+		 * we're inside the specified timeframe.
+		 */
+
+		Calendar timeSupposedToRunNext = getNextRepeatedExecutionAfter(this, lastExec);
+		if(now.getTimeInMillis() > timeSupposedToRunNext.getTimeInMillis())
+			return true;
+
+		return false;
+	}
+
+    /*
 	 * Can be several things:
 	 * -PointOfInterest
 	 * -TimeFrame
 	 * -Event (like charging, cable plugged, etc.)
 	 */
 	
-	public enum Trigger_Enum { 
+	public enum Trigger_Enum {
 								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)
@@ -294,7 +585,11 @@ public class Trigger
 				else
 					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.leaving) + " ");
 
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.triggerTimeFrame) + ": " + this.getTimeFrame().getTriggerTimeStart().toString() + " " + Miscellaneous.getAnyContext().getResources().getString(R.string.until) + " " + this.getTimeFrame().getTriggerTimeStop().toString() + " on days " + this.getTimeFrame().getDayList().toString());
+				String repeat = ", no repetition";
+				if(this.getTimeFrame().getRepetition() > 0)
+					repeat = ", " + String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.repeatEveryXsecondsWithVariable), String.valueOf(this.getTimeFrame().getRepetition()));
+
+				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.triggerTimeFrame) + ": " + this.getTimeFrame().getTriggerTimeStart().toString() + " " + Miscellaneous.getAnyContext().getResources().getString(R.string.until) + " " + this.getTimeFrame().getTriggerTimeStop().toString() + " on days " + this.getTimeFrame().getDayList().toString() + repeat);
 				break;
 			case speed:
 				if(getTriggerParameter())
@@ -611,5 +906,14 @@ public class Trigger
 	{
 		return this.bluetoothEvent;
 	}
-	
+
+	public Rule getParentRule()
+	{
+		return parentRule;
+	}
+
+	public void setParentRule(Rule parentRule)
+	{
+		this.parentRule = parentRule;
+	}
 }

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

@@ -764,6 +764,8 @@ public class XmlFileInterface
             	try
 				{
 					newRule.setTriggerSet(readTriggerCollection(parser));
+					for(Trigger t : newRule.getTriggerSet())
+						t.setParentRule(newRule);
 				}
             	catch (XmlPullParserException e)
 				{
@@ -779,6 +781,8 @@ public class XmlFileInterface
             	try
 				{
 					newRule.setActionSet(readActionCollection(parser));
+					for(Action a : newRule.getActionSet())
+						a.setParentRule(newRule);
 				}
             	catch (XmlPullParserException e)
 				{
@@ -815,7 +819,15 @@ public class XmlFileInterface
             // Starts by looking for the entry tag
             if (name.equals("Trigger"))
             {
-            	triggerCollection.add(readTrigger(parser));
+				try
+				{
+					triggerCollection.add(readTrigger(parser));
+				}
+				catch (IllegalArgumentException | NullPointerException e)
+				{
+					Miscellaneous.logEvent("e", "XMLFileInterface", "Unknown trigger found in config file. File was probably created by a newer program version. Details: " + Log.getStackTraceString(e), 1);
+					Miscellaneous.messageBox(context.getString(R.string.error), context.getString(R.string.elementSkipped), context).show();
+				}
             }
             else
             {
@@ -826,7 +838,6 @@ public class XmlFileInterface
         return (triggerCollection);
 	}
 
-	
 	private static Trigger readTrigger(XmlPullParser parser) throws IOException, XmlPullParserException
 	{
 		
@@ -1051,7 +1062,15 @@ public class XmlFileInterface
             // Starts by looking for the entry tag
             if (name.equals("Action"))
             {
-            	actionCollection.add(readAction(parser));
+            	try
+				{
+					actionCollection.add(readAction(parser));
+				}
+            	catch (IllegalArgumentException | NullPointerException e)
+				{
+					Miscellaneous.logEvent("e", "XMLFileInterface", "Unknown action found in config file. File was probably created by a newer program version. Details: " + Log.getStackTraceString(e), 1);
+					Miscellaneous.messageBox(context.getString(R.string.error), context.getString(R.string.elementSkipped), context).show();
+				}
             }
             else
             {
@@ -1060,7 +1079,6 @@ public class XmlFileInterface
         }  
         return (actionCollection);
 	}
-
 	
 	private static Action readAction(XmlPullParser parser) throws IOException, XmlPullParserException
 	{		

app/src/main/java/com/jens/automation2/receivers/AlarmListener.java

@@ -1,301 +0,0 @@
-package com.jens.automation2.receivers;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import com.jens.automation2.AutomationService;
-import com.jens.automation2.Miscellaneous;
-import com.jens.automation2.Rule;
-import com.jens.automation2.Trigger;
-import com.jens.automation2.Trigger.Trigger_Enum;
-
-import java.sql.Time;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-
-public class AlarmListener extends BroadcastReceiver implements AutomationListenerInterface
-{
-	private static AutomationService automationServiceRef;
-	private static AlarmManager centralAlarmManagerInstance;
-//	private static Intent alarmIntent;
-//	private static PendingIntent alarmPendingIntent;
-	private static boolean alarmListenerActive=false;
-	private static ArrayList<Long> alarmCandidates = new ArrayList<Long>();
-	
-	private static ArrayList<Integer> requestCodeList = new ArrayList<Integer>();
-
-	public static void startAlarmListener(final AutomationService automationServiceRef)
-	{		
-		AlarmListener.startAlarmListenerInternal(automationServiceRef);
-	}
-	public static void stopAlarmListener(Context context)
-	{
-		AlarmListener.stopAlarmListenerInternal();
-	}
-
-	public static boolean isAlarmListenerActive()
-	{
-		return alarmListenerActive;
-	}
-	
-	@Override
-	public void onReceive(Context context, Intent intent)
-	{
-		Miscellaneous.logEvent("i", "AlarmListener", "Alarm received", 2);
-		Date now = new Date();
-		String timeString = String.valueOf(now.getHours()) + ":" + String.valueOf(now.getMinutes()) + ":" + String.valueOf(now.getSeconds());
-		Time passTime = Time.valueOf(timeString);
-		
-		ArrayList<Rule> allRulesWithNowInTimeFrame = Rule.findRuleCandidatesByTime(passTime);
-		for(int i=0; i<allRulesWithNowInTimeFrame.size(); i++)
-		{
-			if(allRulesWithNowInTimeFrame.get(i).applies(context))
-				allRulesWithNowInTimeFrame.get(i).activate(automationServiceRef, false);
-		}
-		
-		setAlarms();
-	}
-	
-	public static void setAlarms()
-	{
-		alarmCandidates.clear();
-		
-		SimpleDateFormat sdf = new SimpleDateFormat("E dd.MM.yyyy HH:mm");
-		
-		clearAlarms();
-		
-		int i=0;	
-
-//		// get a Calendar object with current time
-//		Calendar cal = Calendar.getInstance();
-//		// add 5 minutes to the calendar object
-//		cal.add(Calendar.SECOND, 10);
-//		String calSetWorkingCopyString2 = null;
-//		SimpleDateFormat sdf2 = new SimpleDateFormat("E dd.MM.yyyy HH:mm");
-//		if (cal != null)
-//		{
-//			calSetWorkingCopyString2 = sdf2.format(cal.getTime());
-//		}
-//		Miscellaneous.logEvent("i", "AlarmManager", "Setting repeating alarm because of hardcoded test: beginning at " + calSetWorkingCopyString2);
-//		Intent alarmIntent2 = new Intent(automationServiceRef, AlarmListener.class);
-//		PendingIntent alarmPendingIntent2 = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent2, 0);
-//		centralAlarmManagerInstance.setInexactRepeating(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), 5000, alarmPendingIntent2);
-//		requestCodeList.add(0);
-				 
-		ArrayList<Rule> allRulesWithTimeFrames = new ArrayList<Rule>();
-		allRulesWithTimeFrames = Rule.findRuleCandidatesByTimeFrame();
-		for(Rule oneRule : allRulesWithTimeFrames)
-		{
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger_Enum.timeFrame)
-				{
-					Calendar calNow, calSet;
-					Time setTime;
-					
-					if(oneTrigger.getTriggerParameter())
-						setTime = oneTrigger.getTimeFrame().getTriggerTimeStart();
-					else
-						setTime = oneTrigger.getTimeFrame().getTriggerTimeStop();
-					
-					calNow = Calendar.getInstance();			
-					calSet = (Calendar) calNow.clone();
-					calSet.set(Calendar.HOUR_OF_DAY, setTime.getHours());
-					calSet.set(Calendar.MINUTE, setTime.getMinutes());
-					calSet.set(Calendar.SECOND, 0);
-					calSet.set(Calendar.MILLISECOND, 0);
-					// At this point calSet would be a scheduling candidate. It's just the day the might not be right, yet.
-					
-					long milliSecondsInAWeek = 1000 * 60 * 60 * 24 * 7;
-					
-					for(int dayOfWeek : oneTrigger.getTimeFrame().getDayList())
-					{
-						Calendar calSetWorkingCopy = (Calendar) calSet.clone();
-						
-//						calSetWorkingCopy.set(Calendar.HOUR_OF_DAY, setTime.getHours());
-//						calSetWorkingCopy.set(Calendar.MINUTE, setTime.getMinutes());
-//						calSetWorkingCopy.set(Calendar.SECOND, 0);
-//						calSetWorkingCopy.set(Calendar.MILLISECOND, 0);
-						
-						int diff = dayOfWeek - calNow.get(Calendar.DAY_OF_WEEK);
-//						Log.i("AlarmManager", "Today: " + String.valueOf(calNow.get(Calendar.DAY_OF_WEEK)) + " / Sched.Day: " + String.valueOf(dayOfWeek) + " Difference to target day is: " + String.valueOf(diff));
-						if(diff == 0) //if we're talking about the current day, is the time still in the future?
-						{
-							if(calSetWorkingCopy.getTime().getHours() < calNow.getTime().getHours())
-							{
-//								Log.i("AlarmManager", "calSetWorkingCopy.getTime().getHours(" + String.valueOf(calSetWorkingCopy.getTime().getHours()) + ") < calNow.getTime().getHours(" + String.valueOf(calNow.getTime().getHours()) + ")");
-								calSetWorkingCopy.add(Calendar.DAY_OF_MONTH, 7); //add a week
-							}
-							else if(calSetWorkingCopy.getTime().getHours() == calNow.getTime().getHours())
-							{
-//								Log.i("AlarmManager", "calSetWorkingCopy.getTime().getHours() == calNow.getTime().getHours()");
-								if(calSetWorkingCopy.getTime().getMinutes() <= calNow.getTime().getMinutes())
-								{
-//									Log.i("AlarmManager", "calSetWorkingCopy.getTime().getMinutes() < calNow.getTime().getMinutes()");
-									calSetWorkingCopy.add(Calendar.DAY_OF_MONTH, 7); //add a week
-								}
-							}
-						}
-						else if(diff < 0)
-						{
-//							Miscellaneous.logEvent("i", "AlarmManager", "Adding " + String.valueOf(diff+7) + " on top of " + String.valueOf(calSetWorkingCopy.get(Calendar.DAY_OF_WEEK)));
-							calSetWorkingCopy.add(Calendar.DAY_OF_WEEK, diff+7);	// it's a past weekday, schedule for next week
-						}
-						else
-						{
-//							Miscellaneous.logEvent("i", "AlarmManager", "Adding " + String.valueOf(diff) + " on top of " + String.valueOf(calSetWorkingCopy.get(Calendar.DAY_OF_WEEK)));
-							calSetWorkingCopy.add(Calendar.DAY_OF_WEEK, diff);		// it's a future weekday, schedule for that day
-						}
-						
-						i++;
-						i=(int)System.currentTimeMillis();
-						String calSetWorkingCopyString = sdf.format(calSetWorkingCopy.getTime()) + " RequestCode: " + String.valueOf(i);
-//						Miscellaneous.logEvent("i", "AlarmManager", "Setting repeating alarm because of rule: " + oneRule.getName() + " beginning at " + calSetWorkingCopyString);
-
-						alarmCandidates.add(calSetWorkingCopy.getTimeInMillis());
-//						Intent alarmIntent = new Intent(automationServiceRef, AlarmListener.class);
-//						alarmIntent.setData(Uri.parse("myalarms://" + i));
-//						PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, i, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-//						centralAlarmManagerInstance.setInexactRepeating(AlarmManager.RTC_WAKEUP, calSetWorkingCopy.getTimeInMillis(), milliSecondsInAWeek, alarmPendingIntent);
-//						requestCodeList.add(i);
-					}
-				}
-			}
-		}
-		
-//		// get a Calendar object with current time
-//		Calendar cal = Calendar.getInstance();
-//		cal.add(Calendar.SECOND, 10);
-//		String calSetWorkingCopyString2 = sdf.format(cal.getTime());
-//		Miscellaneous.logEvent("i", "AlarmManager", "Setting repeating alarm because of hardcoded test: beginning at " + calSetWorkingCopyString2);
-//		Intent alarmIntent2 = new Intent(automationServiceRef, AlarmListener.class);
-//		PendingIntent alarmPendingIntent2 = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent2, 0);
-//		centralAlarmManagerInstance.setInexactRepeating(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), 5000, alarmPendingIntent2);
-//		requestCodeList.add(0);
-		
-		scheduleNextAlarm();
-	}
-	
-	private static void scheduleNextAlarm()
-	{
-		Long currentTime = System.currentTimeMillis();
-		Long scheduleCandidate = null;
-		
-		if(alarmCandidates.size() == 0)
-		{
-			Miscellaneous.logEvent("i", "AlarmManager", "No alarms to be scheduled.", 3);
-			return;
-		}
-		else if(alarmCandidates.size() == 1)
-		{
-			// only one alarm, schedule that
-			scheduleCandidate = alarmCandidates.get(0);
-		}
-		else if(alarmCandidates.size() > 1)
-		{
-			scheduleCandidate = alarmCandidates.get(0);
-			
-			for(long alarmCandidate : alarmCandidates)
-			{
-				if(Math.abs(currentTime - alarmCandidate) < Math.abs(currentTime - scheduleCandidate))
-					scheduleCandidate = alarmCandidate;
-			}
-		}
-		
-		Intent alarmIntent = new Intent(automationServiceRef, AlarmListener.class);
-		PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-		centralAlarmManagerInstance.set(AlarmManager.RTC_WAKEUP, scheduleCandidate, alarmPendingIntent);
-		
-
-		SimpleDateFormat sdf = new SimpleDateFormat("E dd.MM.yyyy HH:mm");
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTimeInMillis(scheduleCandidate);        
-        Miscellaneous.logEvent("i", "AlarmManager", "Chose " + sdf.format(calendar.getTime()) + " as next scheduled alarm.", 4);
-		
-	}
-	
-	public static void clearAlarms()
-	{
-		Miscellaneous.logEvent("i", "AlarmManager", "Clearing possibly standing alarms.", 4);
-		for(int requestCode : requestCodeList)
-		{
-			Intent alarmIntent = new Intent(automationServiceRef, AlarmListener.class);
-			PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, requestCode, alarmIntent, 0);
-//			Miscellaneous.logEvent("i", "AlarmManager", "Clearing alarm with request code: " + String.valueOf(requestCode));
-			centralAlarmManagerInstance.cancel(alarmPendingIntent);
-		}
-		requestCodeList.clear();
-	}
-	
-	private static void startAlarmListenerInternal(AutomationService givenAutomationServiceRef)
-	{
-		if(!alarmListenerActive)
-		{
-			Miscellaneous.logEvent("i", "AlarmListener", "Starting alarm listener.", 4);
-			AlarmListener.automationServiceRef = givenAutomationServiceRef;
-			centralAlarmManagerInstance = (AlarmManager)automationServiceRef.getSystemService(automationServiceRef.ALARM_SERVICE);
-//			alarmIntent = new Intent(automationServiceRef, AlarmListener.class);
-//			alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent, 0);
-			alarmListenerActive = true;
-			Miscellaneous.logEvent("i", "AlarmListener", "Alarm listener started.", 4);
-			AlarmListener.setAlarms();
-			
-//			// get a Calendar object with current time
-//			 Calendar cal = Calendar.getInstance();
-//			 // add 5 minutes to the calendar object
-//			 cal.add(Calendar.SECOND, 10);
-//			 centralAlarmManagerInstance.setInexactRepeating(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), 5000, alarmPendingIntent);
-		}
-		else
-			Miscellaneous.logEvent("i", "AlarmListener", "Request to start AlarmListener. But it's already active.", 5);
-	}
-	
-	private static void stopAlarmListenerInternal()
-	{
-		if(alarmListenerActive)
-		{
-			Miscellaneous.logEvent("i", "AlarmListener", "Stopping alarm listener.", 4);
-			clearAlarms();
-//			centralAlarmManagerInstance.cancel(alarmPendingIntent);
-			alarmListenerActive = false;
-		}
-		else
-			Miscellaneous.logEvent("i", "AlarmListener", "Request to stop AlarmListener. But it's not running.", 5);
-	}
-	public static void reloadAlarms()
-	{
-		AlarmListener.setAlarms();
-	}
-	@Override
-	public void startListener(AutomationService automationService)
-	{
-		AlarmListener.startAlarmListener(automationService);
-	}
-	@Override
-	public void stopListener(AutomationService automationService)
-	{
-		AlarmListener.stopAlarmListener(automationService);
-	}
-
-	public static boolean haveAllPermission()
-	{
-		return true;
-	}
-
-	@Override
-	public boolean isListenerRunning()
-	{
-		return isAlarmListenerActive();
-	}
-	@Override
-	public Trigger_Enum[] getMonitoredTrigger()
-	{
-		return new Trigger_Enum[] { Trigger_Enum.timeFrame };
-	}
-
-}

app/src/main/java/com/jens/automation2/receivers/ConnectivityReceiver.java

@@ -112,7 +112,7 @@ public class ConnectivityReceiver extends BroadcastReceiver implements Automatio
 	@SuppressLint("NewApi")
 	public static boolean isAirplaneMode(Context context)
 	{
-	  if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)
+	  	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)
 		{
 		  	int value = android.provider.Settings.System.getInt(context.getContentResolver(), android.provider.Settings.System.AIRPLANE_MODE_ON, 0);
 			return value != 0;

app/src/main/java/com/jens/automation2/receivers/DateTimeListener.java

@@ -0,0 +1,431 @@
+package com.jens.automation2.receivers;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.util.Log;
+
+import androidx.annotation.RequiresApi;
+
+import com.jens.automation2.AutomationService;
+import com.jens.automation2.Miscellaneous;
+import com.jens.automation2.Rule;
+import com.jens.automation2.TimeFrame;
+import com.jens.automation2.Trigger;
+import com.jens.automation2.Trigger.Trigger_Enum;
+
+import java.sql.Time;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
+public class DateTimeListener extends BroadcastReceiver implements AutomationListenerInterface
+{
+	private static AutomationService automationServiceRef;
+	private static AlarmManager centralAlarmManagerInstance;
+//	private static Intent alarmIntent;
+//	private static PendingIntent alarmPendingIntent;
+	private static boolean alarmListenerActive=false;
+	private static ArrayList<ScheduleElement> alarmCandidates = new ArrayList<>();
+	
+	private static ArrayList<Integer> requestCodeList = new ArrayList<Integer>();
+
+	public static void startAlarmListener(final AutomationService automationServiceRef)
+	{		
+		DateTimeListener.startAlarmListenerInternal(automationServiceRef);
+	}
+	public static void stopAlarmListener(Context context)
+	{
+		DateTimeListener.stopAlarmListenerInternal();
+	}
+
+	public static boolean isAlarmListenerActive()
+	{
+		return alarmListenerActive;
+	}
+	
+	@Override
+	public void onReceive(Context context, Intent intent)
+	{
+		Miscellaneous.logEvent("i", "AlarmListener", "Alarm received", 2);
+		Date now = new Date();
+		String timeString = String.valueOf(now.getHours()) + ":" + String.valueOf(now.getMinutes()) + ":" + String.valueOf(now.getSeconds());
+		Time passTime = Time.valueOf(timeString);
+		
+		ArrayList<Rule> allRulesWithNowInTimeFrame = Rule.findRuleCandidatesByTime(passTime);
+		for(int i=0; i<allRulesWithNowInTimeFrame.size(); i++)
+		{
+			if(allRulesWithNowInTimeFrame.get(i).applies(context))
+				allRulesWithNowInTimeFrame.get(i).activate(automationServiceRef, false);
+		}
+		
+		setAlarms();
+	}
+	
+	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
+	public static void setAlarms()
+	{
+		alarmCandidates.clear();
+
+		Calendar calNow = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("E dd.MM.yyyy HH:mm");
+		
+		clearAlarms();
+		
+		int i=0;	
+
+//		// get a Calendar object with current time
+//		Calendar cal = Calendar.getInstance();
+//		// add 5 minutes to the calendar object
+//		cal.add(Calendar.SECOND, 10);
+//		String calSetWorkingCopyString2 = null;
+//		SimpleDateFormat sdf2 = new SimpleDateFormat("E dd.MM.yyyy HH:mm");
+//		if (cal != null)
+//		{
+//			calSetWorkingCopyString2 = sdf2.format(cal.getTime());
+//		}
+//		Miscellaneous.logEvent("i", "AlarmManager", "Setting repeating alarm because of hardcoded test: beginning at " + calSetWorkingCopyString2);
+//		Intent alarmIntent2 = new Intent(automationServiceRef, AlarmListener.class);
+//		PendingIntent alarmPendingIntent2 = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent2, 0);
+//		centralAlarmManagerInstance.setInexactRepeating(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), 5000, alarmPendingIntent2);
+//		requestCodeList.add(0);
+				 
+		ArrayList<Rule> allRulesWithTimeFrames = new ArrayList<Rule>();
+		allRulesWithTimeFrames = Rule.findRuleCandidatesByTimeFrame();
+		/*
+		 * Take care of regular executions, no repetitions in between.
+		 */
+		Miscellaneous.logEvent("i", "DateTimeListener", "Checking rules for single run alarm candidates.", 5);
+		for(Rule oneRule : allRulesWithTimeFrames)
+		{
+			Miscellaneous.logEvent("i", "DateTimeListener","Checking rule " + oneRule.getName() + " for single run alarm candidates.", 5);
+			if(oneRule.isRuleActive())
+			{
+				try
+				{
+					for(Trigger oneTrigger : oneRule.getTriggerSet())
+					{
+						Miscellaneous.logEvent("i", "DateTimeListener","Checking trigger " + oneTrigger.toString() + " for single run alarm candidates.", 5);
+
+						if(oneTrigger.getTriggerType().equals(Trigger_Enum.timeFrame))
+						{
+							TimeFrame tf = new TimeFrame(oneTrigger.getTriggerParameter2());
+
+							Calendar calSet;
+							Time setTime;
+
+							if(oneTrigger.getTriggerParameter())
+								setTime = tf.getTriggerTimeStart();
+							else
+								setTime = tf.getTriggerTimeStop();
+
+							calSet = (Calendar) calNow.clone();
+							calSet.set(Calendar.HOUR_OF_DAY, setTime.getHours());
+							calSet.set(Calendar.MINUTE, setTime.getMinutes());
+							calSet.set(Calendar.SECOND, 0);
+							calSet.set(Calendar.MILLISECOND, 0);
+							// At this point calSet would be a scheduling candidate. It's just the day that might not be right, yet.
+
+							for(int dayOfWeek : tf.getDayList())
+							{
+								Calendar calSetWorkingCopy = (Calendar) calSet.clone();
+
+								int diff = dayOfWeek - calNow.get(Calendar.DAY_OF_WEEK);
+								if(diff == 0) // We're talking about the current weekday, but is the time still in the future?
+								{
+									if(calSetWorkingCopy.getTime().getHours() < calNow.getTime().getHours())
+									{
+										calSetWorkingCopy.add(Calendar.DAY_OF_MONTH, 7); //add a week
+									}
+									else if(calSetWorkingCopy.getTime().getHours() == calNow.getTime().getHours())
+									{
+										if(calSetWorkingCopy.getTime().getMinutes() <= calNow.getTime().getMinutes())
+										{
+											calSetWorkingCopy.add(Calendar.DAY_OF_MONTH, 7); //add a week
+										}
+									}
+								}
+								else if(diff < 0)
+								{
+									calSetWorkingCopy.add(Calendar.DAY_OF_WEEK, diff+7);	// it's a past weekday, schedule for next week
+								}
+								else
+								{
+									calSetWorkingCopy.add(Calendar.DAY_OF_WEEK, diff);		// it's a future weekday, schedule for that day
+								}
+
+								i++;
+								i=(int)System.currentTimeMillis();
+								sdf.format(calSetWorkingCopy.getTime());
+								String.valueOf(i);
+
+								alarmCandidates.add(new ScheduleElement(calSetWorkingCopy, "Rule " + oneRule.getName() + ", trigger " + oneTrigger.toString()));
+							}
+						}
+					}
+				}
+				catch(Exception e)
+				{
+					Miscellaneous.logEvent("e", "DateTimeListener","Error checking anything for rule " + oneRule.toString() + " needs to be added to candicates list: " + Log.getStackTraceString(e), 1);
+				}
+			}
+		}
+
+		/*
+		 * Only take care of repeated executions.
+		 */
+		Miscellaneous.logEvent("i", "DateTimeListener","Checking rules for repeated run alarm candidates.", 5);
+		for(Rule oneRule : allRulesWithTimeFrames)
+		{
+			Miscellaneous.logEvent("i", "DateTimeListener","Checking rule " + oneRule.getName() + " for repeated run alarm candidates.", 5);
+			if(oneRule.isRuleActive())
+			{
+				try
+				{
+					Miscellaneous.logEvent("i", "DateTimeListener","Checking rule " + oneRule.toString() , 5);
+
+					for(Trigger oneTrigger : oneRule.getTriggerSet())
+					{
+						Miscellaneous.logEvent("i", "DateTimeListener","Checking trigger " + oneTrigger.toString() + " for repeated run alarm candidates.", 5);
+						if(oneTrigger.getTriggerType().equals(Trigger_Enum.timeFrame))
+						{
+							Miscellaneous.logEvent("i", "DateTimeListener","Checking rule trigger " + oneTrigger.toString() , 5);
+
+							/*
+							 * Check for next repeated execution:
+							 *
+							 * Check if the rule currently applies....
+							 *
+							 * If no -> do nothing
+							 * If yes -> Take starting time and calculate the next repeated execution
+							 * 	1. Take starting time
+							 * 	2. Take current time
+							 * 	3. Calculate difference, but include check to see if we're after that time,
+							 * 		be it start or end of the timeframe.
+							 * 	4. Take div result +1 and add this on top of starting time
+							 * 	5. Is this next possible execution still inside timeframe? Also consider timeframes spanning over midnight
+							 */
+							Calendar calSet;
+							Time setTime;
+							TimeFrame tf = new TimeFrame(oneTrigger.getTriggerParameter2());
+
+							if(tf.getRepetition() > 0)
+							{
+								if(oneTrigger.applies(calNow))
+								{
+									Calendar calSchedule = getNextRepeatedExecutionAfter(oneTrigger, calNow);
+
+									alarmCandidates.add(new ScheduleElement(calSchedule, "Rule " + oneRule.getName() + ", trigger " + oneTrigger.toString()));
+								}
+							}
+						}
+					}
+				}
+				catch(Exception e)
+				{
+					Miscellaneous.logEvent("e", "DateTimeListener","Error checking anything for rule " + oneRule.toString() + " needs to be added to candicates list: " + Log.getStackTraceString(e), 1);
+				}
+			}
+		}
+		
+		scheduleNextAlarm();
+	}
+	
+	private static void scheduleNextAlarm()
+	{
+		Long currentTime = System.currentTimeMillis();
+		ScheduleElement scheduleCandidate = null;
+		
+		if(alarmCandidates.size() == 0)
+		{
+			Miscellaneous.logEvent("i", "AlarmManager", "No alarms to be scheduled.", 3);
+			return;
+		}
+		else if(alarmCandidates.size() == 1)
+		{
+			// only one alarm, schedule that
+			scheduleCandidate = alarmCandidates.get(0);
+		}
+		else if(alarmCandidates.size() > 1)
+		{
+			scheduleCandidate = alarmCandidates.get(0);
+			
+			for(ScheduleElement alarmCandidate : alarmCandidates)
+			{
+				if(Math.abs(currentTime - alarmCandidate.time.getTimeInMillis()) < Math.abs(currentTime - scheduleCandidate.time.getTimeInMillis()))
+					scheduleCandidate = alarmCandidate;
+			}
+		}
+		
+		Intent alarmIntent = new Intent(automationServiceRef, DateTimeListener.class);
+		PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+		centralAlarmManagerInstance.set(AlarmManager.RTC_WAKEUP, scheduleCandidate.time.getTimeInMillis(), alarmPendingIntent);
+		
+
+		SimpleDateFormat sdf = new SimpleDateFormat("E dd.MM.yyyy HH:mm");
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTimeInMillis(scheduleCandidate.time.getTimeInMillis());
+        Miscellaneous.logEvent("i", "AlarmManager", "Chose " + sdf.format(calendar.getTime()) + " as next scheduled alarm.", 4);
+	}
+	
+	public static void clearAlarms()
+	{
+		Miscellaneous.logEvent("i", "AlarmManager", "Clearing possibly standing alarms.", 4);
+		for(int requestCode : requestCodeList)
+		{
+			Intent alarmIntent = new Intent(automationServiceRef, DateTimeListener.class);
+			PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, requestCode, alarmIntent, 0);
+//			Miscellaneous.logEvent("i", "AlarmManager", "Clearing alarm with request code: " + String.valueOf(requestCode));
+			centralAlarmManagerInstance.cancel(alarmPendingIntent);
+		}
+		requestCodeList.clear();
+	}
+	
+	private static void startAlarmListenerInternal(AutomationService givenAutomationServiceRef)
+	{
+		if(!alarmListenerActive)
+		{
+			Miscellaneous.logEvent("i", "AlarmListener", "Starting alarm listener.", 4);
+			DateTimeListener.automationServiceRef = givenAutomationServiceRef;
+			centralAlarmManagerInstance = (AlarmManager)automationServiceRef.getSystemService(automationServiceRef.ALARM_SERVICE);
+//			alarmIntent = new Intent(automationServiceRef, AlarmListener.class);
+//			alarmPendingIntent = PendingIntent.getBroadcast(automationServiceRef, 0, alarmIntent, 0);
+			alarmListenerActive = true;
+			Miscellaneous.logEvent("i", "AlarmListener", "Alarm listener started.", 4);
+			DateTimeListener.setAlarms();
+			
+//			// get a Calendar object with current time
+//			 Calendar cal = Calendar.getInstance();
+//			 // add 5 minutes to the calendar object
+//			 cal.add(Calendar.SECOND, 10);
+//			 centralAlarmManagerInstance.setInexactRepeating(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), 5000, alarmPendingIntent);
+		}
+		else
+			Miscellaneous.logEvent("i", "AlarmListener", "Request to start AlarmListener. But it's already active.", 5);
+	}
+	
+	private static void stopAlarmListenerInternal()
+	{
+		if(alarmListenerActive)
+		{
+			Miscellaneous.logEvent("i", "AlarmListener", "Stopping alarm listener.", 4);
+			clearAlarms();
+//			centralAlarmManagerInstance.cancel(alarmPendingIntent);
+			alarmListenerActive = false;
+		}
+		else
+			Miscellaneous.logEvent("i", "AlarmListener", "Request to stop AlarmListener. But it's not running.", 5);
+	}
+	public static void reloadAlarms()
+	{
+		DateTimeListener.setAlarms();
+	}
+	@Override
+	public void startListener(AutomationService automationService)
+	{
+		DateTimeListener.startAlarmListener(automationService);
+	}
+	@Override
+	public void stopListener(AutomationService automationService)
+	{
+		DateTimeListener.stopAlarmListener(automationService);
+	}
+
+	public static boolean haveAllPermission()
+	{
+		return true;
+	}
+
+	@Override
+	public boolean isListenerRunning()
+	{
+		return isAlarmListenerActive();
+	}
+	@Override
+	public Trigger_Enum[] getMonitoredTrigger()
+	{
+		return new Trigger_Enum[] { Trigger_Enum.timeFrame };
+	}
+
+	static class ScheduleElement implements Comparable<ScheduleElement>
+	{
+		Calendar time;
+		String reason;
+
+		public ScheduleElement(Calendar timestamp, String reason)
+		{
+			super();
+			this.time = timestamp;
+			this.reason = reason;
+		}
+
+		@Override
+		public int compareTo(ScheduleElement o)
+		{
+			if(time.getTimeInMillis() == o.time.getTimeInMillis())
+				return 0;
+			if(time.getTimeInMillis() < o.time.getTimeInMillis())
+				return -1;
+			else
+				return 1;
+		}
+
+		@Override
+		public String toString()
+		{
+			return Miscellaneous.formatDate(time.getTime()) + ", reason : " + reason;
+		}
+	}
+
+	@RequiresApi(api = Build.VERSION_CODES.N)
+	public static Calendar getNextRepeatedExecutionAfter(Trigger trigger, Calendar now)
+	{
+		Calendar calSet;
+		Time setTime;
+		TimeFrame tf = new TimeFrame(trigger.getTriggerParameter2());
+
+		if(tf.getRepetition() > 0)
+		{
+			if(trigger.getTriggerParameter())
+				setTime = tf.getTriggerTimeStart();
+			else
+				setTime = tf.getTriggerTimeStop();
+
+			calSet = (Calendar) now.clone();
+			calSet.set(Calendar.HOUR_OF_DAY, setTime.getHours());
+			calSet.set(Calendar.MINUTE, setTime.getMinutes());
+			calSet.set(Calendar.SECOND, 0);
+			calSet.set(Calendar.MILLISECOND, 0);
+
+//				if(this.applies(null))
+//				{
+			// If the starting time is a day ahead remove 1 day.
+			if(calSet.getTimeInMillis() > now.getTimeInMillis())
+				calSet.add(Calendar.DAY_OF_MONTH, -1);
+
+			long differenceInSeconds = Math.abs(now.getTimeInMillis() - calSet.getTimeInMillis()) / 1000;
+			long nextExecutionMultiplier = Math.floorDiv(differenceInSeconds, tf.getRepetition()) + 1;
+			long nextScheduleTimestamp = (calSet.getTimeInMillis() / 1000) + (nextExecutionMultiplier * tf.getRepetition());
+			Calendar calSchedule = Calendar.getInstance();
+			calSchedule.setTimeInMillis(nextScheduleTimestamp * 1000);
+
+			/*
+			 * Das war mal aktiviert. Allerdings: Die ganze Funktion liefert zurück, wenn die Regel NOCH nicht
+			 * zutrifft, aber wir z.B. gleich den zeitlichen Bereich betreten.
+			 */
+//					if(trigger.checkDateTime(calSchedule.getTime(), false))
+//					{
+			return calSchedule;
+//					}
+//				}
+		}
+		else
+			Miscellaneous.logEvent("i", "DateTimeListener", "Trigger " + trigger.toString() + " is not executed repeatedly.", 5);
+
+		return null;
+	}
+}

app/src/main/java/com/jens/automation2/receivers/TimeZoneListener.java

@@ -77,12 +77,12 @@ public class TimeZoneListener extends BroadcastReceiver implements AutomationLis
 		if(action.equals(Intent.ACTION_TIMEZONE_CHANGED))
 		{
 			Miscellaneous.logEvent("i", "TimeZoneListener", "Device timezone changed. Reloading alarms.", 3);
-			AlarmListener.reloadAlarms();
+			DateTimeListener.reloadAlarms();
 		}
 		else if(action.equals(Intent.ACTION_TIME_CHANGED))
 		{
 			Miscellaneous.logEvent("i", "TimeZoneListener", "Device time changed. Reloading alarms.", 4);
-			AlarmListener.reloadAlarms();
+			DateTimeListener.reloadAlarms();
 		}		
 	}
 	@Override

app/src/main/res/layout/activity_manage_specific_poi.xml

@@ -57,7 +57,7 @@
                 		android:layout_width="wrap_content"
 			            android:layout_height="wrap_content"
 			            android:ems="10"
-			            android:inputType="numberDecimal" />
+			            android:inputType="numberSigned" />
 			        
 			    </TableRow>
 			
@@ -72,14 +72,14 @@
 			            android:layout_height="wrap_content"
 			            android:text="@string/longitude"
 			            android:textAppearance="?android:attr/textAppearanceMedium" />
-			
-			        <EditText
-			            android:id="@+id/etPoiLongitude"
-			            android:layout_width="wrap_content"
-			            android:layout_height="wrap_content"
-			            android:ems="10"
-			            android:inputType="numberDecimal" />
-			    </TableRow>
+
+					<EditText
+						android:id="@+id/etPoiLongitude"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:ems="10"
+						android:inputType="numberSigned" />
+				</TableRow>
 			    
 				<TableRow
 				    android:layout_width="match_parent"

app/src/main/res/layout/activity_manage_trigger_notification.xml

@@ -45,6 +45,18 @@
 
 			</TableRow>
 
+			<ImageView
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:layout_margin="10dp"
+				android:layout_marginVertical="@dimen/default_margin"
+				android:background="#aa000000" />
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/automationNotificationsIgnored" />
+
 			<TableRow
 				android:layout_marginBottom="@dimen/activity_vertical_margin">
 
@@ -78,6 +90,13 @@
 
 			</TableRow>
 
+			<ImageView
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:layout_margin="10dp"
+				android:layout_marginVertical="@dimen/default_margin"
+				android:background="#aa000000" />
+
 			<TableRow
 				android:layout_marginBottom="@dimen/activity_vertical_margin">
 
@@ -106,6 +125,13 @@
 				</LinearLayout>
 
 			</TableRow>
+
+			<ImageView
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:layout_margin="10dp"
+				android:layout_marginVertical="@dimen/default_margin"
+				android:background="#aa000000" />
 	    
 			<TableRow
 				android:layout_marginBottom="@dimen/activity_vertical_margin">

app/src/main/res/layout/activity_manage_trigger_timeframe.xml

@@ -119,6 +119,34 @@
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:text="@string/sunday" />
+
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_margin="10dp"
+			android:background="#aa000000" />
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal" >
+
+			<CheckBox
+				android:id="@+id/chkRepeat"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/repeatEveryXseconds" />
+
+			<EditText
+				android:id="@+id/etRepeatEvery"
+				android:layout_marginLeft="@dimen/default_margin"
+				android:minWidth="75dp"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:enabled="false"
+				android:inputType="numberSigned" />
+
+		</LinearLayout>
 	
 	    <Button
 	        android:id="@+id/bSaveTimeFrame"

app/src/main/res/layout/main_overview_layout.xml

@@ -332,6 +332,14 @@
 				android:layout_height="wrap_content"
 		        android:layout_gravity="top"
 		        android:text="@string/settings" />
+
+			<Button
+				android:id="@+id/bDonate"
+				android:visibility="gone"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="top"
+				android:text="@string/donate" />
 			
 		</LinearLayout>
 		

app/src/main/res/values-de/strings.xml

@@ -537,7 +537,7 @@
     <string name="notificationTriggerExplanation">Dieser Auslöser reagiert auf Benachrichtigungen anderer Anwendung im Benachrichtigungsbereich von Android (oder wenn diese geschlossen werden). Sie können eine bestimmte Anwendung festlegen, von die Nachricht stammen muß. Wenn nicht, zählt jede Benachrichtigung. Sie können auch Zeichenketten für Titel oder Nachrichteninhalt festlegen, die enthalten sein müssen. Die Groß-/Kleinschreibung wird hierbei nicht berücksichtigt.</string>
     <string name="addParameters">Parameter hinzufügen</string>
     <string name="errorRunningRule">Fehler beim Ausführen einer Regel.</string>
-    <string name="startAppChoiceNote">Hier haben Sie 2 grundsätzliche Optionen:\n\n1. Sie können ein Programm starten, indem Sie eine Activity auswählen.\nStellen Sie sich das so vor, daß Sie ein bestimmtes Fenster einer Anwendung vorauswählen, in das man direkt springt. Behalten Sie im Kopf, daß das nicht immer funktionieren wird. Das liegt daran, daß die Fenster einer Anwendung miteinander interagieren können, sich u.U. Parameter übergeben. Wenn man jetzt ganz kalt in ein bestimmtes Fenster springt, könnte dieses zum Start z.B. bestimmte Parameter erwarten - die fehlen. So könnte es passieren, daß das Fenster zwar versucht zu öffnen, das aber nicht klappt und es somit nie wirlich sichtbar wird. Versuchen Sie\'s trotzdem!\nSie können den Pfad manuell eingeben, sollten aber den Auswählen-Knopf benutzen. Wenn Sie es dennoch manuell eingeben, geben Sie den PackageName ins obere Feld ein und den vollen Pfad der Activity ins untere.\n\n2. Auswahl per Action\nIm Gegensatz zur Auswahl eines bestimmten Fensters, können Sie ein Programm auch über eine Action starten lassen. Stellen Sie sich das so vor als würden Sie in den Wald rufen \"Ich hätte gerne XYZ\" und falls eine Anwendung installiert ist, die das liefern kann, wird sie gestartet. Ein gutes Beispiel wäre zum Beispiel "Browser starten" - es könnten sogar mehrere installiert sein, die das können (aber normalerweise gibts eine, die als Standard eingestellt ist).\nDiese Action müssen Sie manuell eingeben. Der PackageName ist hier optional. Behalten Sie dabei im Auge, daß mögliche Variablen nicht aufgelöst werden. Beispielsweise werden Sie häufig im Internet finden, daß man die Kamera über die Action \"MediaStore.ACTION_IMAGE_CAPTURE\" starten kann. Das ist grundsätzlich nicht richtig, wird aber nicht direkt funktionieren, denn das ist nur eine Variable. Sie müssen dann einen Blick in die Android Dokumentation werfen, wo Sie sehen werden, daß sich hinter dieser Variable eigentlich der Wert \"android.media.action.IMAGE_CAPTURE\" verbirgt. Gibt man diesen in das Feld ein, wird\'s funktionieren.</string>
+    <string name="startAppChoiceNote">Hier haben Sie 2 grundsätzliche Optionen:\n\n1. Sie können ein Programm starten, indem Sie eine Activity auswählen.\nStellen Sie sich das so vor, daß Sie ein bestimmtes Fenster einer Anwendung vorauswählen, in das man direkt springt. Behalten Sie im Kopf, daß das nicht immer funktionieren wird. Das liegt daran, daß die Fenster einer Anwendung miteinander interagieren können, sich u.U. Parameter übergeben. Wenn man jetzt ganz kalt in ein bestimmtes Fenster springt, könnte dieses zum Start z.B. bestimmte Parameter erwarten - die fehlen. So könnte es passieren, daß das Fenster zwar versucht zu öffnen, das aber nicht klappt und es somit nie wirlich sichtbar wird. Versuchen Sie\'s trotzdem!\nSie können den Pfad manuell eingeben, sollten aber den Auswählen-Knopf benutzen. Wenn Sie es dennoch manuell eingeben, geben Sie den PackageName ins obere Feld ein und den vollen Pfad der Activity ins untere.\n\n2. Auswahl per Action\nIm Gegensatz zur Auswahl eines bestimmten Fensters, können Sie ein Programm auch über eine Action starten lassen. Stellen Sie sich das so vor als würden Sie in den Wald rufen \"Ich hätte gerne XYZ\" und falls eine Anwendung installiert ist, die das liefern kann, wird sie gestartet. Ein gutes Beispiel wäre zum Beispiel "Browser starten" - es könnten sogar mehrere installiert sein, die das können (aber normalerweise gibts eine, die als Standard eingestellt ist).\nDiese Action müssen Sie manuell eingeben. Der PackageName ist hier optional. Behalten Sie dabei im Auge, daß mögliche Variablen nicht aufgelöst werden. Beispielsweise werden Sie häufig im Internet finden, daß man die Kamera über die Action \"MediaStore.ACTION_IMAGE_CAPTURE\" starten kann. Das ist grundsätzlich richtig, wird aber nicht direkt funktionieren, denn das ist nur eine Variable. Sie müssen dann einen Blick in die Android Dokumentation werfen, wo Sie sehen werden, daß sich hinter dieser Variable eigentlich der Wert \"android.media.action.IMAGE_CAPTURE\" verbirgt. Gibt man diesen in das Feld ein, wird\'s funktionieren.</string>
     <string name="cantFindSoundFile">Kann die Audiodatei %1$s nicht finden und daher auch nicht abspielen.</string>
     <string name="startAppByActivity">per Activity</string>
     <string name="startAppByAction">per Action</string>
@@ -595,4 +595,21 @@
     <string name="bottom">Unten</string>
     <string name="tabsPlacementSummary">Wol soll die Taskleiste angezeigt werden?</string>
     <string name="tones">Klingeltöne</string>
+    <string name="miscellaneous">Verschiedenes</string>
+    <string name="dnd">Nicht stören</string>
+    <string name="dndOff">Nicht stören aus</string>
+    <string name="dndAlarms">Alarme durchlassen</string>
+    <string name="dndPriority">Prioritätsbenachrichtigungen durchlassen</string>
+    <string name="dndNothing">Nichts durchlassen</string>
+    <string name="repeatEveryXseconds">Alle x Sekunden wiederholen</string>
+    <string name="repeatEveryXsecondsWithVariable">alle %1$s Sekunden wiederholen</string>
+    <string name="donate">Spenden</string>
+    <string name="notice">Hinweis</string>
+    <string name="automationNotificationsIgnored">Wenn Sie keine bestimmte Anwendung auswählen, werden Benachrichtigungen von Automation selbst ignoriert, um Schleifen zu verhindern.</string>
+    <string name="elementSkipped">Ein Element der Konfigurationsdatei konnte nicht gelesen werden. Die Datei könnte von einer neueren Programmversion erstellt worden sein.</string>
+    <string name="permissionsRequiredNotAvailable">Ihre Regeln benötigen Berechtigungen, die die installierte Variante von Automation nicht unterstützt.</string>
+    <string name="dndRemarks">Feineinstellungen (wie Telefonanrufe erlauben, Auswählen bestimmter Telefonnummern, etc.) können nur in den Systemeinstellungen gesetzt werden.</string>
+    <string name="wifiApi30">Weil Google wieder einen weiteren Teil von Android kaputt gemacht hat, können ab API 30 nur noch jede WLANs angezeigt werden, die sich gegenwärtig in Reichweite befinden, nicht mehr alle, zu denen das Gerät einmal verbunden war.</string>
+    <string name="smsDialogNotice">Wenn Sie in diesem Programm noch keine SMS-senden Aktion benutzt haben, zeigt Android wahrscheinlich beim ersten Ausführen einen Bestätigungsdialog an. Sie müssen das Häkchen bei \"Immer erlauben\" setzen und bestätigen, wenn Sie möchten, daß diese Aktion im Hintergrund ausgeführt werden kann. Es wird daher empfohlen, diese Regel einmalig manuell auszuführen, um diesen Dialog zu provozieren.</string>
+    <string name="silentTriggersDnd">Hinweis: Der Stumm-Modus löst auf neuren Geräten häufig die Funktion \"Nicht stören\" aus. Wenn das auf Ihrem Gerät passiert, wird empfohlen stattdessen den Normalen Modus zu verwenden und alle Lautstärken auf 0 zu reduzieren.</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -594,4 +594,7 @@
     <string name="locationEngineDisabledLong">Desafortunadamente su posición todavia no puede ser determinada. Gratitud va para Google por su sabiduria y amabilidad infinita.\n\nDejenme explicarselo mas. Comenzando con Android 10 un nuevo permiso se introdujo que es necesario para determinar la posición en el fondo (que es necesario para una app como esta). Aunque lo considero una buena idea, conlleva a una chicana para desarolladores.\n\nCuando se esta desarrollando una app se puede intentar calificar para este permiso mientras se sigue un catalogo de condiciones. Desafortunadamente nuevas versiones de mi app fueron rechazadas por un periodo de trés meses. Cumplé todas las condiciones, pero Google\'s mierda servicio para desarolladores afirmó que no. Despues de presentar pruebas, que cumplí con todo, recibí una respuesta de \"No puedo ayudarte mas.\". En algun momento me rendí.\n\nComo consecuencia la version Google Play todavia no sabe usar la locación como una condición. Mi única alternativa fue remover la applicación de Google Play.\n\nLo siento mucho, pero hicé todo lo posible para discutir con un support que no sabe aprobar la prueba de Turing repetidamente.\n\nLa noticia positiva: Usted todavia puede tener todo!\n\nAutomation ahora es open source y se puede encontrar en F-Droid. Es un app store que se preocupa por su privacidad - en vez de solo simular eso. Simplemente guarde su configuración, desinstale la app, instale la de F-Droid, restaure su configuración - terminado.\n\nCliquee aqui para averiguar más:</string>
     <string name="startAppChoiceNote">Aqui tiene 2 opciones generales:\\n\\n1. Puede encender un programa seleccionando un activity. Imagine eso como preseleccionar una pantalla/ventana especifica de una aplicación. Tenga en cuenta que no siempre funcionará. Eso es porque las ventanas de una app pueden interactuar entre ellas, por ejemplo dar parametros. Si se abre una ventana especifica directamente esta interacción todavia no ha ocurrido y la ventana se podría cerrar al instante (por lo tanto nunca será presentada). Pruebe esto sin embargo! Puede introducir una trayectoria de una activity manualmente, pero es recomendable usar el boton \"Elegir\". Si decide introducir la trayectoria de la app manualmente en la casilla de arriba y la trayectoria completa de una activity en la de abajo.\\n\\n2.Elección con action\\nContrariamente a elegir una ventana especifica, tambien puede encender una app con un action. Es similar a llamar \"Queria xyz\" y si hay una app que le puede ayudar a usted sera encendida. Un ejemplo bueno seria \"abrir browser\" - podria tener multiples (una normalemente es el valor predeterminado). Usted necesita introducirlo manualmente, PackageName es opcional aqui. Tenga en cuenta las variables no seran resueltas. Si por ejemplo quiere encender la camara usando \"MediaStore.ACTION_IMAGE_CAPTURE\" no va a funcionar. Tiene que mirar en la documentación de Android y usar el valor real de esta variable que - en este ejemplo - seria \"android.media.action.IMAGE_CAPTURE\".</string>
     <string name="tones">Sonidos</string>
+    <string name="dnd">No interrumpir</string>
+    <string name="donate">Donar</string>
+    <string name="notice">Nota</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -587,4 +587,5 @@
     <string name="noLocationCouldBeFound">Nessuna posizione è stata trovata dopo un tempo di attesa di %1$s seconds.</string>
     <string name="pleaseGiveBgLocation">Nella schermata successiva vai su permessi, poi posizione. Lì seleziona \"Consenti sempre\" per permettere ad Automation di determinare la tua posizione in secondo piano.</string>
     <string name="tones">Suonerias</string>
+    <string name="dnd">Non disturbare</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -158,6 +158,7 @@
     <string name="actionSetBluetooth">Bluetooth</string>
     <string name="actionSetUsbTethering">USB Tethering</string>
     <string name="actionSetWifiTethering">Wifi Tethering</string>
+    <string name="actionSetBluetoothTethering">Bluetooth Tethering</string>
     <string name="actionSetDisplayRotation">Display rotation</string>
     <string name="actionTurnWifiOn">turn Wifi on</string>
     <string name="actionTurnWifiOff">turn Wifi off</string>
@@ -169,6 +170,8 @@
     <string name="actionTurnUsbTetheringOff">turn USB Tethering off</string>
     <string name="actionTurnWifiTetheringOn">turn Wifi Tethering on</string>
     <string name="actionTurnWifiTetheringOff">turn Wifi Tethering off</string>
+    <string name="actionTurnBluetoothTetheringOn">turn Bluetooth Tethering on</string>
+    <string name="actionTurnBluetoothTetheringOff">turn Bluetooth Tethering off</string>
     <string name="actionTurnAirplaneModeOn">turn airplane mode on</string>
     <string name="actionTurnAirplaneModeOff">turn airplane mode off</string>
     <string name="actionEnableScreenRotation">enable screen rotation</string>
@@ -690,8 +693,8 @@
     <string name="bottom">Bottom</string>
     <string name="tabsPlacement">Position of tab bar</string>
     <string name="tabsPlacementSummary">Choose where the tabs bar should be placed.</string>
-    <string name="wifiApi30">Because Google screwd up yet another part of Android, starting with API 30 only the currently visible wifis can be displayed. Not all the ones your device knows.</string>
-    <string name="smsDialogNotice">If you have not used a send-sms action in this program before, Android may show an additional confirmation dialog, asking you to allow sending messages. You need to select the \"always allow\" checkbox and confirm if you want this action to work in the background. It\'s advised to run this rule manually once.</string>
+    <string name="wifiApi30">Because Google screwed up yet another part of Android, starting with API 30 only the currently visible wifis can be displayed, not all the ones your device has connected to anymore.</string>
+    <string name="smsDialogNotice">If you have not used a send-sms action in this program before, Android may show an additional confirmation dialog, asking you to allow sending messages. You need to select the \"always allow\" checkbox and confirm if you want this action to work in the background. It\'s advised to run this rule manually once to provoke this confirmation dialog.</string>
     <string name="silentTriggersDnd">REMARK: The silent mode often triggers Do-Not-Disturb on newer devices. If that happens on your device, I recommend using the normal mode instead and lowering all volumes to zero.</string>
     <string name="tones">Tones</string>
     <string name="miscellaneous">Miscellaneous</string>
@@ -702,4 +705,12 @@
     <string name="dndNothing">Let nothing through</string>
     <string name="dndRemarks">Fine tuning (like allowing phone calls, picking specific numbers, etc.) can only be done from the system\'s settings.</string>
     <string name="permissionsRequiredNotAvailable">Your rules required permissions which cannot be requested from this installed flavor of Automation.</string>
+    <string name="automationNotificationsIgnored">If you do not choose a specific app, but choose \"Any app\", notifications from Automation will be ignored to avoid loops.</string>
+    <string name="repeatEveryXseconds">Repeat every x seconds</string>
+    <string name="repeatEveryXsecondsWithVariable">repeat every %1$s seconds</string>
+    <string name="enterRepetitionTime">You need to enter a positive non-decimal value for reptition time.</string>
+    <string name="elementSkipped">An element of the configuration file could not be read. The file may have been created by a newer program version.</string>
+    <string name="donate">Donate</string>
+    <string name="btTetheringNotice">This feature is confirmed to work up until Android 8.0. From some higher version upwards it ceases to work, but due to a lack of physical devices I cannot tell which one that is. On Android 11 it definitely ain\'t working anymore. If you have a version in between please let me know if it\'s working or not.</string>
+    <string name="notice">Notice</string>
 </resources>

fastlane/metadata/android/de-DE/changelogs/113.txt

@@ -0,0 +1,6 @@
+* Fehler beim Erstellen einer Text-sprechen-Aktion behoben
+* Fehler beim Hinzufügen eines Benachrichtigungs-Auslösers behoben
+* Behoben: "beim Anrufen vibrieren" in Profilen hatte nicht funktioniert
+* Hinzugefügt: "Nicht stören" kann nun in Profilen gesteuert werden.
+* USB Router für Android 9 und höher unterstützt (benötigt root)
+* Berechtigung READ_EXTERNAL_STORAGE für Regeln hinzugefügt, die Tondateien abspielen.

fastlane/metadata/android/de-DE/full_description.txt

@@ -25,6 +25,7 @@ Mögliche Aktionen:
 * Bluetooth ein-/ausschalten
 * USB Router ein-/ausschalten
 * WLAN Router ein-/ausschalten
+* Bluetooth Router ein-/ausschalten
 * Bildschirmdrehung ein-/ausschalten
 * HTTP Request im Hintergrund auslösen
 * Klingelton und Toneinstellungen ändern
@@ -45,7 +46,7 @@ Wenn also eine bestimmte Funktion nicht so tut wie sie sollte - lassen Sie es mi
 Wenn Sie ein Problem mit der Anwendung haben und mich dazu kontaktieren möchten, updaten Sie bitte vorher auf die neueste Version und schauen Sie, ob Ihr Problem darin auch besteht.
 
 Spenden sind sicher eine gute, aber nicht die einzige Möglichkeit mich zu motivieren :-)
-* Wer mir etwas Gutes tun will, kann die Anwendung auch im Play Store bewerten.
+* Wer mir etwas Gutes tun will, kann die Anwendung auch im Play Store bewerten (https://play.google.com/store/apps/details?id=com.jens.automation2).
 * Außerdem ist Hilfe bei der Übersetzung willkommen. Englisch, Spanisch und Deutsch kann ich selbst. Aber sonst ist alles gern gesehen.
 
 Erklärungen zu den vielen Berechtigungen können hier abgerufen werden: https://server47.de/automation/permissions_de.html

fastlane/metadata/android/en-US/changelogs/113.txt

@@ -0,0 +1,6 @@
+* Fixed bug in adding speakText action
+* Fixed bug in adding notification trigger
+* Fixed: vibrateWhenRinging setting in profiles didn't save nor activate
+* Added: Do not disturb can be controlled in a profile
+* Enabled USB Tethering for Android 9 and above (requires root)
+* Added permission READ_EXTERNAL_STORAGE for rules that play sound files.

fastlane/metadata/android/en-US/full_description.txt

@@ -25,6 +25,7 @@ Supported actions:
 * Change bluetooth state
 * Toggle USB tethering
 * Toggle wifi tethering
+* Toggle Bluetooth tethering
 * Toggle automatic screen rotation
 * Make an HTTP request
 * Change ringtone/sound setting
@@ -45,7 +46,7 @@ So if a certain feature is not working on your device - let me know. Over the ye
 If you have a problem and think about contacting me please update to the latest version first and see if your problem persists there, too.
 
 Donations are certainly a good, but not the only way to motivate me :-)
-* If you'd like to support me, you can also leave a positive review for the app on Google Play.
+* If you'd like to support me, you can also leave a positive review for the app on Google Play (https://play.google.com/store/apps/details?id=com.jens.automation2).
 * Furthermore I can always use help in translating the app. English, German and some Spanish are among my own skills. But everything else is more than welcome.
 
 Explanation of the many permissions can be found here: https://server47.de/automation/permissions_en.html

fastlane/metadata/android/es-ES/changelogs/113.txt

@@ -0,0 +1,6 @@
+* Se ha corregido un error al agregar la acción speakText
+* Se ha corregido un error en la adición de un disparador de notificación
+* Corregido: vibrarCuando la configuración deRinging en los perfiles no se guardó ni se activó
+* Añadido: No molestar se puede controlar en un perfil
+* Conexión USB habilitada para Android 9 y superior (requiere root)
+* Se agregó permiso READ_EXTERNAL_STORAGE para las reglas que reproducen archivos de sonido.

fastlane/metadata/android/es-ES/full_description.txt

@@ -25,6 +25,7 @@ Supported actions:
 * Pasar de bluetooth
 * Pasar USB rúter
 * Pasar wifi rúter
+* Pasar Bluetooth rúter
 * Pasar rotación automatica del monitor
 * Hacer un solicitud HTTP
 * Cambiar el tono de llamada / ajustes de sonido
@@ -45,7 +46,7 @@ Si una función no funcióna - digame. En muchos años resolvaba la mayoria de l
 Si tiene un problema y considera contactarme update a la ultima version al primero y probar si su problam persiste.
 
 Donaciónes seguramente son una buena, pero no la unica posibilidad de apoyarme :-)
-* Si quiere apoyarme puedes escribir un buena revisión en Google Play
+* Si quiere apoyarme puedes escribir un buena revisión en Google Play (https://play.google.com/store/apps/details?id=com.jens.automation2).
 * Además siempre necesito ayuda en traduciendo la app. Ingles, Aleman y Español  estan en mis habilidades. Per todo lo demás es bienvenido.
 
 Puedes leer una explicación de los permisos aqui: https://server47.de/automation/permissions_en.html

fastlane/metadata/android/it-IT/changelogs/113.txt

@@ -0,0 +1,6 @@
+* Corretto bug nell'aggiunta dell'azione speakText
+* Risolto bug nell'aggiunta del trigger di notifica
+* Risolto: vibrazioneQuando l'impostazioneringing nei profili non è stata salvata né attivata
+* Aggiunto: Non disturbare può essere controllato in un profilo
+* Tethering USB abilitato per Android 9 e versioni successive (richiede root)
+* Aggiunta la READ_EXTERNAL_STORAGE delle autorizzazioni per le regole che riproduceno file audio.