[Rich text editor] Add feature flag for rich text editor (#1289)

jonnyandrew · web-flow · commit 8ab391f61597 · 2023-09-13T08:17:02.000Z
diff --git a/changelog.d/1289.feature b/changelog.d/1289.feature
@@ -0,0 +1 @@
+[Rich text editor] Add feature flag for rich text editor. Markdown support can now be enabled by disabling the rich text editor.
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@@ -66,6 +66,8 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
 import io.element.android.libraries.designsystem.utils.SnackbarMessage
 import io.element.android.libraries.designsystem.utils.collectSnackbarMessageAsState
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
@@ -95,6 +97,7 @@ class MessagesPresenter @AssistedInject constructor(
     private val dispatchers: CoroutineDispatchers,
     private val clipboardHelper: ClipboardHelper,
     private val analyticsService: AnalyticsService,
+    private val featureFlagService: FeatureFlagService,
     @Assisted private val navigator: MessagesNavigator,
 ) : Presenter<MessagesState> {
 
@@ -143,6 +146,11 @@ class MessagesPresenter @AssistedInject constructor(
             timelineState.eventSink(TimelineEvents.SetHighlightedEvent(composerState.mode.relatedEventId))
         }
 
+        var enableTextFormatting by remember { mutableStateOf(true) }
+        LaunchedEffect(Unit) {
+            enableTextFormatting = featureFlagService.isFeatureEnabled(FeatureFlags.RichTextEditor)
+        }
+
         fun handleEvents(event: MessagesEvents) {
             when (event) {
                 is MessagesEvents.HandleAction -> {
@@ -178,6 +186,7 @@ class MessagesPresenter @AssistedInject constructor(
             snackbarMessage = snackbarMessage,
             showReinvitePrompt = showReinvitePrompt,
             inviteProgress = inviteProgress.value,
+            enableTextFormatting = enableTextFormatting,
             eventSink = { handleEvents(it) }
         )
     }
@@ -250,11 +259,15 @@ class MessagesPresenter @AssistedInject constructor(
         }
     }
 
-    private fun handleActionEdit(targetEvent: TimelineItem.Event, composerState: MessageComposerState) {
+    private suspend fun handleActionEdit(targetEvent: TimelineItem.Event, composerState: MessageComposerState) {
         val composerMode = MessageComposerMode.Edit(
             targetEvent.eventId,
             (targetEvent.content as? TimelineItemTextBasedContent)?.let {
-                it.htmlBody ?: it.body
+                if (featureFlagService.isFeatureEnabled(FeatureFlags.RichTextEditor)) {
+                    it.htmlBody ?: it.body
+                } else {
+                    it.body
+                }
             }.orEmpty(),
             targetEvent.transactionId,
         )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt
@@ -45,5 +45,6 @@ data class MessagesState(
     val snackbarMessage: SnackbarMessage?,
     val inviteProgress: Async<Unit>,
     val showReinvitePrompt: Boolean,
+    val enableTextFormatting: Boolean,
     val eventSink: (MessagesEvents) -> Unit
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt
@@ -82,5 +82,6 @@ fun aMessagesState() = MessagesState(
     snackbarMessage = null,
     inviteProgress = Async.Uninitialized,
     showReinvitePrompt = false,
+    enableTextFormatting = true,
     eventSink = {}
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -304,6 +304,7 @@ private fun MessagesViewContent(
                 state = state.composerState,
                 onSendLocationClicked = onSendLocationClicked,
                 onCreatePollClicked = onCreatePollClicked,
+                enableTextFormatting = state.enableTextFormatting,
                 modifier = Modifier
                     .fillMaxWidth()
                     .wrapContentHeight(Alignment.Bottom)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
@@ -55,6 +55,7 @@ internal fun AttachmentsBottomSheet(
     state: MessageComposerState,
     onSendLocationClicked: () -> Unit,
     onCreatePollClicked: () -> Unit,
+    enableTextFormatting: Boolean,
     modifier: Modifier = Modifier,
 ) {
     val localView = LocalView.current
@@ -87,6 +88,7 @@ internal fun AttachmentsBottomSheet(
         ) {
             AttachmentSourcePickerMenu(
                 state = state,
+                enableTextFormatting = enableTextFormatting,
                 onSendLocationClicked = onSendLocationClicked,
                 onCreatePollClicked = onCreatePollClicked,
             )
@@ -100,6 +102,7 @@ internal fun AttachmentSourcePickerMenu(
     state: MessageComposerState,
     onSendLocationClicked: () -> Unit,
     onCreatePollClicked: () -> Unit,
+    enableTextFormatting: Boolean,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -146,11 +149,13 @@ internal fun AttachmentSourcePickerMenu(
                 text = { Text(stringResource(R.string.screen_room_attachment_source_poll)) },
             )
         }
-        ListItem(
-            modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.ToggleTextFormatting(enabled = true)) },
-            icon = { Icon(Icons.Default.FormatColorText, null) },
-            text = { Text(stringResource(R.string.screen_room_attachment_text_formatting)) },
-        )
+        if (enableTextFormatting) {
+            ListItem(
+                modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.ToggleTextFormatting(enabled = true)) },
+                icon = { Icon(Icons.Default.FormatColorText, null) },
+                text = { Text(stringResource(R.string.screen_room_attachment_text_formatting)) },
+            )
+        }
     }
 }
 
@@ -163,5 +168,6 @@ internal fun AttachmentSourcePickerMenuPreview() = ElementPreview {
         ),
         onSendLocationClicked = {},
         onCreatePollClicked = {},
+        enableTextFormatting = true,
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
@@ -31,6 +31,7 @@ fun MessageComposerView(
     state: MessageComposerState,
     onSendLocationClicked: () -> Unit,
     onCreatePollClicked: () -> Unit,
+    enableTextFormatting: Boolean,
     modifier: Modifier = Modifier,
 ) {
     fun onFullscreenToggle() {
@@ -62,6 +63,7 @@ fun MessageComposerView(
             state = state,
             onSendLocationClicked = onSendLocationClicked,
             onCreatePollClicked = onCreatePollClicked,
+            enableTextFormatting = enableTextFormatting,
         )
 
         TextComposer(
@@ -74,6 +76,7 @@ fun MessageComposerView(
             onResetComposerMode = ::onCloseSpecialMode,
             onAddAttachment = ::onAddAttachment,
             onDismissTextFormatting = ::onDismissTextFormatting,
+            enableTextFormatting = enableTextFormatting,
             onError = ::onError,
         )
     }
@@ -95,5 +98,6 @@ private fun ContentToPreview(state: MessageComposerState) {
         state = state,
         onSendLocationClicked = {},
         onCreatePollClicked = {},
+        enableTextFormatting = true,
     )
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt
@@ -628,6 +628,7 @@ class MessagesPresenterTest {
         val customReactionPresenter = CustomReactionPresenter(emojibaseProvider = FakeEmojibaseProvider())
         val reactionSummaryPresenter = ReactionSummaryPresenter(room = matrixRoom)
         val retrySendMenuPresenter = RetrySendMenuPresenter(room = matrixRoom)
+        val featureFlagsService = FakeFeatureFlagService(mapOf(FeatureFlags.RichTextEditor.key to true))
         return MessagesPresenter(
             room = matrixRoom,
             composerPresenter = messageComposerPresenter,
@@ -642,6 +643,7 @@ class MessagesPresenterTest {
             navigator = navigator,
             clipboardHelper = clipboardHelper,
             analyticsService = analyticsService,
+            featureFlagService = featureFlagsService,
             dispatchers = coroutineDispatchers,
         )
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -46,7 +46,7 @@ dependencyanalysis = "1.21.0"
 stem = "2.3.0"
 sqldelight = "1.5.5"
 telephoto = "0.6.0"
-wysiwyg = "2.9.0"
+wysiwyg = "2.10.0"
 
 # DI
 dagger = "2.48"
diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -44,4 +44,9 @@ enum class FeatureFlags(
         // Do not forget to edit StaticFeatureFlagProvider when enabling the feature.
         defaultValue = false,
     ),
+    RichTextEditor(
+        key = "feature.richtexteditor",
+        title = "Enable rich text editor",
+        defaultValue = true,
+    ),
 }
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt
@@ -35,6 +35,7 @@ class StaticFeatureFlagProvider @Inject constructor() :
                 FeatureFlags.LocationSharing -> true
                 FeatureFlags.Polls -> true
                 FeatureFlags.NotificationSettings -> false
+                FeatureFlags.RichTextEditor -> true
             }
         } else {
             false
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
@@ -79,11 +79,11 @@ interface MatrixRoom : Closeable {
 
     suspend fun userAvatarUrl(userId: UserId): Result<String?>
 
-    suspend fun sendMessage(body: String, htmlBody: String): Result<Unit>
+    suspend fun sendMessage(body: String, htmlBody: String?): Result<Unit>
 
-    suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String): Result<Unit>
+    suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String?): Result<Unit>
 
-    suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String): Result<Unit>
+    suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?): Result<Unit>
 
     suspend fun redactEvent(eventId: EventId, reason: String? = null): Result<Unit>
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -63,10 +63,12 @@ import org.matrix.rustcomponents.sdk.RequiredState
 import org.matrix.rustcomponents.sdk.Room
 import org.matrix.rustcomponents.sdk.RoomListItem
 import org.matrix.rustcomponents.sdk.RoomMember
+import org.matrix.rustcomponents.sdk.RoomMessageEventContentWithoutRelation
 import org.matrix.rustcomponents.sdk.RoomSubscription
 import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
 import org.matrix.rustcomponents.sdk.genTransactionId
 import org.matrix.rustcomponents.sdk.messageEventContentFromHtml
+import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown
 import timber.log.Timber
 import java.io.File
 
@@ -227,32 +229,32 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun sendMessage(body: String, htmlBody: String): Result<Unit> = withContext(roomDispatcher) {
+    override suspend fun sendMessage(body: String, htmlBody: String?): Result<Unit> = withContext(roomDispatcher) {
         val transactionId = genTransactionId()
-        messageEventContentFromHtml(body, htmlBody).use { content ->
+        messageEventContentFromParts(body, htmlBody).use { content ->
             runCatching {
                 innerRoom.send(content, transactionId)
             }
         }
     }
 
-    override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String): Result<Unit> =
+    override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String?): Result<Unit> =
         withContext(roomDispatcher) {
             if (originalEventId != null) {
                 runCatching {
-                    innerRoom.edit(messageEventContentFromHtml(body, htmlBody), originalEventId.value, transactionId?.value)
+                    innerRoom.edit(messageEventContentFromParts(body, htmlBody), originalEventId.value, transactionId?.value)
                 }
             } else {
                 runCatching {
                     transactionId?.let { cancelSend(it) }
-                    innerRoom.send(messageEventContentFromHtml(body, htmlBody), genTransactionId())
+                    innerRoom.send(messageEventContentFromParts(body, htmlBody), genTransactionId())
                 }
             }
         }
 
-    override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String): Result<Unit> = withContext(roomDispatcher) {
+    override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?): Result<Unit> = withContext(roomDispatcher) {
         runCatching {
-            innerRoom.sendReply(messageEventContentFromHtml(body, htmlBody), eventId.value, genTransactionId())
+            innerRoom.sendReply(messageEventContentFromParts(body, htmlBody), eventId.value, genTransactionId())
         }
     }
 
@@ -456,4 +458,11 @@ class RustMatrixRoom(
             MediaUploadHandlerImpl(files, handle())
         }
     }
+
+    private fun messageEventContentFromParts(body: String, htmlBody: String?): RoomMessageEventContentWithoutRelation =
+        if(htmlBody != null) {
+            messageEventContentFromHtml(body, htmlBody)
+        } else {
+            messageEventContentFromMarkdown(body)
+        }
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
@@ -92,7 +92,7 @@ class FakeMatrixRoom(
     private var sendPollResponseResult = Result.success(Unit)
     private var endPollResult = Result.success(Unit)
     private var progressCallbackValues = emptyList<Pair<Long, Long>>()
-    val editMessageCalls = mutableListOf<Pair<String, String>>()
+    val editMessageCalls = mutableListOf<Pair<String, String?>>()
 
     var sendMediaCount = 0
         private set
@@ -171,7 +171,7 @@ class FakeMatrixRoom(
         userAvatarUrlResult
     }
 
-    override suspend fun sendMessage(body: String, htmlBody: String) = simulateLongTask {
+    override suspend fun sendMessage(body: String, htmlBody: String?) = simulateLongTask {
         Result.success(Unit)
     }
 
@@ -200,15 +200,15 @@ class FakeMatrixRoom(
         return cancelSendResult
     }
 
-    override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String): Result<Unit> {
+    override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String?): Result<Unit> {
         editMessageCalls += body to htmlBody
         return Result.success(Unit)
     }
 
-    var replyMessageParameter: Pair<String, String>? = null
+    var replyMessageParameter: Pair<String, String?>? = null
         private set
 
-    override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String): Result<Unit> {
+    override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?): Result<Unit> {
         replyMessageParameter = body to htmlBody
         return Result.success(Unit)
     }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/Message.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/Message.kt
@@ -17,6 +17,6 @@
 package io.element.android.libraries.textcomposer
 
 data class Message(
-    val html: String,
+    val html: String?,
     val markdown: String,
 )
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[Rich text editor] Add feature flag for rich text editor. Markdown support can now be enabled by disabling the rich text editor.`
Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,6 @@ data class MessagesState(`
`45`	`45`	`val snackbarMessage: SnackbarMessage?,`
`46`	`46`	`val inviteProgress: Async<Unit>,`
`47`	`47`	`val showReinvitePrompt: Boolean,`
	`48`	`+ val enableTextFormatting: Boolean,`
`48`	`49`	`val eventSink: (MessagesEvents) -> Unit`
`49`	`50`	`)`
Original file line number	Diff line number	Diff line change
`@@ -82,5 +82,6 @@ fun aMessagesState() = MessagesState(`
`82`	`82`	`snackbarMessage = null,`
`83`	`83`	`inviteProgress = Async.Uninitialized,`
`84`	`84`	`showReinvitePrompt = false,`
	`85`	`+ enableTextFormatting = true,`
`85`	`86`	`eventSink = {}`
`86`	`87`	`)`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ fun MessageComposerView(`
`31`	`31`	`state: MessageComposerState,`
`32`	`32`	`onSendLocationClicked: () -> Unit,`
`33`	`33`	`onCreatePollClicked: () -> Unit,`
	`34`	`+ enableTextFormatting: Boolean,`
`34`	`35`	`modifier: Modifier = Modifier,`
`35`	`36`	`) {`
`36`	`37`	`fun onFullscreenToggle() {`
`@@ -62,6 +63,7 @@ fun MessageComposerView(`
`62`	`63`	`state = state,`
`63`	`64`	`onSendLocationClicked = onSendLocationClicked,`
`64`	`65`	`onCreatePollClicked = onCreatePollClicked,`
	`66`	`+ enableTextFormatting = enableTextFormatting,`
`65`	`67`	`)`
`66`	`68`
`67`	`69`	`TextComposer(`
`@@ -74,6 +76,7 @@ fun MessageComposerView(`
`74`	`76`	`onResetComposerMode = ::onCloseSpecialMode,`
`75`	`77`	`onAddAttachment = ::onAddAttachment,`
`76`	`78`	`onDismissTextFormatting = ::onDismissTextFormatting,`
	`79`	`+ enableTextFormatting = enableTextFormatting,`
`77`	`80`	`onError = ::onError,`
`78`	`81`	`)`
`79`	`82`	`}`
`@@ -95,5 +98,6 @@ private fun ContentToPreview(state: MessageComposerState) {`
`95`	`98`	`state = state,`
`96`	`99`	`onSendLocationClicked = {},`
`97`	`100`	`onCreatePollClicked = {},`
	`101`	`+ enableTextFormatting = true,`
`98`	`102`	`)`
`99`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ class StaticFeatureFlagProvider @Inject constructor() :`
`35`	`35`	`FeatureFlags.LocationSharing -> true`
`36`	`36`	`FeatureFlags.Polls -> true`
`37`	`37`	`FeatureFlags.NotificationSettings -> false`
	`38`	`+ FeatureFlags.RichTextEditor -> true`
`38`	`39`	`}`
`39`	`40`	`} else {`
`40`	`41`	`false`
Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,12 @@ import org.matrix.rustcomponents.sdk.RequiredState`
`63`	`63`	`import org.matrix.rustcomponents.sdk.Room`
`64`	`64`	`import org.matrix.rustcomponents.sdk.RoomListItem`
`65`	`65`	`import org.matrix.rustcomponents.sdk.RoomMember`
	`66`	`+import org.matrix.rustcomponents.sdk.RoomMessageEventContentWithoutRelation`
`66`	`67`	`import org.matrix.rustcomponents.sdk.RoomSubscription`
`67`	`68`	`import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle`
`68`	`69`	`import org.matrix.rustcomponents.sdk.genTransactionId`
`69`	`70`	`import org.matrix.rustcomponents.sdk.messageEventContentFromHtml`
	`71`	`+import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown`
`70`	`72`	`import timber.log.Timber`
`71`	`73`	`import java.io.File`
`72`	`74`
`@@ -227,32 +229,32 @@ class RustMatrixRoom(`
`227`	`229`	`}`
`228`	`230`	`}`
`229`	`231`
`230`		`- override suspend fun sendMessage(body: String, htmlBody: String): Result<Unit> = withContext(roomDispatcher) {`
	`232`	`+ override suspend fun sendMessage(body: String, htmlBody: String?): Result<Unit> = withContext(roomDispatcher) {`
`231`	`233`	`val transactionId = genTransactionId()`
`232`		`- messageEventContentFromHtml(body, htmlBody).use { content ->`
	`234`	`+ messageEventContentFromParts(body, htmlBody).use { content ->`
`233`	`235`	`runCatching {`
`234`	`236`	`innerRoom.send(content, transactionId)`
`235`	`237`	`}`
`236`	`238`	`}`
`237`	`239`	`}`
`238`	`240`
`239`		`- override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String): Result<Unit> =`
	`241`	`+ override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String?): Result<Unit> =`
`240`	`242`	`withContext(roomDispatcher) {`
`241`	`243`	`if (originalEventId != null) {`
`242`	`244`	`runCatching {`
`243`		`- innerRoom.edit(messageEventContentFromHtml(body, htmlBody), originalEventId.value, transactionId?.value)`
	`245`	`+ innerRoom.edit(messageEventContentFromParts(body, htmlBody), originalEventId.value, transactionId?.value)`
`244`	`246`	`}`
`245`	`247`	`} else {`
`246`	`248`	`runCatching {`
`247`	`249`	`transactionId?.let { cancelSend(it) }`
`248`		`- innerRoom.send(messageEventContentFromHtml(body, htmlBody), genTransactionId())`
	`250`	`+ innerRoom.send(messageEventContentFromParts(body, htmlBody), genTransactionId())`
`249`	`251`	`}`
`250`	`252`	`}`
`251`	`253`	`}`
`252`	`254`
`253`		`- override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String): Result<Unit> = withContext(roomDispatcher) {`
	`255`	`+ override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?): Result<Unit> = withContext(roomDispatcher) {`
`254`	`256`	`runCatching {`
`255`		`- innerRoom.sendReply(messageEventContentFromHtml(body, htmlBody), eventId.value, genTransactionId())`
	`257`	`+ innerRoom.sendReply(messageEventContentFromParts(body, htmlBody), eventId.value, genTransactionId())`
`256`	`258`	`}`
`257`	`259`	`}`
`258`	`260`
`@@ -456,4 +458,11 @@ class RustMatrixRoom(`
`456`	`458`	`MediaUploadHandlerImpl(files, handle())`
`457`	`459`	`}`
`458`	`460`	`}`
	`461`	`+`
	`462`	`+ private fun messageEventContentFromParts(body: String, htmlBody: String?): RoomMessageEventContentWithoutRelation =`
	`463`	`+ if(htmlBody != null) {`
	`464`	`+ messageEventContentFromHtml(body, htmlBody)`
	`465`	`+ } else {`
	`466`	`+ messageEventContentFromMarkdown(body)`
	`467`	`+ }`
`459`	`468`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ class FakeMatrixRoom(`
`92`	`92`	`private var sendPollResponseResult = Result.success(Unit)`
`93`	`93`	`private var endPollResult = Result.success(Unit)`
`94`	`94`	`private var progressCallbackValues = emptyList<Pair<Long, Long>>()`
`95`		`- val editMessageCalls = mutableListOf<Pair<String, String>>()`
	`95`	`+ val editMessageCalls = mutableListOf<Pair<String, String?>>()`
