diff --git a/app/src/apkFlavor/AndroidManifest.xml b/app/src/apkFlavor/AndroidManifest.xml
index 783fdbe..e759a58 100644
--- a/app/src/apkFlavor/AndroidManifest.xml
+++ b/app/src/apkFlavor/AndroidManifest.xml
@@ -112,16 +112,6 @@
android:name="google_analytics_ssaid_collection_enabled"
android:value="false" />
-
-
-
-
+
+
+
@@ -223,7 +216,6 @@
-->
-
diff --git a/app/src/apkFlavor/java/com/jens/automation2/Rule.java b/app/src/apkFlavor/java/com/jens/automation2/Rule.java
index a2fa049..b0e8c3b 100644
--- a/app/src/apkFlavor/java/com/jens/automation2/Rule.java
+++ b/app/src/apkFlavor/java/com/jens/automation2/Rule.java
@@ -554,7 +554,8 @@ public class Rule implements Comparable
{
try
{
- Rule.this.getActionSet().get(i).run(automationService, doToggle);
+ Miscellaneous.logEvent("i", "RuleExecution", "Running action " + Rule.this.getActionSet().get(i).toStringShort() + " of rule " + Rule.this.getName(), 5);
+ Rule.this.getActionSet().get(i).run(automationService, doToggle);
}
catch(Exception e)
{
@@ -591,10 +592,7 @@ public class Rule implements Comparable
public void activate(AutomationService automationService, boolean force)
{
ActivateRuleTask task = new ActivateRuleTask();
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
- task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
- else
- task.execute(automationService, force);
+ task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
}
public static ArrayList findRuleCandidates(Trigger.Trigger_Enum triggerType)
diff --git a/app/src/fdroidFlavor/AndroidManifest.xml b/app/src/fdroidFlavor/AndroidManifest.xml
index 0594872..6999620 100644
--- a/app/src/fdroidFlavor/AndroidManifest.xml
+++ b/app/src/fdroidFlavor/AndroidManifest.xml
@@ -110,16 +110,6 @@
android:name="google_analytics_ssaid_collection_enabled"
android:value="false" />
-
-
-
-
+
+
+
@@ -221,7 +214,6 @@
-->
-
diff --git a/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java b/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java
index 4b5c2ba..436b5dd 100644
--- a/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java
+++ b/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java
@@ -527,6 +527,7 @@ public class Rule implements Comparable
{
try
{
+ Miscellaneous.logEvent("i", "RuleExecution", "Running action " + Rule.this.getActionSet().get(i).toStringShort() + " of rule " + Rule.this.getName(), 5);
Rule.this.getActionSet().get(i).run(automationService, doToggle);
}
catch(Exception e)
@@ -564,10 +565,7 @@ public class Rule implements Comparable
public void activate(AutomationService automationService, boolean force)
{
ActivateRuleTask task = new ActivateRuleTask();
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
- task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
- else
- task.execute(automationService, force);
+ task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
}
public static ArrayList findRuleCandidates(Trigger.Trigger_Enum triggerType)
diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml
index ecf1971..99fa2a1 100644
--- a/app/src/googlePlayFlavor/AndroidManifest.xml
+++ b/app/src/googlePlayFlavor/AndroidManifest.xml
@@ -94,21 +94,11 @@
android:name="google_analytics_ssaid_collection_enabled"
android:value="false" />
-
-
-
-
+ android:foregroundServiceType="specialUse" >
@@ -154,6 +144,9 @@
+
+
+
@@ -210,7 +203,6 @@
-->
-