ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Render body for m.room.message if msgtype is unknown, in timeline and as room list last message. #1539

Browse Source
This commit is contained in:
Benoit Marty
2023-10-11 16:18:24 +02:00
parent 8c2a5f281b
commit bcefbb9861
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
+6 -2
View File
@@ -25,7 +25,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemNoticeContent import io.element.android.features.messages.impl.timeline.model.event.TimelineItemNoticeContent
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
import io.element.android.features.messages.impl.timeline.util.FileExtensionExtractor import io.element.android.features.messages.impl.timeline.util.FileExtensionExtractor
import io.element.android.features.messages.impl.timeline.util.toHtmlDocument import io.element.android.features.messages.impl.timeline.util.toHtmlDocument
@@ -131,7 +130,12 @@ class TimelineItemContentMessageFactory @Inject constructor(
htmlDocument = messageType.formatted?.toHtmlDocument(), htmlDocument = messageType.formatted?.toHtmlDocument(),
isEdited = content.isEdited, isEdited = content.isEdited,
) )
UnknownMessageType -> TimelineItemUnknownContent UnknownMessageType -> TimelineItemTextContent(
// Display the body as a fallback
body = content.body,
htmlDocument = null,
isEdited = content.isEdited,
)
} }
} }
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
+2 -1
View File
@@ -130,7 +130,8 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
sp.getString(CommonStrings.common_audio) sp.getString(CommonStrings.common_audio)
} }
UnknownMessageType -> { UnknownMessageType -> {
sp.getString(CommonStrings.common_unsupported_event) // Display the body as a fallback
messageContent.body
} }
is NoticeMessageType -> { is NoticeMessageType -> {
messageType.body messageType.body