From 5a19df047cd33b2afb2198d192884367561e9e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 23 Nov 2023 15:39:30 -0500
Subject: [PATCH] conversation: use correct last interaction
Change-Id: I2ef3d3aa278e706af334ad873a5bd7b9cfcc1d67
---
.../src/main/kotlin/net/jami/model/Conversation.kt | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt
index 3bfb6c056..412372c4a 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt
@@ -410,13 +410,10 @@ class Conversation : ConversationHistory {
@Synchronized
fun sortHistory() {
if (mDirty) {
- //Log.w(TAG, "sortHistory()")
aggregateHistory.sortWith { c1, c2 -> c1.timestamp.compareTo(c2.timestamp) }
- for (i in aggregateHistory.asReversed())
- if (i.type != Interaction.InteractionType.INVALID) {
- lastEventSubject.onNext(aggregateHistory.last())
- break
- }
+ aggregateHistory.lastOrNull { it.type != Interaction.InteractionType.INVALID }?.let {
+ lastEventSubject.onNext(it)
+ }
mDirty = false
}
}
--
GitLab