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

Improved mime word decoding

This commit is contained in:
M66B 2019-07-18 14:43:27 +02:00
parent ec59befb82
commit e65317bbe7
1 changed files with 5 additions and 13 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

@ -645,13 +645,6 @@ public class MessageHelper {
subject = MimeUtility.unfold(subject);
subject = new String(subject.getBytes(StandardCharsets.ISO_8859_1));
try {
subject = MimeUtility.decodeText(subject);
} catch (UnsupportedEncodingException ex) {
Log.w(ex);
}
subject = decodeMime(subject);
return subject;
@ -769,17 +762,16 @@ public class MessageHelper {
if (e < 0)
break;
String decode = text.substring(s, e + 2);
String encoded = text.substring(s, e + 2);
try {
String decoded = MimeUtility.decodeWord(decode);
text = text.substring(0, s) + decoded + text.substring(e + 2);
i += decoded.length();
String decoded = MimeUtility.decodeWord(encoded);
text = text.substring(0, s).replaceAll("[ \t\n\r]$", "") + decoded + text.substring(e + 2);
} catch (ParseException ex) {
Log.w(new IllegalArgumentException(text, ex));
i += decode.length();
i += encoded.length();
} catch (UnsupportedEncodingException ex) {
Log.w(new IllegalArgumentException(text, ex));
i += decode.length();
i += encoded.length();
}
}