Merge pull request #8517 from vector-im/dla/feature/rte_paste_images

Update rich text editor library to support pasting of images
element-hq · Jun 9, 2023 · 7d084f1 · 7d084f1
2 parents 0f18cdb + 38330a7
commit 7d084f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/8270.bugfix b/changelog.d/8270.bugfix
@@ -0,0 +1 @@
+Update rich text editor library to support pasting of images.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -101,7 +101,7 @@ ext.libs = [
         ],
         element     : [
                 'opusencoder'             : "io.element.android:opusencoder:1.1.0",
-                'wysiwyg'                 : "io.element.android:wysiwyg:2.2.1"
+                'wysiwyg'                 : "io.element.android:wysiwyg:2.2.2"
         ],
         squareup    : [
                 'moshi'                  : "com.squareup.moshi:moshi:$moshi",

diff --git a/.../src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt b/.../src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
@@ -88,7 +88,7 @@ internal class RichTextComposerLayout @JvmOverloads constructor(
     override val text: Editable?
         get() = editText.text
     override val formattedText: String?
-        get() = (editText as? EditorEditText)?.getHtmlOutput()
+        get() = (editText as? EditorEditText)?.getContentAsMessageHtml()
     override val editText: EditText
         get() = if (isTextFormattingEnabled) {
             views.richTextComposerEditText