[PR #7004] [MERGED] PM-38358: Chore: Remove user key #114092

Closed
opened 2026-06-06 13:52:03 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/7004
Author: @david-livefront
Created: 6/1/2026
Status: Merged
Merged: 6/2/2026
Merged by: @david-livefront

Base: mainHead: PM-38358-remove-user-key


📝 Commits (2)

  • 83fe1af PM-38358: Migrate validatePassword and removePassword to use the masterKeyWrappedUserKey
  • c4e42f3 PM-38358: Remove the UserKey from the app's persistance layer

📊 Changes

11 files changed (+75 additions, -224 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt (+0 -10)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt (+8 -11)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+16 -31)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt (+8 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerImpl.kt (+0 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt (+12 -42)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt (+0 -15)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+22 -93)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt (+9 -5)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt (+0 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt (+0 -13)

📄 Description

🎟️ Tracking

PM-38358

📔 Objective

This PR removes the stored encrypted user key from shared preferences and updates the remaining location that relied on it.


🔄 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/7004 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 6/1/2026 **Status:** ✅ Merged **Merged:** 6/2/2026 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-38358-remove-user-key` --- ### 📝 Commits (2) - [`83fe1af`](https://github.com/bitwarden/android/commit/83fe1afb0d296ebb7e9d9d5c4c4f6cbd40530464) PM-38358: Migrate validatePassword and removePassword to use the masterKeyWrappedUserKey - [`c4e42f3`](https://github.com/bitwarden/android/commit/c4e42f31d8e834c64ed2692e25e369d0d9006a65) PM-38358: Remove the UserKey from the app's persistance layer ### 📊 Changes **11 files changed** (+75 additions, -224 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt` (+0 -10) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt` (+8 -11) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+16 -31) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt` (+8 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerImpl.kt` (+0 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt` (+12 -42) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt` (+0 -15) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+22 -93) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt` (+9 -5) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultSyncManagerTest.kt` (+0 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt` (+0 -13) </details> ### 📄 Description ## 🎟️ Tracking [PM-38358](https://bitwarden.atlassian.net/browse/PM-38358) ## 📔 Objective This PR removes the stored encrypted user key from shared preferences and updates the remaining location that relied on it. [PM-38358]: https://bitwarden.atlassian.net/browse/PM-38358?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <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-06-06 13:52:03 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#114092