From 39ba3c02d941e195110f9f5bf5dec3b11c4d8290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 10 Nov 2022 14:28:54 -0500
Subject: [PATCH] account: don't sort empty conversation list

Change-Id: Ie3b898b9efe329ab4b7cbab6eb2988c83bdcbae8
---
 .../src/main/kotlin/net/jami/model/Account.kt             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt b/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
index cfd376ef9..4e30576cc 100644
--- a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
+++ b/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
@@ -741,9 +741,11 @@ class Account(
     private fun getSortedConversations(): List<Conversation> {
         if (conversationsChanged) {
             sortedConversations.clear()
-            sortedConversations.addAll(conversations.values)
-            for (c in sortedConversations) c.sortHistory()
-            Collections.sort(sortedConversations, ConversationComparator())
+            if (conversations.isNotEmpty()) {
+                sortedConversations.addAll(conversations.values)
+                for (c in sortedConversations) c.sortHistory()
+                Collections.sort(sortedConversations, ConversationComparator())
+            }
             conversationsChanged = false
         }
         return sortedConversations
-- 
GitLab