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

Fixed reply/forward encrypted message

This commit is contained in:
M66B 2019-11-18 19:55:37 +01:00
parent 1be978b5cf
commit a8b99b3160
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -2317,7 +2317,9 @@ public class FragmentCompose extends FragmentBase {
data.draft.subject = status + ": " + ref.subject;
if (ref.plain_only != null && ref.plain_only)
data.draft.plain_only = ref.plain_only;
data.draft.plain_only = true;
if (ref.encrypt != null && ref.encrypt)
data.draft.encrypt = true;
if (answer > 0) {
EntityAnswer a = db.answer().getAnswer(answer);
@ -2557,12 +2559,7 @@ public class FragmentCompose extends FragmentBase {
int sequence = 0;
List<EntityAttachment> attachments = db.attachment().getAttachments(ref.id);
for (EntityAttachment attachment : attachments)
if (attachment.encryption != null &&
attachment.encryption.equals(EntityAttachment.PGP_MESSAGE)) {
data.draft.encrypt = true;
db.message().setMessageEncrypt(data.draft.id, true);
} else if (attachment.encryption == null &&
if (attachment.encryption == null &&
("forward".equals(action) || "editasnew".equals(action) ||
(attachment.isInline() && attachment.isImage()))) {
if (attachment.available) {