From 132615e4a49c15c3b72e60e52f2b23f7e80bc952 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 18 Apr 2022 14:23:30 +0200
Subject: [PATCH] List rule/regex

---
 .../java/eu/faircode/email/AdapterRule.java   | 61 ++++++++++++-------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index f3d684c2ec..49c71acb11 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -118,44 +118,51 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
             ivStop.setVisibility(rule.stop ? View.VISIBLE : View.INVISIBLE);
 
             try {
-                List<Pair<String, String>> conditions = new ArrayList<>();
+                List<Condition> conditions = new ArrayList<>();
                 JSONObject jcondition = new JSONObject(rule.condition);
                 if (jcondition.has("sender"))
-                    conditions.add(new Pair<>(context.getString(R.string.title_rule_sender),
-                            jcondition.getJSONObject("sender").optString("value")));
+                    conditions.add(new Condition(context.getString(R.string.title_rule_sender),
+                            jcondition.getJSONObject("sender").optString("value"),
+                            jcondition.getJSONObject("sender").optBoolean("regex")));
                 if (jcondition.has("recipient"))
-                    conditions.add(new Pair<>(context.getString(R.string.title_rule_recipient),
-                            jcondition.getJSONObject("recipient").optString("value")));
+                    conditions.add(new Condition(context.getString(R.string.title_rule_recipient),
+                            jcondition.getJSONObject("recipient").optString("value"),
+                            jcondition.getJSONObject("recipient").optBoolean("regex")));
                 if (jcondition.has("subject"))
-                    conditions.add(new Pair<>(context.getString(R.string.title_rule_subject),
-                            jcondition.getJSONObject("subject").optString("value")));
+                    conditions.add(new Condition(context.getString(R.string.title_rule_subject),
+                            jcondition.getJSONObject("subject").optString("value"),
+                            jcondition.getJSONObject("subject").optBoolean("regex")));
                 if (jcondition.optBoolean("attachments"))
-                    conditions.add(new Pair<>(context.getString(R.string.title_rule_attachments),
-                            null));
+                    conditions.add(new Condition(context.getString(R.string.title_rule_attachments),
+                            null, null));
                 if (jcondition.has("header"))
-                    conditions.add(new Pair<>(context.getString(R.string.title_rule_header),
-                            jcondition.getJSONObject("header").optString("value")));
+                    conditions.add(new Condition(context.getString(R.string.title_rule_header),
+                            jcondition.getJSONObject("header").optString("value"),
+                            jcondition.getJSONObject("header").optBoolean("regex")));
                 if (jcondition.has("body"))
-                    conditions.add(new Pair<>(context.getString(R.string.title_rule_body),
-                            jcondition.getJSONObject("body").optString("value")));
+                    conditions.add(new Condition(context.getString(R.string.title_rule_body),
+                            jcondition.getJSONObject("body").optString("value"),
+                            jcondition.getJSONObject("body").optBoolean("regex")));
                 if (jcondition.has("date"))
-                    conditions.add(new Pair<>(context.getString(R.string.title_rule_time_abs),
-                            null));
+                    conditions.add(new Condition(context.getString(R.string.title_rule_time_abs),
+                            null, null));
                 if (jcondition.has("schedule"))
-                    conditions.add(new Pair<>(context.getString(R.string.title_rule_time_rel),
-                            null));
+                    conditions.add(new Condition(context.getString(R.string.title_rule_time_rel),
+                            null, null));
 
                 SpannableStringBuilder ssb = new SpannableStringBuilderEx();
-                for (Pair<String, String> condition : conditions) {
+                for (Condition condition : conditions) {
                     if (ssb.length() > 0)
                         ssb.append("\n");
-                    ssb.append(condition.first);
-                    if (!TextUtils.isEmpty(condition.second)) {
+                    ssb.append(condition.name);
+                    if (!TextUtils.isEmpty(condition.condition)) {
                         ssb.append(" \"");
                         int start = ssb.length();
-                        ssb.append(condition.second);
+                        ssb.append(condition.condition);
                         ssb.setSpan(new StyleSpan(Typeface.ITALIC), start, ssb.length(), 0);
                         ssb.append("\"");
+                        if (Boolean.TRUE.equals(condition.regex))
+                            ssb.append(" (*)");
                     }
                 }
 
@@ -509,6 +516,18 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
                     throw new IllegalArgumentException("Unknown action type=" + type);
             }
         }
+
+        private class Condition {
+            private final String name;
+            private final String condition;
+            private final Boolean regex;
+
+            Condition(String name, String condition, Boolean regex) {
+                this.name = name;
+                this.condition = condition;
+                this.regex = regex;
+            }
+        }
     }
 
     AdapterRule(Fragment parentFragment) {