Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-30 17:40:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better encryption support

Browse Source
This commit is contained in:
M66B
2019-01-05 14:09:47 +00:00
parent 1a15a1e931
commit eb27f5015a
8 changed files with 1324 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -785,7 +785,7 @@ public class FragmentCompose extends FragmentEx {
EntityMessage message = db.message().getMessage(id);
List<EntityAttachment> attachments = db.attachment().getAttachments(id);
for (EntityAttachment attachment : new ArrayList<>(attachments))
if ("encrypted.asc".equals(attachment.name) || "signature.asc".equals(attachment.name))
if (attachment.encryption != null)
attachments.remove(attachment);
// Build message
@@ -822,7 +822,7 @@ public class FragmentCompose extends FragmentEx {
// Delete previously encrypted data
for (EntityAttachment attachment : db.attachment().getAttachments(id))
if ("encrypted.asc".equals(attachment.name) || "signature.asc".equals(attachment.name))
if (attachment.encryption != null)
db.attachment().deleteAttachment(attachment.id);
int seq = db.attachment().getAttachmentSequence(id);
@@ -832,6 +832,7 @@ public class FragmentCompose extends FragmentEx {
attachment1.sequence = seq + 1;
attachment1.name = "encrypted.asc";
attachment1.type = "application/octet-stream";
attachment1.encryption = EntityAttachment.PGP_MESSAGE;
attachment1.id = db.attachment().insertAttachment(attachment1);
File file1 = EntityAttachment.getFile(context, attachment1.id);
@@ -856,6 +857,7 @@ public class FragmentCompose extends FragmentEx {
attachment2.sequence = seq + 2;
attachment2.name = "signature.asc";
attachment2.type = "application/octet-stream";
attachment2.encryption = EntityAttachment.PGP_SIGNATURE;
attachment2.id = db.attachment().insertAttachment(attachment2);
File file2 = EntityAttachment.getFile(context, attachment2.id);
@@ -1435,6 +1437,7 @@ public class FragmentCompose extends FragmentEx {
copy.name = attachment.name;
copy.type = attachment.type;
copy.cid = attachment.cid;
copy.encryption = attachment.encryption;
copy.size = attachment.size;
copy.progress = attachment.progress;
copy.available = attachment.available;