6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Timeline hot fix: when room member is null, use sender to render name. Still have to figure it out why RoomMember can be null.

Browse Source
This commit is contained in:
ganfra 2019-01-18 19:40:20 +01:00
parent 2380499af2
commit c7c3a57c93
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/MessageItemFactory.kt
View File

@ -21,7 +21,7 @@ class MessageItemFactory(private val timelineDateFormatter: TimelineDateFormatte


val messageContent: MessageContent? = event.root.content.toModel() val messageContent: MessageContent? = event.root.content.toModel()
val roomMember = event.roomMember val roomMember = event.roomMember
if (messageContent == null || roomMember == null) { if (messageContent == null) {
return null return null
} }
val nextRoomMember = nextEvent?.roomMember val nextRoomMember = nextEvent?.roomMember
@ -34,7 +34,7 @@ class MessageItemFactory(private val timelineDateFormatter: TimelineDateFormatte


if (addDaySeparator if (addDaySeparator
|| nextRoomMember != roomMember || nextRoomMember != roomMember
|| nextEvent.root.type != EventType.MESSAGE || nextEvent?.root?.type != EventType.MESSAGE
|| isNextMessageReceivedMoreThanOneHourAgo) { || isNextMessageReceivedMoreThanOneHourAgo) {
messagesDisplayedWithInformation.add(event.root.eventId) messagesDisplayedWithInformation.add(event.root.eventId)
} }
@ -52,10 +52,10 @@ class MessageItemFactory(private val timelineDateFormatter: TimelineDateFormatte
val showInformation = messagesDisplayedWithInformation.contains(event.root.eventId) val showInformation = messagesDisplayedWithInformation.contains(event.root.eventId)
return MessageItem( return MessageItem(
message = message, message = message,
avatarUrl = roomMember.avatarUrl, avatarUrl = roomMember?.avatarUrl,
showInformation = showInformation, showInformation = showInformation,
time = timelineDateFormatter.formatMessageHour(date), time = timelineDateFormatter.formatMessageHour(date),
memberName = roomMember.displayName ?: event.root.sender memberName = roomMember?.displayName ?: event.root.sender
) )
} }