From 838e00f4d0e658d28b2f87e9ef9001465574108e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 19 Oct 2024 09:52:19 +0200
Subject: [PATCH] Prevent removing namespaced text

---
 .../java/eu/faircode/email/HtmlHelper.java    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 906bbfe073..39c10791ab 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1764,19 +1764,18 @@ public class HtmlHelper {
                         String style = e.attr("style");
                         e.attr("style", mergeStyles(style, "text-decoration:line-through;"));
                     }
+                } else if (TextUtils.isEmpty(e.text()) && !"\u00a0".equals(e.wholeText())) {
+                    // <meta name=Generator content="Microsoft Word 15 (filtered medium)">
+                    // <p class=MsoNormal>
+                    //    <span style='font-family:"Calibri",sans-serif'>
+                    //       <o:p>&nbsp;</o:p>
+                    //    </span>
+                    // </p>
+                    e.remove();
+                    Log.i("Removed tag=" + tag + " ns=" + ns +
+                            " content=" + Helper.getPrintableString(e.wholeText(), true));
                 } else {
-                    if ("o:p".equals(tag) && "\u00a0".equals(e.wholeText())) {
-                        // <meta name=Generator content="Microsoft Word 15 (filtered medium)">
-                        // <p class=MsoNormal>
-                        //    <span style='font-family:"Calibri",sans-serif'>
-                        //       <o:p>&nbsp;</o:p>
-                        //    </span>
-                        // </p>
-                        e.tagName("br");
-                    } else {
-                        e.remove();
-                        Log.i("Removed tag=" + tag + " ns=" + ns + " content=" + e.text());
-                    }
+                    // Leave tag with unknown namespace to ensure all text is being displayed
                 }
             } else if (!"html".equals(tag) && !"body".equals(tag) && !"w".equals(tag)) {
                 String xmlns = e.attr("xmlns").toLowerCase(Locale.ROOT);