Skip to content

Commit bcefbb9

Browse files
committed
Render body for m.room.message if msgtype is unknown, in timeline and as room list last message. #1539
1 parent 8c2a5f2 commit bcefbb9

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
2525
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
2626
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemNoticeContent
2727
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
28-
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
2928
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
3029
import io.element.android.features.messages.impl.timeline.util.FileExtensionExtractor
3130
import io.element.android.features.messages.impl.timeline.util.toHtmlDocument
@@ -131,7 +130,12 @@ class TimelineItemContentMessageFactory @Inject constructor(
131130
htmlDocument = messageType.formatted?.toHtmlDocument(),
132131
isEdited = content.isEdited,
133132
)
134-
UnknownMessageType -> TimelineItemUnknownContent
133+
UnknownMessageType -> TimelineItemTextContent(
134+
// Display the body as a fallback
135+
body = content.body,
136+
htmlDocument = null,
137+
isEdited = content.isEdited,
138+
)
135139
}
136140
}
137141

libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
130130
sp.getString(CommonStrings.common_audio)
131131
}
132132
UnknownMessageType -> {
133-
sp.getString(CommonStrings.common_unsupported_event)
133+
// Display the body as a fallback
134+
messageContent.body
134135
}
135136
is NoticeMessageType -> {
136137
messageType.body

0 commit comments

Comments
 (0)