mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Assume UTF8 for HTML

This commit is contained in:
M66B 2021-04-28 09:11:25 +02:00
parent 3317a7e9ce
commit f98dcd4fd7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/sun/mail/handlers/text_plain.java
View File

@ -17,6 +17,8 @@
package com.sun.mail.handlers;
import java.io.*;
import java.nio.charset.StandardCharsets;
import javax.activation.*;
import javax.mail.internet.ContentType;
import javax.mail.internet.MimeUtility;
@ -144,7 +146,10 @@ public class text_plain extends handler_base {
String charset = ct.getParameter("charset");
if (charset == null)
// If the charset parameter is absent, use US-ASCII.
charset = "us-ascii";
if ("text/html".equalsIgnoreCase(ct.getBaseType()))
charset = StandardCharsets.UTF_8.name();
else
charset = "us-ascii";
return MimeUtility.javaCharset(charset);
} catch (Exception ex) {
return null;