mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-15 00:21:10 +00:00
Code Issues Releases Wiki Activity

Prevent Droste effect

Browse source
This commit is contained in:
M66B 2022-01-24 17:10:40 +01:00
parent e4085c631c
commit 2c6e7fa900
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -2841,7 +2841,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean auto_decrypt = prefs.getBoolean("auto_decrypt", false);
if (auto_decrypt &&
message.revision == null && // Prevent Droste effect
(EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt)))
onActionDecrypt(message, true);

3
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -7156,6 +7156,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (attachments == null)
return null;
if (auto && message.revision != null)
return null;
InputStream in = null;
OutputStream out = null;
boolean inline = false;