v118

app/build.gradle

@@ -28,10 +28,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
 
     flavorDimensions "version"
 
@@ -57,6 +53,10 @@ android {
             targetSdkVersion 28
         }
     }
+    lint {
+        abortOnError false
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {

app/googlePlayFlavor/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 116,
-      "versionName": "1.7.2-googlePlay",
+      "versionCode": 118,
+      "versionName": "1.7.4-googlePlay",
       "outputFile": "app-googlePlayFlavor-release.apk"
     }
   ],

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

@@ -5,6 +5,7 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
@@ -21,8 +22,7 @@ import java.util.List;
 public class Rule implements Comparable<Rule>
 {
 	private static ArrayList<Rule> ruleCollection = new ArrayList<Rule>();
-	public static boolean isAnyRuleActive = false;
-	
+
 	private static List<Rule> ruleRunHistory = new ArrayList<Rule>();
 	
 	public static List<Rule> getRuleRunHistory()
@@ -312,19 +312,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:
@@ -351,7 +344,10 @@ public class Rule implements Comparable<Rule>
 		if(applies(context))
 		{
 			if(hasNotAppliedSinceLastExecution())
+			{
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " applies and has flipped since its last execution.", 4);
 				return true;
+			}
 			else
 				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " has not flipped since its last execution.", 4);
 		}
@@ -433,7 +429,7 @@ public class Rule implements Comparable<Rule>
 			
 			Thread.setDefaultUncaughtExceptionHandler(Miscellaneous.uncaughtExceptionHandler);
 
-			// without this line debugger will - for some reason - skip all breakpoints in this class
+			// without this line the debugger will - for some reason - skip all breakpoints in this class
 			if(android.os.Debug.isDebuggerConnected())
 				android.os.Debug.waitForDebugger();
 			
@@ -441,7 +437,7 @@ public class Rule implements Comparable<Rule>
 	        	Looper.prepare();
 
 			setLastExecution(Calendar.getInstance());
-			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0]);
 
 			return null;
 		}
@@ -476,66 +472,57 @@ public class Rule implements Comparable<Rule>
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected boolean activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService)
 		{
-			boolean isActuallyToggable = isActuallyToggable();
+			boolean isActuallyToggleable = isActuallyToggable();
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
-			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean doToggle = ruleToggle && isActuallyToggleable;
 
-			//if(notLastActive || force || doToggle)
-//			if(force || doToggle)
-//			{
-				String message;
-				if(!doToggle)
-					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
-				else
-					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
-				Miscellaneous.logEvent("i", "Rule", message, 2);
-//				automationService.speak(message);
-//				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
-				if(Settings.startNewThreadForRuleActivation)
-					publishProgress(message);
+			String message;
+			if(!doToggle)
+				message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+			else
+				message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 
-				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-				{
-					try
-					{
-						Rule.this.getActionSet().get(i).run(automationService, doToggle);
-					}
-					catch(Exception e)
-					{
-						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
-					}
-				}
+			Miscellaneous.logEvent("i", "Rule", message, 2);
 
-				// Keep log of last x rule activations (Settings)
+			if(Settings.startNewThreadForRuleActivation)
+				publishProgress(message);
+
+			for(int i = 0; i< Rule.this.getActionSet().size(); i++)
+			{
 				try
 				{
-					Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
-					Rule.lastActivatedRuleActivationTime = new Date();
-
-					while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
-						ruleRunHistory.remove(ruleRunHistory.size()-1);
-					String history = "";
-					for(Rule rule : ruleRunHistory)
-						history += rule.getName() + ", ";
-					if(history.length() > 0)
-						history = history.substring(0, history.length()-2);
-					Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+					Rule.this.getActionSet().get(i).run(automationService, doToggle);
 				}
 				catch(Exception e)
 				{
-					Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+					Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
 				}
+			}
 
-				Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
-//			}
-//			else
-//			{
-//				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
-//				return false;
-//			}
+			// Keep log of last x rule activations (Settings)
+			try
+			{
+				Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
+				Rule.lastActivatedRuleActivationTime = new Date();
+
+				while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
+					ruleRunHistory.remove(ruleRunHistory.size()-1);
+				String history = "";
+				for(Rule rule : ruleRunHistory)
+					history += rule.getName() + ", ";
+				if(history.length() > 0)
+					history = history.substring(0, history.length()-2);
+				Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+			}
+
+			Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
 
 			return true;
 		}
