From 09ace5e05a07cc7cf027701f2c8c956945b02778 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 12 May 2019 18:22:41 +0200
Subject: [PATCH] Refactoring

---
 .../main/java/eu/faircode/email/AdapterMessage.java  |  7 ++++---
 app/src/main/java/eu/faircode/email/Core.java        |  4 ++--
 .../main/java/eu/faircode/email/FragmentCompose.java | 12 ++++++------
 app/src/main/java/eu/faircode/email/Helper.java      | 10 ----------
 .../main/java/eu/faircode/email/MessageHelper.java   | 10 ++++++++++
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 14c11d9b99..22b1178fca 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -804,9 +804,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 try {
                     via = new InternetAddress(message.identityEmail, message.identityName);
                     if (message.to != null) {
-                        String v = Helper.canonicalAddress(via.getAddress());
+                        String v = MessageHelper.canonicalAddress(via.getAddress());
                         for (Address t : message.to) {
-                            if (v.equals(Helper.canonicalAddress(((InternetAddress) t).getAddress()))) {
+                            if (v.equals(MessageHelper.canonicalAddress(((InternetAddress) t).getAddress()))) {
                                 self = true;
                                 break;
                             }
@@ -1197,7 +1197,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     else {
                         String from = ((InternetAddress) message.from[0]).getAddress();
                         EntityIdentity identity = db.identity().getIdentity(message.identity);
-                        outgoing = Helper.canonicalAddress(identity.email).equals(Helper.canonicalAddress(from));
+                        outgoing = MessageHelper.canonicalAddress(identity.email)
+                                .equals(MessageHelper.canonicalAddress(from));
                     }
 
                     return (outgoing
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index b14f18eb7d..30c88bf6e5 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1268,7 +1268,7 @@ class Core {
                     if (!TextUtils.isEmpty(email)) {
                         identity = db.identity().getIdentity(folder.account, email);
                         if (identity == null) {
-                            String canonical = Helper.canonicalAddress(email);
+                            String canonical = MessageHelper.canonicalAddress(email);
                             if (!canonical.equals(email))
                                 identity = db.identity().getIdentity(folder.account, canonical);
                         }
@@ -1496,7 +1496,7 @@ class Core {
             boolean me = true;
             for (Address reply : recipients) {
                 String email = ((InternetAddress) reply).getAddress();
-                String canonical = Helper.canonicalAddress(email);
+                String canonical = MessageHelper.canonicalAddress(email);
                 if (!TextUtils.isEmpty(email) &&
                         db.identity().getIdentity(folder.account, email) == null &&
                         (canonical.equals(email) ||
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8d5a83e920..63fc356687 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2035,10 +2035,10 @@ public class FragmentCompose extends FragmentBase {
                                 String via = null;
                                 Address[] recipient = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
                                 if (recipient != null && recipient.length > 0)
-                                    to = Helper.canonicalAddress(((InternetAddress) recipient[0]).getAddress());
+                                    to = MessageHelper.canonicalAddress(((InternetAddress) recipient[0]).getAddress());
                                 if (ref.identity != null) {
                                     EntityIdentity v = db.identity().getIdentity(ref.identity);
-                                    via = Helper.canonicalAddress(v.email);
+                                    via = MessageHelper.canonicalAddress(v.email);
                                 }
 
                                 if (to != null && to.equals(via)) {
@@ -2058,10 +2058,10 @@ public class FragmentCompose extends FragmentBase {
                                 if (ref.cc != null)
                                     addresses.addAll(Arrays.asList(ref.cc));
                                 for (Address address : new ArrayList<>(addresses)) {
-                                    String cc = Helper.canonicalAddress(((InternetAddress) address).getAddress());
+                                    String cc = MessageHelper.canonicalAddress(((InternetAddress) address).getAddress());
                                     List<TupleIdentityEx> identities = db.identity().getComposableIdentities(ref.account);
                                     for (EntityIdentity identity : identities) {
-                                        String email = Helper.canonicalAddress(identity.email);
+                                        String email = MessageHelper.canonicalAddress(identity.email);
                                         if (cc.equals(email))
                                             addresses.remove(address);
                                     }
@@ -2120,9 +2120,9 @@ public class FragmentCompose extends FragmentBase {
                     do {
                         String from = null;
                         if (iindex >= 0)
-                            from = Helper.canonicalAddress(((InternetAddress) draft.from[iindex]).getAddress());
+                            from = MessageHelper.canonicalAddress(((InternetAddress) draft.from[iindex]).getAddress());
                         for (EntityIdentity identity : identities) {
-                            String email = Helper.canonicalAddress(identity.email);
+                            String email = MessageHelper.canonicalAddress(identity.email);
                             if (email.equals(from)) {
                                 draft.identity = identity.id;
                                 draft.from = new InternetAddress[]{new InternetAddress(identity.email, identity.name)};
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 7b05813703..0292965f03 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -787,16 +787,6 @@ public class Helper {
         return new InternetAddress("marcel+fairemail@faircode.eu", "FairCode");
     }
 
-    static String canonicalAddress(String address) {
-        String[] a = address.split("@");
-        if (a.length > 0) {
-            String[] extra = a[0].split("\\+");
-            if (extra.length > 0)
-                a[0] = extra[0];
-        }
-        return TextUtils.join("@", a).toLowerCase();
-    }
-
     static void writeText(File file, String content) throws IOException {
         try (BufferedWriter out = new BufferedWriter(new FileWriter(file))) {
             out.write(content == null ? "" : content);
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index a3cb1dbd40..6d16a32e69 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -731,6 +731,16 @@ public class MessageHelper {
         return TextUtils.join(", ", formatted);
     }
 
+    static String canonicalAddress(String address) {
+        String[] a = address.split("@");
+        if (a.length > 0) {
+            String[] extra = a[0].split("\\+");
+            if (extra.length > 0)
+                a[0] = extra[0];
+        }
+        return TextUtils.join("@", a).toLowerCase();
+    }
+
     static String decodeMime(String text) {
         if (text == null)
             return null;