From 8ee2e1ec83d96dbd15030c9d10e7c6acaf7bd62a Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 2 Jul 2019 07:35:04 +0200 Subject: [PATCH] Fixed default charset --- app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 6059500e4c..c2ec678b95 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -817,11 +817,11 @@ public class MessageHelper { String charset = ct.getParameter("charset"); if (TextUtils.isEmpty(charset)) { if (BuildConfig.DEBUG) - warnings.add(context.getString(R.string.title_no_charset, ct.toString())); + warnings.add(context.getString(R.string.title_no_charset, ct)); // The first 127 characters are the same as in US-ASCII result = new String(result.getBytes(StandardCharsets.ISO_8859_1)); } else { - if ("US-ASCII".equals(charset.toUpperCase())) + if ("US-ASCII".equals(charset.toUpperCase()) || "ISO-8859-1".equals(charset.toUpperCase())) result = new String(result.getBytes(StandardCharsets.ISO_8859_1)); else { if ("US-ASCII".equals(Charset.forName(charset).name()))