rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Editing: default to MessageContent.body when no formattedBody is present (#7592)

Browse Source 
* Editing: default to `MessageContent.body` when no `formattedBody` is present

* Update docs
This commit is contained in:
Jorge Martin Espinosa 2022-11-16 13:13:07 +01:00 committed by GitHub
parent 54fcdcdb6d
commit 10775ab2f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7574.sdk Normal file
View File

@ -0,0 +1 @@
If message content has no `formattedBody`, default to `body` when editing.

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
View File

@ -180,11 +180,13 @@ fun TimelineEvent.isRootThread(): Boolean {
/** /**
* Get the latest message body, after a possible edition, stripping the reply prefix if necessary. * Get the latest message body, after a possible edition, stripping the reply prefix if necessary.
* @param formatted Indicates whether the formatted HTML body of the message should be retrieved of the plain text one.
* @return If [formatted] is `true`, the HTML body of the message will be retrieved if available. Otherwise, the plain text/markdown version will be returned.
*/ */
fun TimelineEvent.getTextEditableContent(formatted: Boolean): String { fun TimelineEvent.getTextEditableContent(formatted: Boolean): String {
val lastMessageContent = getLastMessageContent() val lastMessageContent = getLastMessageContent()
val lastContentBody = if (formatted && lastMessageContent is MessageContentWithFormattedBody) { val lastContentBody = if (formatted && lastMessageContent is MessageContentWithFormattedBody) {
lastMessageContent.formattedBody lastMessageContent.formattedBody ?: lastMessageContent.body
} else { } else {
lastMessageContent?.body lastMessageContent?.body
} ?: return "" } ?: return ""