Cleanup

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -2809,7 +2809,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void onActionJunk(TupleMessageEx message) {
-            onMenuJunk(message);
+            String who = MessageHelper.formatAddresses(message.from);
+
+            Bundle aargs = new Bundle();
+            aargs.putString("question", context.getString(R.string.title_ask_spam_who, who));
+            aargs.putLong("id", message.id);
+
+            FragmentDialogAsk ask = new FragmentDialogAsk();
+            ask.setArguments(aargs);
+            ask.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_JUNK);
+            ask.show(parentFragment.getParentFragmentManager(), "message:junk");
         }
 
         private void onActionDecrypt(TupleMessageEx message, boolean auto) {
@@ -3108,9 +3117,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             popupMenu.getMenu().findItem(R.id.menu_manage_keywords).setEnabled(message.uid != null && !message.folderReadOnly);
             popupMenu.getMenu().findItem(R.id.menu_manage_keywords).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
-            popupMenu.getMenu().findItem(R.id.menu_junk).setEnabled(message.uid != null && !message.folderReadOnly);
-            popupMenu.getMenu().findItem(R.id.menu_junk).setVisible(hasJunk && !EntityFolder.JUNK.equals(message.folderType));
-
             popupMenu.getMenu().findItem(R.id.menu_share).setEnabled(message.content);
             popupMenu.getMenu().findItem(R.id.menu_print).setEnabled(hasWebView && message.content);
             popupMenu.getMenu().findItem(R.id.menu_print).setVisible(Helper.canPrint(context));
@@ -3155,9 +3161,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         case R.id.menu_delete:
                             onMenuDelete(message);
                             return true;
-                        case R.id.menu_junk:
-                            onMenuJunk(message);
-                            return true;
                         case R.id.menu_resync:
                             onMenuResync(message);
                             return true;
@@ -3439,19 +3442,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ask.show(parentFragment.getParentFragmentManager(), "message:delete");
         }
 
-        private void onMenuJunk(final TupleMessageEx message) {
-            String who = MessageHelper.formatAddresses(message.from);
-
-            Bundle aargs = new Bundle();
-            aargs.putString("question", context.getString(R.string.title_ask_spam_who, who));
-            aargs.putLong("id", message.id);
-
-            FragmentDialogAsk ask = new FragmentDialogAsk();
-            ask.setArguments(aargs);
-            ask.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_JUNK);
-            ask.show(parentFragment.getParentFragmentManager(), "message:junk");
-        }
-
         private void onMenuResync(TupleMessageEx message) {
             Bundle args = new Bundle();
             args.putLong("id", message.id);

app/src/main/res/menu/popup_message_more.xml

@@ -28,11 +28,6 @@
         android:id="@+id/menu_delete"
         android:title="@string/title_delete" />
 
-    <item
-        android:id="@+id/menu_junk"
-        android:title="@string/title_spam"
-        android:visible="false" />
-
     <item
         android:id="@+id/menu_resync"
         android:title="@string/title_resync" />