@@ -544,7 +531,10 @@ public class Rule implements Comparable<Rule>
 	public void activate(AutomationService automationService, boolean force)
 	{
 		ActivateRuleTask task = new ActivateRuleTask();
-		task.execute(automationService, force);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+			task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
+		else
+			task.execute(automationService, force);
 	}
 
 	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
@@ -553,13 +543,13 @@ public class Rule implements Comparable<Rule>
 
 		for(Rule oneRule : ruleCollection)
 		{
-			innerloop:
+			innerLoop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
 				if(oneTrigger.getTriggerType().equals(triggerType))
 				{
 					ruleCandidates.add(oneRule);
-					break innerloop; // we don't need to check the other triggers in the same rule
+					break innerLoop; // we don't need to check the other triggers in the same rule
 				}
 			}
 		}

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

@@ -5,6 +5,7 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
@@ -18,8 +19,7 @@ import java.util.List;
 public class Rule implements Comparable<Rule>
 {
 	private static ArrayList<Rule> ruleCollection = new ArrayList<Rule>();
-	public static boolean isAnyRuleActive = false;
-	
+
 	private static List<Rule> ruleRunHistory = new ArrayList<Rule>();
 	
 	public static List<Rule> getRuleRunHistory()
@@ -309,19 +309,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:
@@ -348,7 +341,10 @@ public class Rule implements Comparable<Rule>
 		if(applies(context))
 		{
 			if(hasNotAppliedSinceLastExecution())
+			{
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " applies and has flipped since its last execution.", 4);
 				return true;
+			}
 			else
 				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " has not flipped since its last execution.", 4);
 		}
@@ -406,7 +402,7 @@ public class Rule implements Comparable<Rule>
 			
 			Thread.setDefaultUncaughtExceptionHandler(Miscellaneous.uncaughtExceptionHandler);
 
-			// without this line debugger will - for some reason - skip all breakpoints in this class
+			// without this line the debugger will - for some reason - skip all breakpoints in this class
 			if(android.os.Debug.isDebuggerConnected())
 				android.os.Debug.waitForDebugger();
 			
@@ -414,7 +410,7 @@ public class Rule implements Comparable<Rule>
 	        	Looper.prepare();
 
 			setLastExecution(Calendar.getInstance());
-			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0]);
 
 			return null;
 		}
@@ -449,66 +445,57 @@ public class Rule implements Comparable<Rule>
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected boolean activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService)
 		{
-			boolean isActuallyToggable = isActuallyToggable();
+			boolean isActuallyToggleable = isActuallyToggable();
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
-			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean doToggle = ruleToggle && isActuallyToggleable;
 
-			//if(notLastActive || force || doToggle)
-//			if(force || doToggle)
-//			{
-				String message;
-				if(!doToggle)
-					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
-				else
-					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
-				Miscellaneous.logEvent("i", "Rule", message, 2);
-//				automationService.speak(message);
-//				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
-				if(Settings.startNewThreadForRuleActivation)
-					publishProgress(message);
+			String message;
+			if(!doToggle)
+				message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+			else
+				message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 
-				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-				{
-					try
-					{
-						Rule.this.getActionSet().get(i).run(automationService, doToggle);
-					}
-					catch(Exception e)
-					{
-						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
-					}
-				}
+			Miscellaneous.logEvent("i", "Rule", message, 2);
 
-				// Keep log of last x rule activations (Settings)
+			if(Settings.startNewThreadForRuleActivation)
+				publishProgress(message);
+
+			for(int i = 0; i< Rule.this.getActionSet().size(); i++)
+			{
 				try
 				{
-					Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
-					Rule.lastActivatedRuleActivationTime = new Date();
-
-					while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
-						ruleRunHistory.remove(ruleRunHistory.size()-1);
-					String history = "";
-					for(Rule rule : ruleRunHistory)
-						history += rule.getName() + ", ";
-					if(history.length() > 0)
-						history = history.substring(0, history.length()-2);
-					Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+					Rule.this.getActionSet().get(i).run(automationService, doToggle);
 				}
 				catch(Exception e)
 				{
-					Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+					Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
 				}
+			}
 
-				Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
-//			}
-//			else
-//			{
-//				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
-//				return false;
-//			}
+			// Keep log of last x rule activations (Settings)
+			try
+			{
+				Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
+				Rule.lastActivatedRuleActivationTime = new Date();
+
+				while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
+					ruleRunHistory.remove(ruleRunHistory.size()-1);
+				String history = "";
+				for(Rule rule : ruleRunHistory)
+					history += rule.getName() + ", ";
+				if(history.length() > 0)
+					history = history.substring(0, history.length()-2);
+				Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+			}
+
+			Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
 
 			return true;
 		}
