Fix HTML entities being displayed in messages

Initially reported in element-hq#6445. Fixes element-hq#6445. This was a regression from element-hq#6357. The fix is to enable Markwon's HTML entities processor.
cloudrac3r · Jul 3, 2022 · 84bb11c · 84bb11c
1 parent 93b7e10
commit 84bb11c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog.d/6442.bugfix b/changelog.d/6442.bugfix
@@ -0,0 +1 @@
+Fix HTML entities being displayed in messages
diff --git a/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
@@ -75,7 +75,13 @@ class EventHtmlRenderer @Inject constructor(
     }
         .usePlugin(
             MarkwonInlineParserPlugin.create(
-                MarkwonInlineParser.factoryBuilderNoDefaults().addInlineProcessor(HtmlInlineProcessor())
+                /* Configuring the Markwon inline formatting processor.
+                 * Default settings are all Markdown features. Turn those off, only using the
+                 * inline HTML processor and HTML entities processor.
+                 */
+                MarkwonInlineParser.factoryBuilderNoDefaults()
+                    .addInlineProcessor(HtmlInlineProcessor()) // use inline HTML processor
+                    .addInlineProcessor(EntityInlineProcessor()) // use HTML entities processor
             )
         )
         .usePlugin(object : AbstractMarkwonPlugin() {