github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-04 03:36:32 -05:00
Code Issues 1.9k Packages Projects Releases 126 Wiki Activity

BIT-1704: Edit items in collection bug (#977)

Browse Source
This commit is contained in:
Ramsey Smith
2024-02-07 15:52:39 -07:00
committed by Álison Fernandes
parent 3266ed65c3
commit f7150d33cb
4 changed files with 182 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt
View File

@@ -744,7 +744,11 @@ class VaultRepositoryImpl(
}
is UpdateCipherResponseJson.Success -> {
vaultDiskSource.saveCipher(userId = userId, cipher = response.cipher)
vaultDiskSource.saveCipher(
userId = userId,
cipher = response.cipher
.copy(collectionIds = cipherView.collectionIds),
)
UpdateCipherResult.Success
}
}

6
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
View File

@@ -114,6 +114,7 @@ fun VaultAddEditState.ViewState.appendFolderAndOwnerData(
),
availableOwners = activeAccount.toAvailableOwners(
collectionViewList = collectionViewList,
cipherView = currentContentState.common.originalCipher,
isIndividualVaultDisabled = isIndividualVaultDisabled,
),
),
@@ -165,6 +166,7 @@ private fun UserState.Account.toSelectedOwnerId(cipherView: CipherView?): String
private fun UserState.Account.toAvailableOwners(
collectionViewList: List<CollectionView>,
cipherView: CipherView?,
isIndividualVaultDisabled: Boolean,
): List<VaultAddEditState.Owner> =
listOfNotNull(
@@ -188,7 +190,9 @@ private fun UserState.Account.toAvailableOwners(
VaultCollection(
id = collection.id.orEmpty(),
name = collection.name,
isSelected = false,
isSelected = cipherView
?.collectionIds
?.contains(collection.id) == true,
)
},
)