From 1572e73ba733d55288360429818464a8e86b980d Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Mon, 4 Jul 2022 01:07:14 +1200 Subject: [PATCH] Fix HTML entities being displayed in messages Initially reported in #6445. Fixes #6445. This was a regression from #6357. The fix is to enable Markwon's HTML entities processor. Change-Id: I65588d6df24257851490161f4672f7461e6e5fc1 --- .../im/vector/app/features/html/EventHtmlRenderer.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 index ca60d9dfd3..c7a1dd3270 100644 --- a/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt @@ -40,6 +40,7 @@ import io.noties.markwon.ext.latex.JLatexMathTheme import io.noties.markwon.html.HtmlPlugin import io.noties.markwon.image.AsyncDrawable import io.noties.markwon.image.glide.GlideImagesPlugin +import io.noties.markwon.inlineparser.EntityInlineProcessor import io.noties.markwon.inlineparser.HtmlInlineProcessor import io.noties.markwon.inlineparser.MarkwonInlineParser import io.noties.markwon.inlineparser.MarkwonInlineParserPlugin @@ -134,7 +135,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() {