@@ -517,7 +504,10 @@ public class Rule implements Comparable<Rule>
 	public void activate(AutomationService automationService, boolean force)
 	{
 		ActivateRuleTask task = new ActivateRuleTask();
-		task.execute(automationService, force);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+			task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
+		else
+			task.execute(automationService, force);
 	}
 
 	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
@@ -526,13 +516,13 @@ public class Rule implements Comparable<Rule>
 
 		for(Rule oneRule : ruleCollection)
 		{
-			innerloop:
+			innerLoop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
 				if(oneTrigger.getTriggerType().equals(triggerType))
 				{
 					ruleCandidates.add(oneRule);
-					break innerloop; // we don't need to check the other triggers in the same rule
+					break innerLoop; // we don't need to check the other triggers in the same rule
 				}
 			}
 		}

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

@@ -5,6 +5,7 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
@@ -21,8 +22,7 @@ import java.util.List;
 public class Rule implements Comparable<Rule>
 {
 	private static ArrayList<Rule> ruleCollection = new ArrayList<Rule>();
-	public static boolean isAnyRuleActive = false;
-	
+
 	private static List<Rule> ruleRunHistory = new ArrayList<Rule>();
 	
 	public static List<Rule> getRuleRunHistory()
@@ -312,19 +312,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:
@@ -351,7 +344,10 @@ public class Rule implements Comparable<Rule>
 		if(applies(context))
 		{
 			if(hasNotAppliedSinceLastExecution())
+			{
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " applies and has flipped since its last execution.", 4);
 				return true;
+			}
 			else
 				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " has not flipped since its last execution.", 4);
 		}
@@ -433,7 +429,7 @@ public class Rule implements Comparable<Rule>
 			
 			Thread.setDefaultUncaughtExceptionHandler(Miscellaneous.uncaughtExceptionHandler);
 
-			// without this line debugger will - for some reason - skip all breakpoints in this class
+			// without this line the debugger will - for some reason - skip all breakpoints in this class
 			if(android.os.Debug.isDebuggerConnected())
 				android.os.Debug.waitForDebugger();
 			
@@ -441,7 +437,7 @@ public class Rule implements Comparable<Rule>
 	        	Looper.prepare();
 
 			setLastExecution(Calendar.getInstance());
-			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0]);
 
 			return null;
 		}
@@ -476,66 +472,57 @@ public class Rule implements Comparable<Rule>
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected boolean activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService)
 		{
-			boolean isActuallyToggable = isActuallyToggable();
+			boolean isActuallyToggleable = isActuallyToggable();
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
-			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean doToggle = ruleToggle && isActuallyToggleable;
 
-			//if(notLastActive || force || doToggle)
-//			if(force || doToggle)
-//			{
-				String message;
-				if(!doToggle)
-					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
-				else
-					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
-				Miscellaneous.logEvent("i", "Rule", message, 2);
-//				automationService.speak(message);
-//				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
-				if(Settings.startNewThreadForRuleActivation)
-					publishProgress(message);
+			String message;
+			if(!doToggle)
+				message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+			else
+				message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 
-				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-				{
-					try
-					{
-						Rule.this.getActionSet().get(i).run(automationService, doToggle);
-					}
-					catch(Exception e)
-					{
-						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
-					}
-				}
+			Miscellaneous.logEvent("i", "Rule", message, 2);
 
-				// Keep log of last x rule activations (Settings)
+			if(Settings.startNewThreadForRuleActivation)
+				publishProgress(message);
+
+			for(int i = 0; i< Rule.this.getActionSet().size(); i++)
+			{
 				try
 				{
-					Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
-					Rule.lastActivatedRuleActivationTime = new Date();
-
-					while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
-						ruleRunHistory.remove(ruleRunHistory.size()-1);
-					String history = "";
-					for(Rule rule : ruleRunHistory)
-						history += rule.getName() + ", ";
-					if(history.length() > 0)
-						history = history.substring(0, history.length()-2);
-					Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+					Rule.this.getActionSet().get(i).run(automationService, doToggle);
 				}
 				catch(Exception e)
 				{
-					Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+					Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
 				}
+			}
 
-				Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
-//			}
-//			else
-//			{
-//				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
-//				return false;
-//			}
+			// Keep log of last x rule activations (Settings)
+			try
+			{
+				Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
+				Rule.lastActivatedRuleActivationTime = new Date();
+
+				while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
+					ruleRunHistory.remove(ruleRunHistory.size()-1);
+				String history = "";
+				for(Rule rule : ruleRunHistory)
+					history += rule.getName() + ", ";
+				if(history.length() > 0)
+					history = history.substring(0, history.length()-2);
+				Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+			}
+
+			Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
 
 			return true;
 		}
