From 9e7c2ddcecadf170ae5ffade69ce112f04eb9985 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 4 Feb 2020 12:48:27 +0100
Subject: [PATCH] Added charset workarounds

---
 .../main/java/eu/faircode/email/UnknownCharsetProvider.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java b/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
index e7e5fdb7f0..317750873f 100644
--- a/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
+++ b/app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
@@ -74,6 +74,12 @@ public class UnknownCharsetProvider extends CharsetProvider {
             if ("UTF-8//TRANSLIT".equalsIgnoreCase(name))
                 return StandardCharsets.UTF_8;
 
+            if ("BASE64".equalsIgnoreCase(name) ||
+                    "ISO".equalsIgnoreCase(name) ||
+                    "latin".equalsIgnoreCase(name) ||
+                    "windows-1252".equalsIgnoreCase(name))
+                return StandardCharsets.ISO_8859_1;
+
             // Android will prevent recursion
             String jname = MimeUtility.javaCharset(name);
             return Charset.forName(jname);