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

Improved header encoding fixing

This commit is contained in:
M66B 2021-06-16 16:35:13 +02:00
parent 4d82a6c751
commit b52c3171c4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -1207,13 +1207,17 @@ public class MessageHelper {
if (header.trim().startsWith("=?")) if (header.trim().startsWith("=?"))
return header; return header;
if (CharsetHelper.isUTF8(header)) { Charset detected = CharsetHelper.detect(header);
Log.i("Converting " + name + " to UTF-8"); if (detected == null && CharsetHelper.isUTF8(header))
return new String(header.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8); detected = StandardCharsets.UTF_8;
} else { if (detected == null ||
Log.i("Converting " + name + " to ISO8859-1"); CHARSET16.contains(detected) ||
return new String(header.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.ISO_8859_1); StandardCharsets.US_ASCII.equals(detected) ||
} StandardCharsets.ISO_8859_1.equals(detected))
return header;
Log.i("Converting " + name + " to " + detected);
return new String(header.getBytes(StandardCharsets.ISO_8859_1), detected);
} }
private Address[] getAddressHeader(String name) throws MessagingException { private Address[] getAddressHeader(String name) throws MessagingException {