Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 19:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for header conditions on execute now

Browse Source
This commit is contained in:
M66B
2021-02-02 12:59:59 +01:00
parent 968ce7571b
commit 8d78200d2e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/AdapterRule.java
View File

@@ -309,7 +309,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
JSONObject jcondition = new JSONObject(rule.condition);
JSONObject jheader = jcondition.optJSONObject("header");
if (jheader != null)
return 0;
throw new IllegalArgumentException(context.getString(R.string.title_rule_no_headers));
int applied = 0;
List<Long> ids =
@@ -347,7 +347,12 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex, false);
if (ex instanceof IllegalArgumentException)
Snackbar.make(
parentFragment.getView(), ex.getMessage(), Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true).show();
else
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex, false);
}
}.execute(context, owner, args, "rule:execute");
}