mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 07:05:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not overlay offline ciphers with merge conflicts

Browse source
This commit is contained in:
Matt Gibson 2024-10-24 15:22:51 -07:00
parent ee61c83409
commit d4d980b576
No known key found for this signature in database
GPG key ID: 7CBCA182C13B0912
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceImpl.kt
View file

@ -151,7 +151,8 @@ class VaultDiskSourceImpl(
getOfflineCiphers(userId),
{ ciphers, offlineCiphers ->
val overlaid = ciphers.map { cipher ->
offlineCiphers.find { it.id == cipher.id }?.toSdkCipherJson() ?: cipher
// only overlay ciphers that have not had a merge conflict
offlineCiphers.filter { !it.mergeConflict }.find { it.id == cipher.id }?.toSdkCipherJson() ?: cipher
}
// TODO add new offline items to the vault list
// val newOffline = offlineCiphers.filter { it.id.startsWith("create") }.map { it.toSdkCipherJson() }