jens/Automation
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed infinite loop

Browse Source
This commit is contained in:
Jens 2021-11-05 22:47:48 +01:00
parent 88cdc366c5
commit 0c646b55fc
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/apkFlavor/java/com/jens/automation2/Rule.java
View File

@ -833,6 +833,13 @@ public class Rule implements Comparable<Rule>
continue; continue;
} }
} }
else
{
if(myApp.equals(BuildConfig.APPLICATION_ID))
{
return false;
}
}
/* /*
If there are multiple notifications ("stacked") title or text might be null: 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)) if (!app.equalsIgnoreCase(myApp))
return false; return false;
} }
else
{
if(myApp.equals(BuildConfig.APPLICATION_ID))
{
return false;
}
}
if (requiredTitle.length() > 0) if (requiredTitle.length() > 0)
{ {

26
app/src/main/res/layout/activity_manage_trigger_notification.xml
View File

@ -45,6 +45,18 @@
</TableRow> </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 <TableRow
android:layout_marginBottom="@dimen/activity_vertical_margin"> android:layout_marginBottom="@dimen/activity_vertical_margin">
@ -78,6 +90,13 @@
</TableRow> </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 <TableRow
android:layout_marginBottom="@dimen/activity_vertical_margin"> android:layout_marginBottom="@dimen/activity_vertical_margin">
@ -107,6 +126,13 @@
</TableRow> </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 <TableRow
android:layout_marginBottom="@dimen/activity_vertical_margin"> android:layout_marginBottom="@dimen/activity_vertical_margin">

1
app/src/main/res/values/strings.xml
View File

@ -702,4 +702,5 @@
<string name="dndNothing">Let nothing through</string> <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="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="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> </resources>