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

Prevent Droste effect

This commit is contained in:
M66B 2022-01-14 08:32:27 +01:00
parent 503465d6fd
commit f4a393faa4
2 changed files with 3 additions and 0 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

@ -2828,6 +2828,7 @@ 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);

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

@ -6506,6 +6506,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
EntityAttachment.SMIME_SIGNED_DATA
});
db.message().setMessageEncrypt(message.id, message.ui_encrypt);
db.message().setMessageRevision(message.id, null);
db.message().setMessageStored(message.id, new Date().getTime());
db.setTransactionSuccessful();
@ -7403,6 +7404,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
encrypt = parts.getEncryption();
db.message().setMessageEncrypt(message.id, encrypt);
db.message().setMessageRevision(message.id, 1);
db.message().setMessageStored(message.id, new Date().getTime());
db.message().setMessageFts(message.id, false);