From 54e69d7b5986cb3ce6867b5bcad8dafc088b239f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 11 Feb 2022 16:57:50 +0100
Subject: [PATCH] Escape font names with spaces

---
 app/src/main/java/eu/faircode/email/HtmlEx.java      | 2 +-
 app/src/main/java/eu/faircode/email/StyleHelper.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlEx.java b/app/src/main/java/eu/faircode/email/HtmlEx.java
index a41768ea32..f948b029dc 100644
--- a/app/src/main/java/eu/faircode/email/HtmlEx.java
+++ b/app/src/main/java/eu/faircode/email/HtmlEx.java
@@ -381,7 +381,7 @@ public class HtmlEx {
                     //    out.append("<tt>");
                     //}
 
-                    out.append("<span style=\"font-family:" + s + ";\">");
+                    out.append("<span style='font-family:" + s + ";'>");
                 }
                 if (style[j] instanceof SuperscriptSpan) {
                     out.append("<sup>");
diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index c4ecd83dc2..628155fd38 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -933,15 +933,15 @@ public class StyleHelper {
         if (faces.contains("arimo"))
             return "Arimo, Arial, Verdana, sans-serif";
         if (faces.contains("tinos"))
-            return "Tinos, Times New Roman, serif";
+            return "Tinos, \"Times New Roman\", serif";
         if (faces.contains("cousine"))
-            return "Cousine, Courier New, monospace";
+            return "Cousine, \"Courier New\", monospace";
         if (faces.contains("lato"))
             return "Lato, Carlito, Calibri, sans-serif";
         if (faces.contains("caladea"))
             return "Caladea, Cambo, Cambria, serif";
         if (faces.contains("comic sans"))
-            return "OpenDyslexic, Comic Sans, Comic Sans MS, sans-serif";
+            return "OpenDyslexic, \"Comic Sans\", \"Comic Sans MS\", sans-serif";
         return family;
     }
 
@@ -959,6 +959,7 @@ public class StyleHelper {
             faces.add(face
                     .trim()
                     .toLowerCase(Locale.ROOT)
+                    .replace("'", "")
                     .replace("\"", ""));
 
         if (faces.contains("fairemail"))