From 618a0cbfefd41172fbe06555e2d257d3356bef28 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 22 Jun 2019 12:34:33 +0200 Subject: [PATCH] Decode US-ASCII as ISO_8859_1 --- app/src/main/java/eu/faircode/email/MessageHelper.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index ab0c6321e4..a29718e12f 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -847,9 +847,12 @@ public class MessageHelper { // 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.forName(charset).name()) && - !"US-ASCII".equals(charset.toUpperCase())) - warnings.add(context.getString(R.string.title_no_charset, charset)); + if ("US-ASCII".equals(charset.toUpperCase())) + result = new String(result.getBytes(StandardCharsets.ISO_8859_1)); + else { + if ("US-ASCII".equals(Charset.forName(charset).name())) + warnings.add(context.getString(R.string.title_no_charset, charset)); + } } } catch (ParseException ex) { Log.w(ex);