PM-18121: Use correct cipher type for edit screen (#4755)

bitwarden · Feb 20, 2025 · 9d9f9e3 · 9d9f9e3
1 parent a061cbb
commit 9d9f9e3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt
@@ -47,7 +47,6 @@ import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultIdentityItemTypeH
 import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultLoginItemTypeHandlers
 import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultSshKeyItemTypeHandlers
 import com.x8bit.bitwarden.ui.vault.model.VaultAddEditType
-import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
 
 /**
  * Displays the vault item screen.
@@ -90,7 +89,7 @@ fun VaultItemScreen(
                         } else {
                             VaultAddEditType.EditItem(vaultItemId = event.itemId)
                         },
-                        vaultItemCipherType = VaultItemCipherType.LOGIN,
+                        vaultItemCipherType = event.type,
                     ),
                 )
             }

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
@@ -239,6 +239,7 @@ class VaultItemViewModel @Inject constructor(
                 VaultItemEvent.NavigateToAddEdit(
                     itemId = state.vaultItemId,
                     isClone = false,
+                    type = state.cipherType,
                 ),
             )
         }
@@ -423,7 +424,13 @@ class VaultItemViewModel @Inject constructor(
                 )
                 return@onContent
             }
-            sendEvent(VaultItemEvent.NavigateToAddEdit(itemId = state.vaultItemId, isClone = true))
+            sendEvent(
+                event = VaultItemEvent.NavigateToAddEdit(
+                    itemId = state.vaultItemId,
+                    isClone = true,
+                    type = state.cipherType,
+                ),
+            )
         }
     }
 
@@ -1828,6 +1835,7 @@ sealed class VaultItemEvent {
     data class NavigateToAddEdit(
         val itemId: String,
         val isClone: Boolean,
+        val type: VaultItemCipherType,
     ) : VaultItemEvent()
 
     /**

diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt
@@ -96,7 +96,13 @@ class VaultItemScreenTest : BaseComposeTest() {
     @Test
     fun `NavigateToEdit event should invoke onNavigateToVaultEditItem`() {
         val id = "id1234"
-        mutableEventFlow.tryEmit(VaultItemEvent.NavigateToAddEdit(itemId = id, isClone = false))
+        mutableEventFlow.tryEmit(
+            value = VaultItemEvent.NavigateToAddEdit(
+                itemId = id,
+                isClone = false,
+                type = VaultItemCipherType.LOGIN,
+            ),
+        )
         assertEquals(
             VaultAddEditArgs(
                 vaultAddEditType = VaultAddEditType.EditItem(vaultItemId = id),

diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt
@@ -660,6 +660,7 @@ class VaultItemViewModelTest : BaseViewModelTest() {
                     VaultItemEvent.NavigateToAddEdit(
                         itemId = VAULT_ITEM_ID,
                         isClone = false,
+                        type = VaultItemCipherType.LOGIN,
                     ),
                     awaitItem(),
                 )
@@ -724,6 +725,7 @@ class VaultItemViewModelTest : BaseViewModelTest() {
                         VaultItemEvent.NavigateToAddEdit(
                             itemId = DEFAULT_STATE.vaultItemId,
                             isClone = false,
+                            type = VaultItemCipherType.LOGIN,
                         ),
                         eventFlow.awaitItem(),
                     )
@@ -1345,6 +1347,7 @@ class VaultItemViewModelTest : BaseViewModelTest() {
                         VaultItemEvent.NavigateToAddEdit(
                             itemId = VAULT_ITEM_ID,
                             isClone = true,
+                            type = VaultItemCipherType.LOGIN,
                         ),
                         awaitItem(),
                     )