From 9fabfaf9780374540c5b8297bbd35c28e3cf680b Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 7 Aug 2022 07:22:57 +0200 Subject: [PATCH] Disabled UTF-7 detection --- app/src/main/java/eu/faircode/email/CharsetHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/CharsetHelper.java b/app/src/main/java/eu/faircode/email/CharsetHelper.java index 2ed247f647..c20ef673c5 100644 --- a/app/src/main/java/eu/faircode/email/CharsetHelper.java +++ b/app/src/main/java/eu/faircode/email/CharsetHelper.java @@ -42,7 +42,7 @@ public class CharsetHelper { "US-ASCII", "ISO-8859-1", "ISO-8859-2", "ISO-8859-3", "ISO-8859-7", "windows-1250", "windows-1251", "windows-1252", "windows-1255", "windows-1256", "windows-1257", - "UTF-7", "UTF-8" + "UTF-8" )); private static final List LESS_COMMON = Collections.unmodifiableList(Arrays.asList( "GBK", "GB2312", "HZ-GB-2312", @@ -244,6 +244,8 @@ public class CharsetHelper { return null; } else if (COMMON.contains(detected.charset) || LESS_COMMON.contains(detected.charset)) Log.w("compact_enc_det result=" + detected); + else if ("UTF-7".equals(detected.charset)) + return null; else if ("GB18030".equals(detected.charset)) { boolean chinese = Locale.getDefault().getLanguage().equals(CHINESE); // https://github.com/google/compact_enc_det/issues/8