Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 07:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use ref charset and language for charset detection

Browse Source
This commit is contained in:
M66B
2022-02-13 19:04:40 +01:00
parent 34af1b4e72
commit 39a6b428f5
4 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1840,7 +1840,7 @@ public class MessageHelper {
if (header.trim().startsWith("=?"))
return header;
Charset detected = CharsetHelper.detect(header);
Charset detected = CharsetHelper.detect(header, StandardCharsets.ISO_8859_1);
if (detected == null && CharsetHelper.isUTF8(header))
detected = StandardCharsets.UTF_8;
if (detected == null ||
@@ -2928,7 +2928,7 @@ public class MessageHelper {
Log.i("Charset upgrade=UTF8");
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
} else {
Charset detected = CharsetHelper.detect(result);
Charset detected = CharsetHelper.detect(result, StandardCharsets.ISO_8859_1);
if (detected == null) {
if (CharsetHelper.isUTF8(result)) {
Log.i("Charset plain=UTF8");
@@ -2984,7 +2984,7 @@ public class MessageHelper {
// Fix incorrect UTF16
try {
if (CHARSET16.contains(cs)) {
Charset detected = CharsetHelper.detect(result);
Charset detected = CharsetHelper.detect(result, cs);
if (!CHARSET16.contains(detected))
Log.w(new Throwable("Charset=" + cs + " detected=" + detected));
if (StandardCharsets.US_ASCII.equals(detected) ||
@@ -3034,7 +3034,7 @@ public class MessageHelper {
break;
}
Charset detected = CharsetHelper.detect(result);
Charset detected = CharsetHelper.detect(result, c);
if (c.equals(detected))
break;