Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-15 09:10:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing header encoding in some more cases

Browse Source
This commit is contained in:
M66B
2020-04-06 09:46:42 +02:00
parent 1e3e37d3ce
commit f3fa8cb065
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -995,15 +995,29 @@ public class MessageHelper {
return null;
}
private String fixEncoding(String name, String header) {
if (header.trim().startsWith("=?"))
return header;
if (Helper.isUTF8(header)) {
if (!Helper.isISO8859(header)) {
Log.w("Converting " + name + " to UTF-8");
return new String(header.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
}
} else {
Log.w("Converting " + name + " to ISO8859-1");
return new String(header.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.ISO_8859_1);
}
return header;
}
private Address[] getAddressHeader(String name) throws MessagingException {
String header = imessage.getHeader(name, ",");
if (header == null)
return null;
if (!Helper.isUTF8(header)) {
Log.w("Converting header '" + name + "' to ISO8859-1");
header = new String(header.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.ISO_8859_1);
}
header = fixEncoding(name, header);
Address[] addresses = InternetAddress.parseHeader(header, false);
for (Address address : addresses) {
@@ -1144,10 +1158,7 @@ public class MessageHelper {
if (subject == null)
return null;
if (!Helper.isUTF8(subject)) {
Log.w("Converting subject to ISO8859-1");
subject = new String(subject.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.ISO_8859_1);
}
subject = fixEncoding("subject", subject);
subject = subject.replaceAll("\\?=\\r?\\n\\s+=\\?", "\\?==\\?");
subject = MimeUtility.unfold(subject);
subject = decodeMime(subject);