Charset restoration

4 years ago · 09b9e5557b
parent 8976bee654
commit 09b9e5557b
1 changed files with 14 additions and 13 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -1884,10 +1884,11 @@ public class MessageHelper {
                }

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