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

Date change message repeats for each redaction until a normal message

This commit is contained in:
Valere 2019-08-18 15:12:59 -04:00
parent 8ca829d538
commit 7966ebef03
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -11,7 +11,7 @@ Other changes:
-

Bugfix:
-
- Date change message repeats for each redaction until a normal message (#358)

Translations:
-

3
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
View File

@ -56,7 +56,8 @@ fun TimelineEvent.isDisplayable(showHiddenEvent: Boolean): Boolean {
return false
}
if (root.content.isNullOrEmpty()) {
return false
//redacted events have empty content but are displayable
return root.unsignedData?.redactedEvent != null
}
//Edits should be filtered out!
if (EventType.MESSAGE == root.type

8
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt
View File

@ -50,10 +50,10 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses

val showInformation =
addDaySeparator
|| event.senderAvatar != nextEvent?.senderAvatar
|| event.getDisambiguatedDisplayName() != nextEvent?.getDisambiguatedDisplayName()
|| (nextEvent.root.getClearType() != EventType.MESSAGE && nextEvent.root.getClearType() != EventType.ENCRYPTED)
|| isNextMessageReceivedMoreThanOneHourAgo
|| event.senderAvatar != nextEvent?.senderAvatar
|| event.getDisambiguatedDisplayName() != nextEvent?.getDisambiguatedDisplayName()
|| (nextEvent.root.getClearType() != EventType.MESSAGE && nextEvent.root.getClearType() != EventType.ENCRYPTED)
|| isNextMessageReceivedMoreThanOneHourAgo

val time = dateFormatter.formatMessageHour(date)
val avatarUrl = event.senderAvatar