Charset optimizations

4 years ago · e151720ba6
parent 3832d1ebaf
commit e151720ba6
1 changed files with 13 additions and 6 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -1939,8 +1939,15 @@ public class MessageHelper {
                                    }

                                    Charset detected = CharsetHelper.detect(result);
-                                    if (!(StandardCharsets.US_ASCII.equals(detected) &&
-                                            StandardCharsets.UTF_8.equals(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