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

Workaround incorrect UTF-16 meta

This commit is contained in:
M66B 2020-10-24 22:12:11 +02:00
parent f48821fceb
commit 0f811d2c72
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1793,11 +1793,14 @@ public class MessageHelper {
if (!TextUtils.isEmpty(charset))
try {
Log.i("Charset=" + meta);
Charset detected = CharsetHelper.detect(result);
Log.i("Charset detected=" + detected + " meta=" + meta);
Charset c = Charset.forName(charset);
if (c.equals(StandardCharsets.UTF_8) && !CharsetHelper.isUTF8(result))
break;
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), charset);
if (c.equals(StandardCharsets.UTF_16) && !c.equals(detected))
break;
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), c);
break;
} catch (Throwable ex) {
Log.w(ex);