From 3720213615ddd91b20e4192b098ec11daed97c2b Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Mon, 10 Apr 2023 15:56:56 +0300
Subject: [PATCH] Fix getLastEditNewContent to support media replies
---
.../api/session/room/timeline/TimelineEvent.kt | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
index a49c20cc..0bc7cb58 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
@@ -28,7 +28,6 @@ import org.matrix.android.sdk.api.session.events.model.isLiveLocation
import org.matrix.android.sdk.api.session.events.model.isPoll
import org.matrix.android.sdk.api.session.events.model.isReply
import org.matrix.android.sdk.api.session.events.model.isSticker
-import org.matrix.android.sdk.api.session.events.model.toContent
import org.matrix.android.sdk.api.session.events.model.toModel
import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
import org.matrix.android.sdk.api.session.room.model.ReadReceipt
@@ -158,20 +157,7 @@ fun TimelineEvent.getLastMessageContent(): MessageContent? {
}
}
-fun TimelineEvent.getLastEditNewContent(): Content? {
- val lastContent = annotations?.editSummary?.latestEdit?.getClearContent()?.toModel<MessageContent>()?.newContent
- return if (isReply()) {
- val previousFormattedBody = root.getClearContent().toModel<MessageTextContent>()?.formattedBody
- if (previousFormattedBody?.isNotEmpty() == true) {
- val lastMessageContent = lastContent.toModel<MessageTextContent>()
- lastMessageContent?.let { ensureCorrectFormattedBodyInTextReply(it, previousFormattedBody) }?.toContent() ?: lastContent
- } else {
- lastContent
- }
- } else {
- lastContent
- }
-}
+fun TimelineEvent.getLastEditNewContent(): Content? = annotations?.editSummary?.latestEdit?.getClearContent()?.toModel<MessageContent>()?.newContent
private const val MX_REPLY_END_TAG = "</mx-reply>"
--
GitLab