Allow editing replied/forwarded reformatted text

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

@@ -90,6 +90,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.constraintlayout.widget.Group;
 import androidx.core.content.FileProvider;
 import androidx.cursoradapter.widget.SimpleCursorAdapter;
@@ -223,12 +224,11 @@ public class FragmentCompose extends FragmentBase {
     private static final int REQUEST_ENCRYPT = 8;
     private static final int REQUEST_COLOR = 9;
     private static final int REQUEST_REF_DELETE = 10;
-    private static final int REQUEST_REF_EDIT = 11;
+    private static final int REQUEST_CONTACT_GROUP = 11;
-    private static final int REQUEST_CONTACT_GROUP = 12;
+    private static final int REQUEST_ANSWER = 12;
-    private static final int REQUEST_ANSWER = 13;
+    private static final int REQUEST_LINK = 13;
-    private static final int REQUEST_LINK = 14;
+    private static final int REQUEST_DISCARD = 14;
-    private static final int REQUEST_DISCARD = 15;
+    private static final int REQUEST_SEND = 15;
-    private static final int REQUEST_SEND = 16;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -680,23 +680,29 @@ public class FragmentCompose extends FragmentBase {
     }
 
     private void onReferenceEdit() {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), ibReferenceEdit);
-        if (prefs.getBoolean("edit_ref_confirmed", false)) {
-            onReferenceEditConfirmed();
-            return;
-        }
 
-        Bundle args = new Bundle();
+        popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_plain_text, 1, R.string.title_edit_plain_text);
-        args.putString("question", getString(R.string.title_ask_edit_ref));
+        popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_formatted_text, 2, R.string.title_edit_formatted_text);
-        args.putString("notagain", "edit_ref_confirmed");
 
-        FragmentDialogAsk fragment = new FragmentDialogAsk();
+        popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-        fragment.setArguments(args);
+            @Override
-        fragment.setTargetFragment(this, REQUEST_REF_EDIT);
+            public boolean onMenuItemClick(MenuItem item) {
-        fragment.show(getFragmentManager(), "compose:refedit");
+                switch (item.getItemId()) {
+                    case R.string.title_edit_plain_text:
+                        convertRef(true);
+                        return true;
+
+                    case R.string.title_edit_formatted_text:
+                        convertRef(false);
+                        return true;
+
+                    default:
+                        return false;
+                }
             }
 
-    private void onReferenceEditConfirmed() {
+            private void convertRef(boolean plain) {
                 Bundle args = new Bundle();
                 args.putLong("id", working);
                 args.putString("body", HtmlHelper.toHtml(etBody.getText()));
@@ -724,12 +730,17 @@ public class FragmentCompose extends FragmentBase {
                         if (draft == null || !draft.content)
                             throw new IllegalArgumentException(context.getString(R.string.title_no_body));
 
+
                         File file = draft.getFile(context);
                         File refFile = draft.getRefFile(context);
 
+                        String html;
                         String ref = Helper.readText(refFile);
+                        if (plain) {
                             String plain = HtmlHelper.getText(ref);
-                String html = "<p>" + plain.replaceAll("\\r?\\n", "<br>") + "</p>";
+                            html = "<p>" + plain.replaceAll("\\r?\\n", "<br>") + "</p>";
+                        } else
+                            html = HtmlHelper.sanitize(context, ref, true);
 
                         try (BufferedWriter out = new BufferedWriter(new FileWriter(file))) {
                             out.write(body);
@@ -738,11 +749,9 @@ public class FragmentCompose extends FragmentBase {
 
                         refFile.delete();
 
-                draft.plain_only = true;
                         draft.revision = null;
                         draft.revisions = null;
 
-                db.message().setMessagePlainOnly(draft.id, true);
                         db.message().setMessageRevision(draft.id, null);
                         db.message().setMessageRevisions(draft.id, null);
 
@@ -751,7 +760,6 @@ public class FragmentCompose extends FragmentBase {
 
                     @Override
                     protected void onExecuted(Bundle args, EntityMessage draft) {
-                getActivity().invalidateOptionsMenu();
                         showDraft(draft);
                     }
 
@@ -759,7 +767,11 @@ public class FragmentCompose extends FragmentBase {
                     protected void onException(Bundle args, Throwable ex) {
                         Helper.unexpectedError(getFragmentManager(), ex);
                     }
-        }.execute(this, args, "compose:refedit");
+                }.execute(FragmentCompose.this, args, "compose:convert");
+            }
+        });
+
+        popupMenu.show();
     }
 
     private void onReferenceImages() {
@@ -1255,10 +1267,6 @@ public class FragmentCompose extends FragmentBase {
                     if (resultCode == RESULT_OK)
                         onReferenceDeleteConfirmed();
                     break;
-                case REQUEST_REF_EDIT:
-                    if (resultCode == RESULT_OK)
-                        onReferenceEditConfirmed();
-                    break;
                 case REQUEST_CONTACT_GROUP:
                     if (resultCode == RESULT_OK && data != null)
                         onContactGroupSelected(data.getBundleExtra("args"));

app/src/main/res/values/strings.xml

@@ -616,6 +616,8 @@
     <string name="title_media_toolbar">Media toolbar</string>
     <string name="title_insert_contact_group">Insert contact group</string>
     <string name="title_insert_template">Insert template</string>
+    <string name="title_edit_plain_text">Edit as plain text</string>
+    <string name="title_edit_formatted_text">Edit as reformatted text</string>
     <string name="title_send_plain_text">Plain text only</string>
     <string name="title_send_receipt">Request delivery/read receipt</string>
     <string name="title_send_receipt_remark">Most providers and email clients ignore receipt requests</string>