ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 06:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

MessageContent.type cannot be null

Browse Source
This commit is contained in:
Benoit Marty
2023-10-11 16:12:20 +02:00
committed by Benoit Marty
parent 1b0e044565
commit 8c2a5f281b
3 changed files with 3 additions and 5 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
+1 -1
View File
@@ -49,7 +49,7 @@ class TimelineItemContentMessageFactory @Inject constructor(
) { ) {
fun create(content: MessageContent, senderDisplayName: String): TimelineItemEventContent { fun create(content: MessageContent, senderDisplayName: String): TimelineItemEventContent {
return when (val messageType = content.type ?: UnknownMessageType) { return when (val messageType = content.type) {
is EmoteMessageType -> TimelineItemEmoteContent( is EmoteMessageType -> TimelineItemEmoteContent(
body = "* $senderDisplayName ${messageType.body}", body = "* $senderDisplayName ${messageType.body}",
htmlDocument = messageType.formatted?.toHtmlDocument(prefix = "* senderDisplayName"), htmlDocument = messageType.formatted?.toHtmlDocument(prefix = "* senderDisplayName"),
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
+1 -3
View File
@@ -106,9 +106,7 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
} }
private fun processMessageContents(messageContent: MessageContent, senderDisplayName: String, isDmRoom: Boolean): CharSequence? { private fun processMessageContents(messageContent: MessageContent, senderDisplayName: String, isDmRoom: Boolean): CharSequence? {
val messageType: MessageType = messageContent.type ?: return null val internalMessage = when (val messageType: MessageType = messageContent.type) {
val internalMessage = when (messageType) {
// Doesn't need a prefix // Doesn't need a prefix
is EmoteMessageType -> { is EmoteMessageType -> {
return "* $senderDisplayName ${messageType.body}" return "* $senderDisplayName ${messageType.body}"
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
+1 -1
View File
@@ -28,7 +28,7 @@ data class MessageContent(
val inReplyTo: InReplyTo?, val inReplyTo: InReplyTo?,
val isEdited: Boolean, val isEdited: Boolean,
val isThreaded: Boolean, val isThreaded: Boolean,
val type: MessageType? val type: MessageType
) : EventContent ) : EventContent
data object RedactedContent : EventContent data object RedactedContent : EventContent