Added charset workarounds

6 years ago · 9e7c2ddcec
parent 5132479a76
commit 9e7c2ddcec
1 changed files with 6 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
+++ b/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
@ -74,6 +74,12 @@ public class UnknownCharsetProvider extends CharsetProvider {
            if ("UTF-8//TRANSLIT".equalsIgnoreCase(name))
                return StandardCharsets.UTF_8;

+            if ("BASE64".equalsIgnoreCase(name) ||
+                    "ISO".equalsIgnoreCase(name) ||
+                    "latin".equalsIgnoreCase(name) ||
+                    "windows-1252".equalsIgnoreCase(name))
+                return StandardCharsets.ISO_8859_1;
+
            // Android will prevent recursion
            String jname = MimeUtility.javaCharset(name);
            return Charset.forName(jname);