From 0c646b55fcb65c88ee6a869311812c85c074cd1d Mon Sep 17 00:00:00 2001
From: Jens <android-development@gmx.de>
Date: Fri, 5 Nov 2021 22:47:48 +0100
Subject: [PATCH] Fixed infinite loop

---
 .../java/com/jens/automation2/Rule.java       | 14 ++++++++++
 .../activity_manage_trigger_notification.xml  | 26 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 41 insertions(+)

diff --git a/app/src/apkFlavor/java/com/jens/automation2/Rule.java b/app/src/apkFlavor/java/com/jens/automation2/Rule.java
index fd26414c..ef093a68 100644
--- a/app/src/apkFlavor/java/com/jens/automation2/Rule.java
+++ b/app/src/apkFlavor/java/com/jens/automation2/Rule.java
@@ -833,6 +833,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 +904,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)
 									{
diff --git a/app/src/main/res/layout/activity_manage_trigger_notification.xml b/app/src/main/res/layout/activity_manage_trigger_notification.xml
index 46b1f79a..c2a259f0 100644
--- a/app/src/main/res/layout/activity_manage_trigger_notification.xml
+++ b/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">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 52bd071e..bff11708 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -702,4 +702,5 @@
     <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>
 </resources>
\ No newline at end of file