@@ -544,7 +531,10 @@ public class Rule implements Comparable<Rule>
 	public void activate(AutomationService automationService, boolean force)
 	{
 		ActivateRuleTask task = new ActivateRuleTask();
-		task.execute(automationService, force);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+			task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
+		else
+			task.execute(automationService, force);
 	}
 
 	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
@@ -553,13 +543,13 @@ public class Rule implements Comparable<Rule>
 
 		for(Rule oneRule : ruleCollection)
 		{
-			innerloop:
+			innerLoop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
 				if(oneTrigger.getTriggerType().equals(triggerType))
 				{
 					ruleCandidates.add(oneRule);
-					break innerloop; // we don't need to check the other triggers in the same rule
+					break innerLoop; // we don't need to check the other triggers in the same rule
 				}
 			}
 		}

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

@@ -199,6 +199,7 @@ public class ActivityMainRules extends ActivityGeneric
 							AutomationService runContext = AutomationService.getInstance();
 							if(runContext != null)
 							{
+								Miscellaneous.logEvent("i", "ActivityMainRules", "Initiating manual execution of rule " + ruleThisIsAbout.getName(), 3);
 								ruleThisIsAbout.activate(runContext, true);
 								break;
 							}

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

@@ -42,7 +42,7 @@ public class ActivityMainScreen extends ActivityGeneric
 
 	ToggleButton toggleService, tbLockSound;
 	Button bShowHelp, bPrivacy, bAddSoundLockTIme, bDonate, bControlCenter;
-	TextView tvActivePoi, tvClosestPoi, tvLastRule, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvLockSoundDuration;
+	TextView tvActivePoi, tvClosestPoi, tvLastRule, tvLastProfile, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvLockSoundDuration;
 
 	ListView lvRuleHistory;
 	ArrayAdapter<Rule> ruleHistoryListViewAdapter;
@@ -68,7 +68,8 @@ public class ActivityMainScreen extends ActivityGeneric
 		tvActivePoi = (TextView) findViewById(R.id.tvActivePoi);
 		tvClosestPoi = (TextView) findViewById(R.id.tvClosestPoi);
 		lvRuleHistory = (ListView) findViewById(R.id.lvRuleHistory);
-		tvLastRule = (TextView) findViewById(R.id.tvTimeFrameHelpText);
+		tvLastRule = (TextView) findViewById(R.id.tvLastRule);
+		tvLastProfile = (TextView)findViewById(R.id.tvLastProfile);
 		tvMainScreenNotePermissions = (TextView) findViewById(R.id.tvMainScreenNotePermissions);
 		tvMainScreenNoteFeaturesFromOtherFlavor = (TextView) findViewById(R.id.tvMainScreenNoteFeaturesFromOtherFlavor);
 		tvMainScreenNoteLocationImpossibleBlameGoogle = (TextView) findViewById(R.id.tvMainScreenNoteLocationImpossibleBlameGoogle);
@@ -365,6 +366,16 @@ public class ActivityMainScreen extends ActivityGeneric
 				{
 					activityMainScreenInstance.tvLastRule.setText("n./a.");
 				}
