From d8add231f23994afefcccd9a9f7093aeaac12bcb Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:17:18 +0200
Subject: [PATCH] Refactoring

---
 .../java/eu/faircode/email/EntityRule.java    |  4 ++++
 .../java/eu/faircode/email/FragmentRule.java  | 20 +++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 9e3c9b14f9..e2b2463ec9 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -142,6 +142,10 @@ public class EntityRule {
     static final String EXTRA_SUBJECT = "subject";
     static final String EXTRA_RECEIVED = "received";
 
+    static final String[] EXTRA_ALL = new String[]{
+            EXTRA_RULE, EXTRA_SENDER, EXTRA_NAME, EXTRA_SUBJECT, EXTRA_RECEIVED
+    };
+
     static final String JSOUP_PREFIX = "jsoup:";
     private static final long SEND_DELAY = 5000L; // milliseconds
     private static final int MAX_NOTES_LENGTH = 512; // characters
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index d82f5da84a..178e2a5a6b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -804,13 +804,7 @@ public class FragmentRule extends FragmentBase {
 
         tvAutomation.setText(getString(R.string.title_rule_automation_hint,
                 EntityRule.ACTION_AUTOMATION,
-                TextUtils.join(", ", new String[]{
-                        EntityRule.EXTRA_RULE,
-                        EntityRule.EXTRA_SENDER,
-                        EntityRule.EXTRA_NAME,
-                        EntityRule.EXTRA_SUBJECT,
-                        EntityRule.EXTRA_RECEIVED,
-                })));
+                TextUtils.join(",", EntityRule.EXTRA_ALL)));
 
         btnColorNotes.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -827,14 +821,10 @@ public class FragmentRule extends FragmentBase {
             }
         });
 
-        tvUrlHint.setText(getString(R.string.title_rule_url_hint,
-                TextUtils.join(", ", new String[]{
-                        "$" + EntityRule.EXTRA_RULE + "$",
-                        "$" + EntityRule.EXTRA_SENDER + "$",
-                        "$" + EntityRule.EXTRA_NAME + "$",
-                        "$" + EntityRule.EXTRA_SUBJECT + "$",
-                        "$" + EntityRule.EXTRA_RECEIVED + "$",
-                })));
+        List<String> extras = new ArrayList<>();
+        for (String extra : EntityRule.EXTRA_ALL)
+            extras.add("$" + extra + "$");
+        tvUrlHint.setText(getString(R.string.title_rule_url_hint, TextUtils.join(", ", extras)));
 
         bottom_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override