Display reply to only if the root event is a text message.

tchapgouv · Jul 25, 2024 · da3c493 · da3c493
1 parent 7e248e8
commit da3c493
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.../org/matrix/android/sdk/internal/session/room/timeline/decorator/UpdatedReplyDecorator.kt b/.../org/matrix/android/sdk/internal/session/room/timeline/decorator/UpdatedReplyDecorator.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session.room.timeline.decorator
 import io.realm.Realm
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.isThread
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -40,7 +41,8 @@ internal class UpdatedReplyDecorator(
 ) : TimelineEventDecorator {
 
     override fun decorate(timelineEvent: TimelineEvent): TimelineEvent {
-        return if (timelineEvent.isReply() && !timelineEvent.root.isThread()) {
+        // TCHAP Display reply to only if the root event is a text message.
+        return if (timelineEvent.isReply() && !timelineEvent.root.isThread() && timelineEvent.root.isTextMessage()) {
             val newRepliedEvent = createNewRepliedEvent(timelineEvent) ?: return timelineEvent
             timelineEvent.copy(root = newRepliedEvent)
         } else {

diff --git a/...java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt b/...java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
@@ -27,6 +27,7 @@ import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.getRelationContentForType
 import org.matrix.android.sdk.api.session.events.model.getRootThreadEventId
 import org.matrix.android.sdk.api.session.events.model.isSticker
+import org.matrix.android.sdk.api.session.events.model.isTextMessage
 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.message.MessageFormat
@@ -168,7 +169,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
         roomId ?: return null
         if (lightweightSettingsStorage.areThreadMessagesEnabled() && !isReplyEvent(event)) return null
         handleRootThreadEventsIfNeeded(realm, roomId, eventEntity, event)
-        if (!isThreadEvent(event)) return null
+        // TCHAP Display reply to only if the root event is a text message.
+        if (!isThreadEvent(event) || !event.isTextMessage()) return null
         val eventPayload = if (!event.isEncrypted()) {
             event.content?.toMutableMap() ?: return null
         } else {