From 87fecc73795a9d047250664cebdc1920acc4e0ec Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 26 Jun 2026 15:10:31 +0000 Subject: [PATCH] Skip per-folder unread queries when only the default chat folder exists. --- .../conversationlist/ConversationListViewModel.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt index a9ecb66d54..a8d8fe5939 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt @@ -217,7 +217,12 @@ sealed class ConversationListViewModel( private fun loadCurrentFolders() { viewModelScope.launch(Dispatchers.IO) { val folders = ChatFoldersRepository.getCurrentFolders() - val unreadCountAndEmptyAndMutedStatus = ChatFoldersRepository.getUnreadCountAndEmptyAndMutedStatusForFolders(folders) + + val unreadCountAndEmptyAndMutedStatus: Map> = if (folders.size > 1) { + ChatFoldersRepository.getUnreadCountAndEmptyAndMutedStatusForFolders(folders) + } else { + emptyMap() + } val selectedFolderId = if (currentFolder.id == -1L) { folders.firstOrNull()?.id