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 cfd376ef9c5b075e9b66977e231c2672c7ee4007..4e30576ccbeb3984d752a218dd625f1085fa141c 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