forked from jens/Automation
		
	Fixed infinite loop
This commit is contained in:
		| @@ -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) | ||||
| 									{ | ||||
|   | ||||
| @@ -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"> | ||||
|   | ||||
| @@ -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> | ||||
		Reference in New Issue
	
	Block a user