From b3a384b34645906f9755e6093611bd4e2ed1039b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 7 Jan 2024 11:04:17 +0100
Subject: [PATCH] Refactoring

---
 .../java/eu/faircode/email/EntityMessage.java    | 11 +++++++++++
 .../java/eu/faircode/email/FragmentCompose.java  | 16 ++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 4268c57c1c..eeb2159c0b 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -349,6 +349,17 @@ public class EntityMessage implements Serializable {
         return addresses.toArray(new Address[0]);
     }
 
+    List<Address> getAllRecipients() {
+        List<Address> recipients = new ArrayList<>();
+        if (to != null)
+            recipients.addAll(Arrays.asList(to));
+        if (cc != null)
+            recipients.addAll(Arrays.asList(cc));
+        if (bcc != null)
+            recipients.addAll(Arrays.asList(bcc));
+        return recipients;
+    }
+
     boolean hasKeyword(@NonNull String value) {
         // https://tools.ietf.org/html/rfc5788
         if (keywords == null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8efc76575d..04e3330427 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5804,13 +5804,7 @@ public class FragmentCompose extends FragmentBase {
                                 data.draft.plain_only = 1;
 
                             // Encryption
-                            List<Address> recipients = new ArrayList<>();
-                            if (data.draft.to != null)
-                                recipients.addAll(Arrays.asList(data.draft.to));
-                            if (data.draft.cc != null)
-                                recipients.addAll(Arrays.asList(data.draft.cc));
-                            if (data.draft.bcc != null)
-                                recipients.addAll(Arrays.asList(data.draft.bcc));
+                            List<Address> recipients = data.draft.getAllRecipients();
 
                             if (!BuildConfig.DEBUG)
                                 if (EntityMessage.PGP_SIGNONLY.equals(ref.ui_encrypt) ||
@@ -7089,13 +7083,7 @@ public class FragmentCompose extends FragmentBase {
                             //        identity != null && identity.sender_extra)
                             //    args.putBoolean("remind_extra", true);
 
-                            List<Address> recipients = new ArrayList<>();
-                            if (draft.to != null)
-                                recipients.addAll(Arrays.asList(draft.to));
-                            if (draft.cc != null)
-                                recipients.addAll(Arrays.asList(draft.cc));
-                            if (draft.bcc != null)
-                                recipients.addAll(Arrays.asList(draft.bcc));
+                            List<Address> recipients = draft.getAllRecipients();
 
                             args.putBoolean("remind_noreply", MessageHelper.isNoReply(recipients));