Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Skip converting to 16 bits charsets

Browse Source
This commit is contained in:
M66B
2020-10-25 07:58:53 +01:00
parent d49deb9f42
commit 09b771bd03
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -124,6 +124,12 @@ public class MessageHelper {
private static final int FORMAT_FLOWED_LINE_LENGTH = 72;
private static final long MIN_REQUIRED_SPACE = 250 * 1024L * 1024L;
private static final List<Charset> CHARSET16 = Collections.unmodifiableList(Arrays.asList(
StandardCharsets.UTF_16,
StandardCharsets.UTF_16BE,
StandardCharsets.UTF_16LE
));
// https://tools.ietf.org/html/rfc4021
static void setSystemProperties(Context context) {
@@ -1793,13 +1799,13 @@ public class MessageHelper {
if (!TextUtils.isEmpty(charset))
try {
Charset detected = CharsetHelper.detect(result);
Log.i("Charset detected=" + detected + " meta=" + meta);
Log.i("Charset meta=" + meta);
Charset c = Charset.forName(charset);
if (c.equals(StandardCharsets.UTF_8) && !CharsetHelper.isUTF8(result))
break;
if (c.equals(StandardCharsets.UTF_16) && !c.equals(detected))
if (CHARSET16.contains(c))
break;
Log.e("Converting meta=" + c);
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), c);
break;
} catch (Throwable ex) {