From e9bceaf26be8e5ea8899465a87e4e9ff8ab13286 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 23 Dec 2019 20:01:25 +0100 Subject: [PATCH] Small fix --- app/src/main/java/eu/faircode/email/Core.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 8cd7edf42e..f742473736 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2148,16 +2148,16 @@ class Core { int sequence = 1; String autocrypt = helper.getAutocrypt(); - if (autocrypt != null) - try { - EntityAttachment attachment = new EntityAttachment(); - attachment.message = message.id; - attachment.sequence = sequence++; - attachment.name = "pubkey.pem"; - attachment.type = "application/pgp-keys"; - attachment.disposition = Part.ATTACHMENT; - attachment.id = db.attachment().insertAttachment(attachment); + if (autocrypt != null) { + EntityAttachment attachment = new EntityAttachment(); + attachment.message = message.id; + attachment.sequence = sequence++; + attachment.name = "pubkey.pem"; + attachment.type = "application/pgp-keys"; + attachment.disposition = Part.ATTACHMENT; + attachment.id = db.attachment().insertAttachment(attachment); + try { byte[] b = Base64.decode(autocrypt, Base64.DEFAULT); File file = attachment.getFile(context); @@ -2170,7 +2170,10 @@ class Core { db.attachment().setDownloaded(attachment.id, file.length()); } catch (IllegalArgumentException ex) { Log.w(ex); + db.attachment().setDownloaded(attachment.id, 0L); + db.attachment().setError(attachment.id, Log.formatThrowable(ex, false)); } + } List attachments = parts.getAttachments(); for (EntityAttachment attachment : attachments) {