From bf19df9c0287f6d9a20ea39c8cda677d259083f2 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 22 Jun 2022 19:07:00 +0200 Subject: [PATCH] Fixed Javamail/allow UTF-8 --- app/src/main/java/eu/faircode/email/MessageHelper.java | 2 +- app/src/main/java/javax/mail/internet/MimeBodyPart.java | 8 ++++---- app/src/main/java/javax/mail/internet/MimeMessage.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 271b7f30fc..907656c0b3 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -245,7 +245,7 @@ public class MessageHelper { System.setProperty("mail.mime.encodefilename", "false"); System.setProperty("mail.mime.decodeparameters", "true"); System.setProperty("mail.mime.encodeparameters", "true"); - System.setProperty("mail.mime.allowutf8", "false"); // InternetAddress, MimeBodyPart, MimeUtility + System.setProperty("mail.mime.allowutf8", "false"); // InternetAddress, (MimeBodyPart: session), MimeUtility System.setProperty("mail.mime.cachemultipart", "false"); // https://docs.oracle.com/javaee/6/api/javax/mail/internet/MimeMultipart.html diff --git a/app/src/main/java/javax/mail/internet/MimeBodyPart.java b/app/src/main/java/javax/mail/internet/MimeBodyPart.java index c1b44a9553..38a92a8a35 100644 --- a/app/src/main/java/javax/mail/internet/MimeBodyPart.java +++ b/app/src/main/java/javax/mail/internet/MimeBodyPart.java @@ -78,8 +78,8 @@ public class MimeBodyPart extends BodyPart implements MimePart { private static final boolean ignoreMultipartEncoding = PropUtil.getBooleanSystemProperty( "mail.mime.ignoremultipartencoding", true); - private static final boolean allowutf8 = - PropUtil.getBooleanSystemProperty("mail.mime.allowutf8", true); + //private static final boolean allowutf8 = + //PropUtil.getBooleanSystemProperty("mail.mime.allowutf8", true); // Paranoia: // allow this last minute change to be disabled if it causes problems @@ -969,7 +969,7 @@ public class MimeBodyPart extends BodyPart implements MimePart { @Override public void writeTo(OutputStream os) throws IOException, MessagingException { - writeTo(this, os, null); + writeTo(this, os, null, false); } /** @@ -1620,7 +1620,7 @@ public class MimeBodyPart extends BodyPart implements MimePart { part.removeHeader("Content-Transfer-Encoding"); } - static void writeTo(MimePart part, OutputStream os, String[] ignoreList) + static void writeTo(MimePart part, OutputStream os, String[] ignoreList, boolean allowutf8) throws IOException, MessagingException { // see if we already have a LOS diff --git a/app/src/main/java/javax/mail/internet/MimeMessage.java b/app/src/main/java/javax/mail/internet/MimeMessage.java index 396f550c93..262a0fc763 100644 --- a/app/src/main/java/javax/mail/internet/MimeMessage.java +++ b/app/src/main/java/javax/mail/internet/MimeMessage.java @@ -1877,7 +1877,7 @@ public class MimeMessage extends Message implements MimePart { saveChanges(); if (modified) { - MimeBodyPart.writeTo(this, os, ignoreList); + MimeBodyPart.writeTo(this, os, ignoreList, allowutf8); return; }