From 83d82566686908c0b2fc615b7ffe93c4a0b90231 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 14 Jan 2018 19:15:57 -0500 Subject: [PATCH] Fix message grouping for group chats --- .../main/java/presentation/feature/compose/MessagesAdapter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index 10fd32ec..3ba31cc6 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -209,8 +209,9 @@ class MessagesAdapter @Inject constructor( private fun canGroup(message: Message, other: Message?): Boolean { if (other == null) return false + val samePerson = message.isMe() && other.isMe() || (!message.isMe() && !other.isMe() && message.address == other.address) val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) - return message.isMe() == other.isMe() && diff < TIMESTAMP_THRESHOLD + return samePerson && diff < TIMESTAMP_THRESHOLD } override fun getItemViewType(position: Int): Int {