Fix getLastEditNewContent to support media replies

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>"