From 254491cf06da9fc3b56ebb0b4b6812d8096d7680 Mon Sep 17 00:00:00 2001 From: Gabriel Brand Date: Thu, 30 Jul 2026 20:39:45 +0200 Subject: [PATCH] Exclude archived items from folder item count --- .../itemlisting/util/VaultItemListingDataExtensions.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt index 76b81e88a80..52194732f20 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt @@ -188,8 +188,8 @@ fun VaultData.toViewState( count = decryptCipherListResult .successes .count { - it.deletedDate == null && - !it.id.isNullOrBlank() && + !it.id.isNullOrBlank() && + it.isActive && folderView.id == it.folderId }, ) @@ -201,7 +201,7 @@ fun VaultData.toViewState( count = allFilteredCipherViewList .count { !it.id.isNullOrBlank() && - it.deletedDate == null && + it.isActive && collectionView.id in it.collectionIds }, )