From d0d4d1589932f372fb7f96aebf9d5dceecf2f026 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 4 Jun 2019 18:35:51 +0200
Subject: [PATCH] Refactoring

---
 .../java/eu/faircode/email/MessageHelper.java | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index b8fcbe7eee..85fc99948f 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -663,22 +663,8 @@ public class MessageHelper {
             } catch (UnsupportedEncodingException ex) {
                 Log.w(ex);
             }
-        } else {
-            // Fix UTF-8 plain header
-            try {
-                char[] kars = subject.toCharArray();
-                byte[] bytes = new byte[kars.length];
-                for (int i = 0; i < kars.length; i++)
-                    bytes[i] = (byte) kars[i];
-
-                CharsetDecoder cs = StandardCharsets.UTF_8.newDecoder();
-                CharBuffer out = cs.decode(ByteBuffer.wrap(bytes));
-                if (out.length() > 0)
-                    subject = new String(bytes, StandardCharsets.UTF_8);
-            } catch (CharacterCodingException ex) {
-                Log.w(ex);
-            }
-        }
+        } else
+            subject = fixUTF8(subject);
 
         return decodeMime(subject);
     }
@@ -798,6 +784,24 @@ public class MessageHelper {
         return text;
     }
 
+    static String fixUTF8(String text) {
+        try {
+            char[] kars = text.toCharArray();
+            byte[] bytes = new byte[kars.length];
+            for (int i = 0; i < kars.length; i++)
+                bytes[i] = (byte) kars[i];
+
+            CharsetDecoder cs = StandardCharsets.UTF_8.newDecoder();
+            CharBuffer out = cs.decode(ByteBuffer.wrap(bytes));
+            if (out.length() > 0)
+                return new String(bytes, StandardCharsets.UTF_8);
+        } catch (CharacterCodingException ex) {
+            Log.w(ex);
+        }
+
+        return text;
+    }
+
     static String getSortKey(Address[] addresses) {
         if (addresses == null || addresses.length == 0)
             return null;