empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix message clustering for CIV2.

Browse source
This commit is contained in:
Alex Hart 2023-08-23 10:07:36 -03:00 • committed by Cody Henthorne
parent c4109a19d6
commit 02e6b89fdd
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape.kt
View file

@ -102,17 +102,21 @@ class V2ConversationItemShape(
previousMessage: MessageRecord?, previousMessage: MessageRecord?,
isGroupThread: Boolean isGroupThread: Boolean
): Boolean { ): Boolean {
if (previousMessage == null || if (previousMessage == null) {
previousMessage.isUpdate || return true
}
val sharedChecks = previousMessage.isUpdate ||
!DateUtils.isSameDay(currentMessage.timestamp, previousMessage.timestamp) || !DateUtils.isSameDay(currentMessage.timestamp, previousMessage.timestamp) ||
!isWithinClusteringTime(currentMessage, previousMessage) || !isWithinClusteringTime(currentMessage, previousMessage) ||
currentMessage.isScheduled() || currentMessage.isScheduled() ||
currentMessage.fromRecipient != previousMessage.fromRecipient currentMessage.fromRecipient != previousMessage.fromRecipient
) {
return true
}
return isGroupThread || currentMessage.isSecure != previousMessage.isSecure return if (isGroupThread) {
sharedChecks
} else {
sharedChecks || currentMessage.isSecure != previousMessage.isSecure
}
} }
private fun isEndOfMessageCluster( private fun isEndOfMessageCluster(

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2TextOnlyViewHolder.kt
View file

@ -612,4 +612,4 @@ class V2TextOnlyViewHolder<Model : MappingModel<Model>>(
return true return true
} }
} }
} }