github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-07 19:39:41 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #6802] [MERGED] [PM-35117] fix: Getting updated values from KDF before displaying update KDF prompt #55093

New Issue
Closed
opened 2026-05-01 21:02:42 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-01 21:02:42 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6802
Author: @aj-rosado
Created: 4/15/2026
Status: ✅ Merged
Merged: 4/16/2026
Merged by: @aj-rosado

Base: main ← Head: PM-35117/update-kdf-alert-loop

📝 Commits (4)

  • 0ccb434 Getting values for kdf iterations from sync and calling sync before showing kdf update dialog
  • b93839a removing unnecessary set on state copy
  • a973137 Added property to state, removed unnecessary try, validating state on tests and removed unnecessary MaxLineLength suppresions
  • dd3e84a Taking suppress closer to offending line

📊 Changes

7 files changed (+299 additions, -24 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt (+9 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+59 -21)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt (+102 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt (+13 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt (+69 -0)
📝 network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt (+13 -1)
📝 network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseUtil.kt (+34 -1)

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-35117

📔 Objective

Avoid a loop state where users that updated the KDF information on a different client are stuck with after unlock.
Adding kdf info on state and calling sync to get the most recent data before displaying the prompt

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/6802 **Author:** [@aj-rosado](https://github.com/aj-rosado) **Created:** 4/15/2026 **Status:** ✅ Merged **Merged:** 4/16/2026 **Merged by:** [@aj-rosado](https://github.com/aj-rosado) **Base:** `main` ← **Head:** `PM-35117/update-kdf-alert-loop` --- ### 📝 Commits (4) - [`0ccb434`](https://github.com/bitwarden/android/commit/0ccb434e8896f5f93454fb107bd27e0940473e80) Getting values for kdf iterations from sync and calling sync before showing kdf update dialog - [`b93839a`](https://github.com/bitwarden/android/commit/b93839a94b8163d0afad2c119b3965dcbb774adf) removing unnecessary set on state copy - [`a973137`](https://github.com/bitwarden/android/commit/a9731377962b78a8bfb7b6e59b57dd8eb51ae446) Added property to state, removed unnecessary try, validating state on tests and removed unnecessary MaxLineLength suppresions - [`dd3e84a`](https://github.com/bitwarden/android/commit/dd3e84a7ea87883eaca527cd2c899655f67e2479) Taking suppress closer to offending line ### 📊 Changes **7 files changed** (+299 additions, -24 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt` (+9 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+59 -21) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt` (+102 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt` (+13 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt` (+69 -0) 📝 `network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt` (+13 -1) 📝 `network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseUtil.kt` (+34 -1) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-35117 ## 📔 Objective Avoid a loop state where users that updated the KDF information on a different client are stuck with after unlock. Adding kdf info on state and calling sync to get the most recent data before displaying the prompt --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-01 21:02:42 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#55093
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?