From b56a21b6e54ce770fccb89f9b054ed7e0a2ee80e Mon Sep 17 00:00:00 2001 From: David Perez Date: Thu, 22 Aug 2024 13:48:46 -0500 Subject: [PATCH] PM-10917: Fix crash caused when adding an item from a collection (#3809) --- .../itemlisting/util/VaultItemListingStateExtensions.kt | 2 +- .../itemlisting/util/VaultItemListingStateExtensionsTest.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingStateExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingStateExtensions.kt index e285b30ba..e9e86a03f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingStateExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingStateExtensions.kt @@ -37,8 +37,8 @@ fun VaultItemListingState.ItemListingType.Vault.toVaultItemCipherType(): VaultIt is VaultItemListingState.ItemListingType.Vault.Identity -> VaultItemCipherType.IDENTITY is VaultItemListingState.ItemListingType.Vault.SecureNote -> VaultItemCipherType.SECURE_NOTE is VaultItemListingState.ItemListingType.Vault.Login -> VaultItemCipherType.LOGIN + is VaultItemListingState.ItemListingType.Vault.Collection -> VaultItemCipherType.LOGIN is VaultItemListingState.ItemListingType.Vault.Trash, - is VaultItemListingState.ItemListingType.Vault.Collection, is VaultItemListingState.ItemListingType.Vault.Folder, -> throw IllegalStateException("Cannot create vault item from this VaultItemListingState!") } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingStateExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingStateExtensionsTest.kt index 0950ec9ba..0485bf6ee 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingStateExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingStateExtensionsTest.kt @@ -118,6 +118,7 @@ class VaultItemListingStateExtensionsTest { VaultItemListingState.ItemListingType.Vault.Identity, VaultItemListingState.ItemListingType.Vault.SecureNote, VaultItemListingState.ItemListingType.Vault.Login, + VaultItemListingState.ItemListingType.Vault.Collection(collectionId = "mockId"), ) val result = itemListingTypes.map { it.toVaultItemCipherType() } @@ -128,6 +129,7 @@ class VaultItemListingStateExtensionsTest { VaultItemCipherType.IDENTITY, VaultItemCipherType.SECURE_NOTE, VaultItemCipherType.LOGIN, + VaultItemCipherType.LOGIN, ), result, ) @@ -137,9 +139,6 @@ class VaultItemListingStateExtensionsTest { fun `toVaultItemCipherType should throw an exception for unsupported ItemListingTypes`() { val itemListingTypes = listOf( VaultItemListingState.ItemListingType.Vault.Trash, - VaultItemListingState.ItemListingType.Vault.Collection( - collectionId = "mockId", - ), VaultItemListingState.ItemListingType.Vault.Folder( folderId = "mockId", ),