+
+				try
+				{
+					activityMainScreenInstance.tvLastProfile.setText(Profile.getLastActivatedProfile().getName());
+					activityMainScreenInstance.updateListView();
+				}
+				catch (Exception e)
+				{
+					activityMainScreenInstance.tvLastProfile.setText("n./a.");
+				}
 			}
 			else
 			{
@@ -373,6 +384,7 @@ public class ActivityMainScreen extends ActivityGeneric
 				activityMainScreenInstance.tvActivePoi.setText(activityMainScreenInstance.getResources().getString(R.string.serviceNotRunning));
 				activityMainScreenInstance.tvClosestPoi.setText("");
 				activityMainScreenInstance.tvLastRule.setText("");
+				activityMainScreenInstance.tvLastProfile.setText("");
 			}
 
 //			uiUpdateRunning = true;

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

@@ -458,29 +458,17 @@ public class Profile implements Comparable<Profile>
 
 	public boolean delete(Context context)
 	{
-		if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.profileActive))
+		Rule usingRule = this.isInUseByRules();
+		if(usingRule != null)
 		{
-			for (Rule rule : Rule.findRuleCandidatesByTriggerProfile(this))
-			{
-				Toast.makeText(context, String.format(context.getResources().getString(R.string.ruleXIsUsingProfileY), rule.getName(), this.getName()), Toast.LENGTH_LONG).show();
-				return false;
-			}
-		}
-		else if(Rule.isAnyRuleUsing(Action_Enum.changeSoundProfile))
-		{
-			for (Rule rule : Rule.findRuleCandidatesByActionProfile(this))
-			{
-				Toast.makeText(context, String.format(context.getResources().getString(R.string.ruleXIsUsingProfileY), rule.getName(), this.getName()), Toast.LENGTH_LONG).show();
-				return false;
-			}
+			Toast.makeText(context, String.format(context.getResources().getString(R.string.ruleXIsUsingProfileY), usingRule.getName(), this.getName()), Toast.LENGTH_LONG).show();
+			return false;
 		}
 		else
 		{
 			profileCollection.remove(this);
 			return XmlFileInterface.writeFile();
 		}
-
-		return false;
 	}
 
 	private boolean plausibilityCheck()
@@ -776,4 +764,11 @@ public class Profile implements Comparable<Profile>
 		return this.oldName;
 	}
 
+	public static Profile getLastActivatedProfile()
+	{
+		if(Profile.profileActivationHistory != null && Profile.profileActivationHistory.size() > 0)
+			return Profile.profileActivationHistory.get(Profile.profileActivationHistory.size() - 1);
+		else
+			return null;
+	}
 }

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

@@ -1548,7 +1548,6 @@ public class Trigger
 				}
 
 				returnString.append(String.format(Miscellaneous.getAnyContext().getString(R.string.screenIs), state));
-
 				break;
 			default:
 				returnString.append("error");

app/src/main/java/com/jens/automation2/location/LocationProvider.java

@@ -189,7 +189,7 @@ public class LocationProvider
                             /*
                                 Due to strange factors the time difference might be 0 resulting in mathematical error.
                              */
-								if (Double.isInfinite(currentSpeed) | Double.isNaN(currentSpeed))
+								if (Double.isInfinite(currentSpeed) || Double.isNaN(currentSpeed))
 									Miscellaneous.logEvent("i", "Speed", "Error while calculating speed.", 4);
 								else
 								{
@@ -240,7 +240,7 @@ public class LocationProvider
 
 		if(Settings.positioningEngine == 0)
 		{
-			if(Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) | Rule.isAnyRuleUsing(Trigger_Enum.speed))
+			if(Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) || Rule.isAnyRuleUsing(Trigger_Enum.speed))
 			{
 				// startCellLocationChangedReceiver
 				if (CellLocationChangedReceiver.isCellLocationChangedReceiverPossible())
@@ -424,7 +424,7 @@ public class LocationProvider
 		}
 
 		// *********** RULE CHANGES ***********
