From 88807906fad448a965396222f0d6f13cf73996e7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 2 Aug 2022 07:48:15 +0200
Subject: [PATCH] Always use HTML for encrypted messages

---
 .../main/java/eu/faircode/email/AdapterMessage.java    |  2 +-
 .../main/java/eu/faircode/email/FragmentMessages.java  | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 28f457fcb6..94bbefdb55 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5538,7 +5538,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     .setTitle(message.isPlainOnly()
                             ? R.string.title_alternative_html : R.string.title_alternative_text)
                     .setEnabled(message.uid != null && message.hasAlt())
-                    .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
+                    .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP && !message.isEncrypted());
 
             popupMenu.insertIcons(context);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 48a04a56c0..a48882d04a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -8103,8 +8103,7 @@ public class FragmentMessages extends FragmentBase
                                     String protect_subject = parts.getProtectedSubject();
 
                                     // Write decrypted body
-                                    boolean download_plain = prefs.getBoolean("download_plain", false);
-                                    String html = parts.getHtml(context, download_plain);
+                                    String html = parts.getHtml(context, false);
                                     Helper.writeText(message.getFile(context), html);
                                     Log.i("pgp html=" + (html == null ? null : html.length()));
 
@@ -8121,7 +8120,7 @@ public class FragmentMessages extends FragmentBase
                                         db.message().setMessageContent(message.id,
                                                 true,
                                                 message.language,
-                                                parts.isPlainOnly(download_plain),
+                                                parts.isPlainOnly(false),
                                                 message.preview,
                                                 message.warning);
 
@@ -8798,8 +8797,7 @@ public class FragmentMessages extends FragmentBase
 
                 // Write decrypted body
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                boolean download_plain = prefs.getBoolean("download_plain", false);
-                String html = parts.getHtml(context, download_plain);
+                String html = parts.getHtml(context, false);
                 Helper.writeText(message.getFile(context), html);
                 Log.i("s/mime html=" + (html == null ? null : html.length()));
 
@@ -8814,7 +8812,7 @@ public class FragmentMessages extends FragmentBase
                     db.message().setMessageContent(message.id,
                             true,
                             message.language,
-                            parts.isPlainOnly(download_plain),
+                            parts.isPlainOnly(false),
                             message.preview,
                             message.warning);