Substitute ISO-8859-16 by ISO-8859-1

5 years ago · bc10fc067f
parent f2b027449a
commit bc10fc067f
1 changed files with 2 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -1181,6 +1181,8 @@ public class MessageHelper {
                    charset = charset.replace("\"", "");
                    if ("ASCII".equals(charset.toUpperCase()))
                        charset = "US-ASCII";
+                    else if (charset.toLowerCase().endsWith("8859-16")) // not supported by Android
+                        charset = null; // Use ISO8859-1 instead
                }

                if (TextUtils.isEmpty(charset) || "US-ASCII".equals(charset.toUpperCase())) {