-		if(!CellLocationChangedReceiver.isCellLocationListenerActive() && (Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) | Rule.isAnyRuleUsing(Trigger_Enum.speed)))
+		if(!CellLocationChangedReceiver.isCellLocationListenerActive() && (Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) || Rule.isAnyRuleUsing(Trigger_Enum.speed)))
 		{
 			Miscellaneous.logEvent("i", "LocationProvider", "Starting NoiseListener CellLocationChangedReceiver because used in a new/changed rule.", 4);
 			if(CellLocationChangedReceiver.haveAllPermission())

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

@@ -216,23 +216,26 @@ public class NfcReceiver
         }
  
         NdefMessage ndefMessage = ndef.getCachedNdefMessage();
- 
-        NdefRecord[] records = ndefMessage.getRecords();
-        for (NdefRecord ndefRecord : records)
-        {
-            if (ndefRecord.getTnf() == NdefRecord.TNF_WELL_KNOWN && Arrays.equals(ndefRecord.getType(), NdefRecord.RTD_TEXT))
-            {
-                try
-                {
-                    return readText(ndefRecord);
-                }
-                catch (UnsupportedEncodingException e)
-                {
-                    Miscellaneous.logEvent("w", "NFC", "Unsupported Encoding: " +  Log.getStackTraceString(e), 3);
-                }
-            }
-        }
- 
+
+        if(ndefMessage != null)
+		{
+			NdefRecord[] records = ndefMessage.getRecords();
+			for (NdefRecord ndefRecord : records)
+			{
+				if (ndefRecord.getTnf() == NdefRecord.TNF_WELL_KNOWN && Arrays.equals(ndefRecord.getType(), NdefRecord.RTD_TEXT))
+				{
+					try
+					{
+						return readText(ndefRecord);
+					}
+					catch (UnsupportedEncodingException e)
+					{
+						Miscellaneous.logEvent("w", "NFC", "Unsupported Encoding: " + Log.getStackTraceString(e), 3);
+					}
+				}
+			}
+		}
+
         return null;
 	}
 	

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

@@ -46,7 +46,7 @@
 			        android:orientation="horizontal" >
 			
 			        <TextView
-			            android:id="@+id/tvTimeFrameHelpText"
+			            android:id="@+id/tvLastRule"
 			            android:layout_height="wrap_content"
                 		android:layout_width="wrap_content"
 			            android:text="@string/latitude"

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

@@ -23,7 +23,7 @@
 	        android:layout_height="wrap_content" />
 	
 	    <TextView
-	        android:id="@+id/tvTimeFrameHelpText"
+	        android:id="@+id/tvLastRule"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:text="@string/end"

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

@@ -151,7 +151,7 @@
 		    android:orientation="vertical" 
 		    android:layout_margin="10dp" >
 		    <TextView
-		        android:id="@+id/tvTimeFrameHelpText"
+		        android:id="@+id/tvLastRule"
 		        android:layout_width="wrap_content"
 		        android:layout_height="wrap_content"
 		        android:text="@string/helpTextTimeFrame" />

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

@@ -193,7 +193,7 @@
 			        android:textAppearance="?android:attr/textAppearanceLarge" />
 			
 			    <TextView
-			        android:id="@+id/tvTimeFrameHelpText"
+			        android:id="@+id/tvLastRule"
 			        android:layout_width="0dip"
 			        android:layout_weight="5"
 			        android:layout_height="wrap_content"
@@ -203,6 +203,34 @@
 			        android:singleLine="false"
 			        android:textSize="20dp" />
 			</TableRow>
+
+			<TableRow
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="top"
+				android:layout_marginTop="20dp" >
+
+				<TextView
+					android:layout_width="0dip"
+					android:layout_weight="5"
+					android:layout_height="wrap_content"
+					android:gravity="right"
+					android:text="@string/lastProfile"
+					android:scrollHorizontally="false"
+					android:singleLine="false"
+					android:textAppearance="?android:attr/textAppearanceLarge" />
+
+				<TextView
+					android:id="@+id/tvLastProfile"
+					android:layout_width="0dip"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="10dp"
+					android:layout_weight="5"
+					android:scrollHorizontally="false"
+					android:singleLine="false"
+					android:text="n./a."
+					android:textSize="20dp" />
+			</TableRow>
 			
 			<TableRow
 			    android:layout_width="fill_parent"

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

@@ -51,7 +51,7 @@
 	    android:background="@color/barBackgroundColor" >
 	
 	    <TextView
