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

Charset optimizations

This commit is contained in:
M66B 2021-03-13 21:19:11 +01:00
parent 3832d1ebaf
commit e151720ba6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1939,12 +1939,19 @@ public class MessageHelper {
}
Charset detected = CharsetHelper.detect(result);
if (!(StandardCharsets.US_ASCII.equals(detected) &&
StandardCharsets.UTF_8.equals(c)))
if (BuildConfig.PLAY_STORE_RELEASE)
Log.w("Converting detected=" + detected + " meta=" + c);
else
Log.e("Converting detected=" + detected + " meta=" + c);
if (c.equals(detected))
break;
if (StandardCharsets.US_ASCII.equals(detected) &&
("windows-1252".equals(c.name()) ||
StandardCharsets.UTF_8.equals(c) ||
StandardCharsets.ISO_8859_1.equals(c)))
break;
if (BuildConfig.PLAY_STORE_RELEASE)
Log.w("Converting detected=" + detected + " meta=" + c);
else
Log.e("Converting detected=" + detected + " meta=" + c);
// Convert
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), c);