From 6967a89d84a6453817e7b50b032abf60f07915bb Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 3 Apr 2018 13:50:02 +0200
Subject: [PATCH] Only consider messages of same type as followup

---
 .../quasseldroid/ui/chat/messages/MessageListFragment.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
index c1d58cdf5..aa0234f3b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
@@ -280,7 +280,7 @@ class MessageListFragment : ServiceBoundFragment() {
       return list.asReversed().map {
         val date = it.time.atZone(ZoneId.systemDefault()).truncatedTo(ChronoUnit.DAYS)
         val isSameDay = previousDate?.isEqual(date) ?: false
-        val isFollowUp = previous?.sender == it.sender && isSameDay
+        val isFollowUp = previous?.sender == it.sender && previous?.type == it.type && isSameDay
         previous = it
         previousDate = date
         DisplayMessage(
-- 
GitLab