From a36e260ac6237de8fcb8f2a59ea09f2f86e10fba Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 28 Sep 2019 13:22:52 +0200 Subject: [PATCH] Workaround wrong attachment content types --- .../java/eu/faircode/email/MessageHelper.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 8f263dfa09..a2387ffdf6 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -1224,15 +1224,16 @@ public class MessageHelper { // For example, sometimes PDF files are sent as application/octet-stream if (!apart.pgp) { String extension = Helper.getExtension(apart.attachment.name); - if (extension != null && - ("pdf".equals(extension.toLowerCase(Locale.ROOT)) || - "application/octet-stream".equals(apart.attachment.type))) { - String type = MimeTypeMap.getSingleton() - .getMimeTypeFromExtension(extension.toLowerCase(Locale.ROOT)); - if (type != null) { - if (!type.equals(apart.attachment.type)) - Log.w("Guessing file=" + apart.attachment.name + " type=" + type); - apart.attachment.type = type; + if (extension != null) { + if ("application/zip".equals(apart.attachment.type) || + "application/octet-stream".equals(apart.attachment.type)) { + String type = MimeTypeMap.getSingleton() + .getMimeTypeFromExtension(extension.toLowerCase(Locale.ROOT)); + if (type != null) { + if (!type.equals(apart.attachment.type)) + Log.w("Guessing file=" + apart.attachment.name + " type=" + type); + apart.attachment.type = type; + } } } }