-	        android:id="@+id/tvTimeFrameHelpText"
+	        android:id="@+id/tvLastRule"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:text="@string/ruleList"

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

@@ -11,7 +11,7 @@
     <string name="pleaseSpecifiyTrigger">Bitte geben Sie mindestens einen Auslöser an.</string>
     <string name="pleaseSpecifiyAction">Bitte geben Sie mindestens eine Aktion an.</string>
     <string name="serviceWontStart">Weder Orte noch Regeln sind definitiv. Dienst wird nicht starten.</string>
-    <string name="serviceStarted">Automations-Dienst gestarted.</string>
+    <string name="serviceStarted">Automations-Dienst gestartet.</string>
     <string name="version">Version %1$s.</string>
     <string name="distanceBetween">Der Abstand zwischen GPS- und Mobilfunk-Position beträgt %1$d m. Dies +1 sollte der minimale Radius sein.</string>
     <string name="positioningWindowNotice">Falls Sie in einem Gebäude sind, wird empfohlen das Gerät in die Nähe eines Fensters zu bringen bis eine Position ermittelt werden konnte. Andernfalls kann es sehr lange dauern oder es funktioniert gar nicht.</string>
@@ -699,4 +699,5 @@
     <string name="musicPlayingDetection">Musik-läuft Erkennung</string>
     <string name="locationNotWorkingOn12">Das Abrufen des Standorts scheint unter Android 12 derzeit nicht zu funktionieren. Wenn es bei Ihnen nicht klappt, tut mir das leid. Ich werde versuchen die Ursache zu beheben, sobald mir die Ursache bekannt ist. Wenn der Donut bei Ihnen also nicht aufhört sich zu drehen, wissen Sie warum.</string>
     <string name="profileXrequiresThis">Profil \"%1$s\" benötigt dies.</string>
+    <string name="lastProfile">Letztes Profil:</string>
 </resources>

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

@@ -698,4 +698,5 @@
     <string name="musicPlayingDetection">Musica tocando deteción</string>
     <string name="locationNotWorkingOn12">Obtener la locación no parece estar funcionando en dispositivos Android 12 actualmente. Si no está funcionando para ti, lo siento. Intentaré arreglar esto tan pronto como conozca la causa. Así que si la rosquilla no deja de girar, ya sabes por qué.</string>
     <string name="profileXrequiresThis">El perfil \"%1$s\" requiere esto.</string>
+    <string name="lastProfile">Último perfil:</string>
 </resources>

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

@@ -697,6 +697,7 @@
     <string name="musicCheckFrequencyTitle">Frequenza dei controlli [ms]</string>
     <string name="musicCheckFrequencySummary">Millisecondi tra i controlli</string>
     <string name="musicPlayingDetection">Rilevamento della riproduzione musicale</string>
-    <string name="profileXrequiresThis">Il profilo \"%1$s\" lo richiede.</string>
-    <string name="locationNotWorkingOn12">Ottenere la posizione non sembra funzionare su dispositivi Android 12 al momento. Se non funziona per te, mi dispiace. Cercherò di risolvere questo problema non appena conoscerò la causa. Quindi, se la ciambella non smette di girare, sai perché.</string>
+    <string name="profileXrequiresThis">Questo è richiesto dal profilo \"%1$s\".</string>
+    <string name="locationNotWorkingOn12">Ottenere la posizione non sembra funzionare su dispositivi Android 12 al momento. Se non funziona per te, mi dispiace. Cercherò di risolvere questo problema non appena conoscerò la causa. Quindi, se cerchio rotante non smette di girare, sai perché.</string>
+    <string name="lastProfile">Ultimo profilo:</string>
 </resources>

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

@@ -697,4 +697,5 @@
     <string name="musicPlayingDetection">Detectie van het afspelen van muziek</string>
     <string name="locationNotWorkingOn12">Het verkrijgen van de locatie lijkt momenteel niet te werken op Android 12-apparaten. Als het niet voor je werkt, spijt het me. Ik zal proberen dit op te lossen zodra ik de oorzaak ken. Dus als de donut niet stopt met draaien, weet je waarom.</string>
     <string name="profileXrequiresThis">Profiel \"%1$s\" vereist dit.</string>
+    <string name="lastProfile">Laatste profiel:</string>
 </resources>

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

