Fixes #2296 - Set MarkdownContent instead of HTMLContent on the rich …

…text editor when feature disabled
element-hq · Jan 8, 2024 · 4e53c4f · 4e53c4f
1 parent b5be663
commit 4e53c4f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarViewModel.swift b/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarViewModel.swift
@@ -245,7 +245,12 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
 
     private func set(text: String) {
         wysiwygViewModel.textView.flushPills()
-        wysiwygViewModel.setHtmlContent(text)
+
+        if appSettings.richTextEditorEnabled {
+            wysiwygViewModel.setHtmlContent(text)
+        } else {
+            wysiwygViewModel.setMarkdownContent(text)
+        }
     }
 
     private func createLinkAlert() {

diff --git a/changelog.d/2296.bugfix b/changelog.d/2296.bugfix
@@ -0,0 +1 @@
+Trying to edit messages containing links with angle brackets doesn't pre-populate the message composer
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Trying to edit messages containing links with angle brackets doesn't pre-populate the message composer