`96`	`96`
`97`	`97`	`var sendMediaCount = 0`
`98`	`98`	`private set`
`@@ -171,7 +171,7 @@ class FakeMatrixRoom(`
`171`	`171`	`userAvatarUrlResult`
`172`	`172`	`}`
`173`	`173`
`174`		`- override suspend fun sendMessage(body: String, htmlBody: String) = simulateLongTask {`
	`174`	`+ override suspend fun sendMessage(body: String, htmlBody: String?) = simulateLongTask {`
`175`	`175`	`Result.success(Unit)`
`176`	`176`	`}`
`177`	`177`
`@@ -200,15 +200,15 @@ class FakeMatrixRoom(`
`200`	`200`	`return cancelSendResult`
`201`	`201`	`}`
`202`	`202`
`203`		`- override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String): Result<Unit> {`
	`203`	`+ override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, body: String, htmlBody: String?): Result<Unit> {`
`204`	`204`	`editMessageCalls += body to htmlBody`
`205`	`205`	`return Result.success(Unit)`
`206`	`206`	`}`
`207`	`207`
`208`		`- var replyMessageParameter: Pair<String, String>? = null`
	`208`	`+ var replyMessageParameter: Pair<String, String?>? = null`
`209`	`209`	`private set`
`210`	`210`
`211`		`- override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String): Result<Unit> {`
	`211`	`+ override suspend fun replyMessage(eventId: EventId, body: String, htmlBody: String?): Result<Unit> {`
`212`	`212`	`replyMessageParameter = body to htmlBody`
`213`	`213`	`return Result.success(Unit)`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`package io.element.android.libraries.textcomposer`
`18`	`18`
`19`	`19`	`data class Message(`
`20`		`- val html: String,`
	`20`	`+ val html: String?,`
`21`	`21`	`val markdown: String,`
`22`	`22`	`)`