From f48821fcebbb44afbd94024730094c311206cfbd Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 24 Oct 2020 21:23:03 +0200 Subject: [PATCH] Workaround incorrectly detected charset FairEmail is not being distributed in China, etc --- app/src/main/java/eu/faircode/email/CharsetHelper.java | 6 +++++- 1 file changed, 5 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 518daa4252..991ce84b9f 100644 --- a/app/src/main/java/eu/faircode/email/CharsetHelper.java +++ b/app/src/main/java/eu/faircode/email/CharsetHelper.java @@ -87,7 +87,11 @@ class CharsetHelper { "windows-1257".equals(detected) || "UTF-8".equals(detected)) Log.w("compact_enc_det result=" + detected); - else + else if ("GB18030".equals(detected)) { + // https://github.com/google/compact_enc_det/issues/8 + Log.w("compact_enc_det result=" + detected); + return null; + } else // ISO-2022-JP, GB18030 Log.e("compact_enc_det result=" + detected);