From 834f9c65709bb2ea13ccc386bc72682f59f61280 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 7 Feb 2021 09:01:13 +0100 Subject: [PATCH] Enable decoding attachment filenames again --- app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index c1c48a30a0..dbc1954c07 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -2489,14 +2489,14 @@ public class MessageHelper { // From the body structure: // 1. disposition filename // 2. content type name - filename = part.getFileName(); + filename = part.getFileName(); // IMAPBodyPart/BODYSTRUCTURE if (filename != null) { // https://tools.ietf.org/html/rfc2231 // http://kb.mozillazine.org/Attachments_renamed // https://blog.nodemailer.com/2017/01/27/the-mess-that-is-attachment-filenames/ int q1 = filename.indexOf('\''); int q2 = filename.indexOf('\'', q1 + 1); - if (q1 >= 0 && q2 > 0 && false) { + if (q1 >= 0 && q2 > 0) { try { String charset = filename.substring(0, q1); String language = filename.substring(q1 + 1, q2);