From e49154f90c810001d116ec000943d68980f28628 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 4 Feb 2024 10:49:41 +0100
Subject: [PATCH] Revert "Consider monospace font as plain text"

This reverts commit a9009f73e91ba4cf28a54b68533c5c3d5b000145.
---
 .../java/eu/faircode/email/HtmlHelper.java    |  6 ------
 .../java/eu/faircode/email/StyleHelper.java   | 20 ++++++++-----------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 31c8f78a13..762f1efe21 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -894,12 +894,6 @@ public class HtmlHelper {
                             if (!text_font)
                                 continue;
 
-                            if (!TextUtils.isEmpty(value)) {
-                                List<String> faces = StyleHelper.getTypeFaces(value);
-                                if (faces.contains("monospace"))
-                                    element.attr("x-plain", "true");
-                            }
-
                             // https://developer.mozilla.org/en-US/docs/Web/CSS/font-family
                             sb.append(key).append(":").append(value).append(";");
                             break;
diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index cf5050f5c2..17f172d18c 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -1816,17 +1816,6 @@ public class StyleHelper {
         return new CustomTypefaceSpan(family, getTypeface(family, context));
     }
 
-    static List<String> getTypeFaces(String family) {
-        List<String> faces = new ArrayList<>();
-        for (String face : family.split(","))
-            faces.add(face
-                    .trim()
-                    .toLowerCase(Locale.ROOT)
-                    .replace("'", "")
-                    .replace("\"", ""));
-        return faces;
-    }
-
     static Typeface getTypeface(String family, Context context) {
         if (TextUtils.isEmpty(family))
             return Typeface.DEFAULT;
@@ -1835,8 +1824,15 @@ public class StyleHelper {
         boolean bundled_fonts = prefs.getBoolean("bundled_fonts", true);
         boolean narrow_fonts = prefs.getBoolean("narrow_fonts", false);
 
+        List<String> faces = new ArrayList<>();
+        for (String face : family.split(","))
+            faces.add(face
+                    .trim()
+                    .toLowerCase(Locale.ROOT)
+                    .replace("'", "")
+                    .replace("\"", ""));
+
         try {
-            List<String> faces = getTypeFaces(family);
 
             if (faces.contains("fairemail"))
                 return ResourcesCompat.getFont(context.getApplicationContext(), R.font.fantasy);