Date change message repeats for each redaction until a normal message
This commit is contained in:
parent
8ca829d538
commit
7966ebef03
|
@ -11,7 +11,7 @@ Other changes:
|
|||
-
|
||||
|
||||
Bugfix:
|
||||
-
|
||||
- Date change message repeats for each redaction until a normal message (#358)
|
||||
|
||||
Translations:
|
||||
-
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue