mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Always use HTML for encrypted messages

This commit is contained in:
M66B 2022-08-02 07:48:15 +02:00
parent 23a24f091f
commit 88807906fa
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -5538,7 +5538,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.setTitle(message.isPlainOnly() .setTitle(message.isPlainOnly()
? R.string.title_alternative_html : R.string.title_alternative_text) ? R.string.title_alternative_html : R.string.title_alternative_text)
.setEnabled(message.uid != null && message.hasAlt()) .setEnabled(message.uid != null && message.hasAlt())
.setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP); .setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP && !message.isEncrypted());
popupMenu.insertIcons(context); popupMenu.insertIcons(context);

10
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -8103,8 +8103,7 @@ public class FragmentMessages extends FragmentBase
String protect_subject = parts.getProtectedSubject(); String protect_subject = parts.getProtectedSubject();
// Write decrypted body // Write decrypted body
boolean download_plain = prefs.getBoolean("download_plain", false); String html = parts.getHtml(context, false);
String html = parts.getHtml(context, download_plain);
Helper.writeText(message.getFile(context), html); Helper.writeText(message.getFile(context), html);
Log.i("pgp html=" + (html == null ? null : html.length())); Log.i("pgp html=" + (html == null ? null : html.length()));
@ -8121,7 +8120,7 @@ public class FragmentMessages extends FragmentBase
db.message().setMessageContent(message.id, db.message().setMessageContent(message.id,
true, true,
message.language, message.language,
parts.isPlainOnly(download_plain), parts.isPlainOnly(false),
message.preview, message.preview,
message.warning); message.warning);
@ -8798,8 +8797,7 @@ public class FragmentMessages extends FragmentBase
// Write decrypted body // Write decrypted body
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean download_plain = prefs.getBoolean("download_plain", false); String html = parts.getHtml(context, false);
String html = parts.getHtml(context, download_plain);
Helper.writeText(message.getFile(context), html); Helper.writeText(message.getFile(context), html);
Log.i("s/mime html=" + (html == null ? null : html.length())); Log.i("s/mime html=" + (html == null ? null : html.length()));
@ -8814,7 +8812,7 @@ public class FragmentMessages extends FragmentBase
db.message().setMessageContent(message.id, db.message().setMessageContent(message.id,
true, true,
message.language, message.language,
parts.isPlainOnly(download_plain), parts.isPlainOnly(false),
message.preview, message.preview,
message.warning); message.warning);