From 496a865e57cc3f6d232074912a710a32279e1a15 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:38:29 +0100
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java    | 7 -------
 .../main/java/eu/faircode/email/FragmentDialogJunk.java    | 7 ++++++-
 app/src/main/java/eu/faircode/email/FragmentMessages.java  | 7 -------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6bec93ef1f..ec90a3da0f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4761,12 +4761,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void onActionJunk(TupleMessageEx message) {
-            boolean canBlock = false;
-            if (message.from != null && message.from.length > 0) {
-                String email = ((InternetAddress) message.from[0]).getAddress();
-                canBlock = !TextUtils.isEmpty(email);
-            }
-
             Bundle aargs = new Bundle();
             aargs.putLong("id", message.id);
             aargs.putLong("account", message.account);
@@ -4775,7 +4769,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             aargs.putString("type", message.folderType);
             aargs.putString("from", DB.Converters.encodeAddresses(message.from));
             aargs.putBoolean("inJunk", EntityFolder.JUNK.equals(message.folderType));
-            aargs.putBoolean("canBlock", canBlock);
 
             FragmentDialogJunk ask = new FragmentDialogJunk();
             ask.setArguments(aargs);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
index bf5732d1fc..e3f69a3a61 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
@@ -67,7 +67,6 @@ public class FragmentDialogJunk extends FragmentDialogBase {
         final String type = args.getString("type");
         final Address[] froms = DB.Converters.decodeAddresses(args.getString("from"));
         final boolean inJunk = args.getBoolean("inJunk");
-        final boolean canBlock = args.getBoolean("canBlock");
 
         final Context context = getContext();
         final View view = LayoutInflater.from(context).inflate(R.layout.dialog_junk, null);
@@ -92,6 +91,12 @@ public class FragmentDialogJunk extends FragmentDialogBase {
         boolean check_blocklist = prefs.getBoolean("check_blocklist", false);
         boolean use_blocklist = prefs.getBoolean("use_blocklist", false);
 
+        boolean canBlock = false;
+        if (froms != null && froms.length > 0) {
+            String email = ((InternetAddress) froms[0]).getAddress();
+            canBlock = !TextUtils.isEmpty(email);
+        }
+
         // Wire controls
 
         ibInfoProvider.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index f77313b723..81cb4877ef 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2569,12 +2569,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
 
         private void onSwipeJunk(final @NonNull TupleMessageEx message) {
-            boolean canBlock = false;
-            if (message.from != null && message.from.length > 0) {
-                String email = ((InternetAddress) message.from[0]).getAddress();
-                canBlock = !TextUtils.isEmpty(email);
-            }
-
             Bundle aargs = new Bundle();
             aargs.putLong("id", message.id);
             aargs.putLong("account", message.account);
@@ -2583,7 +2577,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             aargs.putString("type", message.folderType);
             aargs.putString("from", DB.Converters.encodeAddresses(message.from));
             aargs.putBoolean("inJunk", EntityFolder.JUNK.equals(message.folderType));
-            aargs.putBoolean("canBlock", canBlock);
 
             FragmentDialogJunk ask = new FragmentDialogJunk();
             ask.setArguments(aargs);