Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 20:06:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Skip GB18030 when not Chinese

Browse Source
This commit is contained in:
M66B
2020-10-25 09:33:02 +01:00
parent 09b771bd03
commit 0d854d9877
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/CharsetHelper.java
View File

@@ -23,8 +23,10 @@ import android.text.TextUtils;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Locale;
class CharsetHelper {
private static String CHINESE = new Locale("zh").getLanguage();
private static final int MAX_SAMPLE_SIZE = 8192;
static {
@@ -87,12 +89,12 @@ class CharsetHelper {
"windows-1257".equals(detected) ||
"UTF-8".equals(detected))
Log.w("compact_enc_det result=" + detected);
else if ("GB18030".equals(detected)) {
else if ("GB18030".equals(detected) &&
!Locale.getDefault().getLanguage().equals(CHINESE)) {
// https://github.com/google/compact_enc_det/issues/8
Log.w("compact_enc_det result=" + detected);
return null;
} else
// ISO-2022-JP, GB18030
} else // ISO-2022-JP, etc
Log.e("compact_enc_det result=" + detected);
if (TextUtils.isEmpty(detected))