From 67da97654dc96978acac3af593c791354f3db46b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 21 Mar 2021 13:30:54 +0100
Subject: [PATCH] Forward messages improvements

---
 .../eu/faircode/email/FragmentMessages.java   | 20 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  4 ++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 26d7094f41..5f07c6defa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -330,6 +330,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
     private NumberFormat NF = NumberFormat.getNumberInstance();
 
     private static final int MAX_MORE = 100; // messages
+    private static final int MAX_SEND_RAW = 50; // messages
     private static final int SWIPE_DISABLE_SELECT_DURATION = 1500; // milliseconds
     private static final float LUMINANCE_THRESHOLD = 0.7f;
 
@@ -2772,6 +2773,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onExecuted(Bundle args, final MoreResult result) {
+                long[] ids = args.getLongArray("ids");
+
                 PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), fabMore);
 
                 int order = 0;
@@ -2819,7 +2822,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (result.hasJunk && !result.isJunk && !result.isDrafts) // has junk and not junk/drafts
                     popupMenu.getMenu().add(Menu.NONE, R.string.title_spam, order++, R.string.title_spam);
 
-                if (result.accounts.size() > 0 /* IMAP */ && BuildConfig.DEBUG)
+                if (result.accounts.size() > 0 /* IMAP */ && ids.length < MAX_SEND_RAW)
                     popupMenu.getMenu().add(Menu.NONE, R.string.title_raw_send, order++, R.string.title_raw_send);
 
                 for (EntityAccount account : result.accounts) {
@@ -3317,7 +3320,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
 
         Bundle args = new Bundle();
-        args.putString("question", getString(R.string.title_ask_raw));
+        args.putString("question", getString(R.string.title_raw_send));
+        args.putString("remark", getString(R.string.title_ask_raw));
         args.putString("notagain", "raw_asked");
 
         FragmentDialogAsk ask = new FragmentDialogAsk();
@@ -3333,6 +3337,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         selectionTracker.clearSelection();
 
         new SimpleTask<Void>() {
+            private Toast toast = null;
+
             @Override
             protected Void onExecute(Context context, Bundle args) {
                 long[] ids = args.getLongArray("ids");
@@ -3388,7 +3394,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         } else {
                             if (!Objects.equals(last, remaining)) {
                                 last = remaining;
-                                ToastEx.makeText(context, getString(R.string.title_remaining, remaining), Toast.LENGTH_LONG).show();
+
+                                String msg = getString(R.string.title_raw_remaining, remaining);
+                                if (toast != null)
+                                    toast.cancel();
+                                toast = ToastEx.makeText(context, msg, Toast.LENGTH_SHORT);
+                                toast.show();
                             }
                         }
                     }
@@ -6064,7 +6075,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     adapter.notifyDataSetChanged();
                     break;
                 case REQUEST_ASKED_RAW:
-                    _onActionRaw();
+                    if (resultCode == RESULT_OK)
+                        _onActionRaw();
                     break;
             }
         } catch (Throwable ex) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38e7f839c0..b67eb04d70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -885,7 +885,8 @@
     <string name="title_download_all">Download all</string>
     <string name="title_save_all">Save all</string>
     <string name="title_save_eml">Save raw message file</string>
-    <string name="title_remaining">Messages to download: %1$d</string>
+    <string name="title_raw_remaining">Raw messages to download: %1$d</string>
+    <string name="title_ask_raw">To forward messages, the raw (original) messages need to be downloaded from the server. This requires an internet connection.</string>
 
     <string name="title_buttons">Select buttons</string>
     <string name="title_configure_buttons">Configure buttons &#8230;</string>
@@ -964,7 +965,6 @@
     <string name="title_ask_help">Help improve FairEmail</string>
     <string name="title_ask_reporting">Send error reports?</string>
     <string name="title_reporting_why">Error reporting will help improve FairEmail</string>
-    <string name="title_ask_raw">To forward messages, the raw (original) message needs to be downloaded</string>
 
     <string name="title_ask_review">Please review FairEmail</string>
     <string name="title_ask_review_rationale">