Charset improvements

This commit is contained in:
M66B
2020-10-27 18:01:39 +01:00
parent 962e637aee
commit 4faf5ad9bc
2 changed files with 25 additions and 10 deletions

View File

@@ -80,14 +80,14 @@ class CharsetHelper {
if (TextUtils.isEmpty(detected.charset)) {
Log.e("compact_enc_det result=" + detected);
return null;
} else if (!BuildConfig.PLAY_STORE_RELEASE &&
COMMON.contains(detected.charset))
} else if (COMMON.contains(detected.charset))
Log.w("compact_enc_det result=" + detected);
else if ("GB18030".equals(detected.charset) &&
!Locale.getDefault().getLanguage().equals(CHINESE)) {
else if ("GB18030".equals(detected.charset)) {
boolean chinese = Locale.getDefault().getLanguage().equals(CHINESE);
// https://github.com/google/compact_enc_det/issues/8
Log.e("compact_enc_det result=" + detected);
return null;
Log.e("compact_enc_det result=" + detected + " chinese=" + chinese);
if (!chinese)
return null;
} else
Log.e("compact_enc_det result=" + detected);