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

Charset restoration

This commit is contained in:
M66B 2021-06-25 17:00:20 +02:00
parent 8976bee654
commit 09b9e5557b
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1884,10 +1884,11 @@ public class MessageHelper {
} }
if (h.isPlainText()) { if (h.isPlainText()) {
if (charset == null || StandardCharsets.ISO_8859_1.equals(cs))
if (StandardCharsets.ISO_8859_1.equals(cs) && CharsetHelper.isUTF8(result)) { if (StandardCharsets.ISO_8859_1.equals(cs) && CharsetHelper.isUTF8(result)) {
Log.i("Charset upgrade=UTF8"); Log.i("Charset upgrade=UTF8");
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8); result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
} else if (charset == null) { } else {
Charset detected = CharsetHelper.detect(result); Charset detected = CharsetHelper.detect(result);
if (detected == null) { if (detected == null) {
if (CharsetHelper.isUTF8(result)) { if (CharsetHelper.isUTF8(result)) {