mirror of
https://github.com/bitwarden/android.git
synced 2026-10-22 02:53:19 -05:00
PM-32354: Filter out archived items from CXP (#6547)
This commit is contained in:
1 parent
275d90bb61
commit
222bc44c99
2 files changed
+7
-2
No files matched your search
+2
-2
@@ -94,7 +94,7 @@ class ReviewExportViewModel @Inject constructor(
|
||||
.value
|
||||
.data
|
||||
?.successes
|
||||
?.filter { it.deletedDate == null }
|
||||
?.filter { it.deletedDate == null && it.archivedDate == null }
|
||||
.filterRestrictedItemsIfNecessary(),
|
||||
)
|
||||
.fold(
|
||||
@@ -241,7 +241,7 @@ class ReviewExportViewModel @Inject constructor(
|
||||
var secureNoteItemCount = 0
|
||||
this@toItemTypeCounts
|
||||
?.successes
|
||||
?.filter { it.deletedDate == null }
|
||||
?.filter { it.deletedDate == null && it.archivedDate == null }
|
||||
.orEmpty()
|
||||
.forEach {
|
||||
when {
|
||||
|
||||
+5
@@ -120,6 +120,10 @@ class ReviewExportViewModelTest : BaseViewModelTest() {
|
||||
number = 1,
|
||||
isDeleted = true,
|
||||
)
|
||||
val mockArchivedCipherListView = createMockCipherListView(
|
||||
number = 1,
|
||||
isArchived = true,
|
||||
)
|
||||
decryptCipherListResultFlow.tryEmit(
|
||||
DataState.Loaded(
|
||||
createMockDecryptCipherListResult(
|
||||
@@ -128,6 +132,7 @@ class ReviewExportViewModelTest : BaseViewModelTest() {
|
||||
mockActiveLoginCipherListView,
|
||||
mockActiveCardCipherListView,
|
||||
mockDeletedCipherListView,
|
||||
mockArchivedCipherListView,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
Reference in new issue
Block a user