@@ -795,4 +795,5 @@
     <string name="musicCheckFrequencyTitle">Check frequency [ms]</string>
     <string name="musicCheckFrequencySummary">Milliseconds between checks</string>
     <string name="locationNotWorkingOn12">Getting the location does not seem to be working on Android 12 devices currently. If it isn\'t working for you, I\'m sorry. I\'ll try to fix this as soon as I know the cause. So if the donut doesn\'t stop spinning, you know why.</string>
+    <string name="lastProfile">Last profile:</string>
 </resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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

@@ -0,0 +1,14 @@
+Neuer Auslöser:
+* Bildschirmstatus (ein/aus)
+Neue Aktionen:
+* Benachrichtigung erstellen
+* Benachrichtigung(en) schließen
+* Medienwiedergabe steuern
+Fehler behoben:
+* Übersetzungsfehler im niederländischen Variablentext
+* Variablen wurden beim Senden von Textnachrichten nicht ersetzt
+* Der Dienst startete nicht immer, nachdem das Gerät eingeschaltet wurde
+* Setzen von Klingeltönen auf Android 11 und höher
+* Für das Ändern von Klingeltönen ist die Speicher-lesen-Berechtigung nötig
+* Profil, das nicht verwendet wurde, konnte nicht gelöscht werden
+* Orientierungssensor an Geräten ohne Magnet-Sensor

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

@@ -6,4 +6,6 @@
 * Fixed: Variables were not replaced when sending text messages
 * Fixed: Service wouldn't always start after device has been powered on
 * Fixed: Set ringtones on Android 11 and above
-* Fixed: Permission read storage required for changing ringtones
+* Fixed: Permission read storage required for changing ringtones
+* Fixed: Profile that were not in use, could not be deleted.
+* Fixed: Orientation sensor on devices that have no magnetic sensor.

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

@@ -0,0 +1,14 @@
+Nuevo disparador:
+* estado de la pantalla (encendido / apagado)
+Nuevas acciones:
+* Crear notificación
+* Cerrar notificación(es)
+* Controlar la reproducción de medios
+Corregido:
+* Error de traducción en texto de variables holandesas
+* Las variables no fueron reemplazadas al enviar mensajes de texto
+* El servicio no siempre se iniciaría después de que el dispositivo se haya encendido
+* Establecer tonos de llamada en Android 11 y superior
+* Se requiere almacenamiento de lectura de permisos para cambiar los tonos de llamada
+* Perfil que no estaba en uso, no se pudo eliminar
+* Sensor de orientación en dispositivos que no tienen sensor magnético

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

@@ -0,0 +1,14 @@
+Nuovo trigger:
+* stato dello schermo (on / off)
+Nuove azioni:
+* Crea notifica
+* Chiudi notifica (s)
+* Controlla la riproduzione multimediale
+Fissato:
+* Bug di traduzione nel testo delle variabili olandesi
+* Le variabili non sono state sostituite durante l'invio di messaggi di testo
+* Il servizio non si avvia sempre dopo l'accensione del dispositivo
+* Imposta suonerie su Android 11 e versioni successive
+* Autorizzazione di lettura necessaria per cambiare le suonerie
+* Profilo che non era in uso, non poteva essere eliminato
+* Sensore di orientamento su dispositivi che non hanno sensore mag.

fastlane/metadata/android/nl-NL/changelogs/118.txt

@@ -0,0 +1,11 @@
+* Nieuwe trigger: schermstatus (aan / uit)
+* Nieuwe actie: Melding maken
+* Nieuwe actie: Sluit melding (en)
+* Nieuwe actie: Bedien het afspelen van media
+* Fixed: Vertaling bug in Nederlandse variabelen tekst
+* Opgelost: Variabelen zijn niet vervangen bij het verzenden van sms-berichten
+* Opgelost: service start niet altijd nadat het apparaat is ingeschakeld
+* Opgelost: stel beltonen in op Android 11 en hoger
+* Opgelost: Toestemming leesopslag vereist voor het wijzigen van beltonen
+* Opgelost: Profiel dat niet in gebruik was, kon niet worden verwijderd.
+* Vast: Oriëntatiesensor op apparaten die geen magnetische sensor hebben.