From b0059f35e446967e9986ededb1a4d0ffd2ed412d Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 28 Jul 2021 13:29:28 +0200 Subject: [PATCH] Skip conversion from detected ASCII --- app/src/main/java/eu/faircode/email/MessageHelper.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index b4988aba0d..e51dbd5cc2 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -2064,8 +2064,15 @@ public class MessageHelper { if (c.equals(detected)) break; + // Common detected/meta + // - windows-1250, windows-1257 / ISO-8859-1 + // - ISO-8859-1 / windows-1252 + // - US-ASCII / windows-1250, windows-1252, ISO-8859-1, ISO-8859-15, UTF-8 + if (StandardCharsets.US_ASCII.equals(detected) && - ("windows-1252".equals(c.name()) || + ("ISO-8859-15".equals(c.name()) || + "windows-1250".equals(c.name()) || + "windows-1252".equals(c.name()) || StandardCharsets.UTF_8.equals(c) || StandardCharsets.ISO_8859_1.equals(c))) break;