[PR #2712] [PM-3608] fix for TDE pref naming collision #3761

Closed
opened 2025-11-26 23:36:58 -06:00 by GiteaMirror · 0 comments
Owner

Original Pull Request: https://github.com/bitwarden/android/pull/2712

State: closed
Merged: Yes


Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

UserKeyBiometricUnlockKey was defined as biometricUnlock_{userId} which was already used for BiometricUnlockKey. It has been changed to userKeyBiometricUnlock_{userId}. For sanity UserKeyAutoUnlockKey was also changed to userKeyAutoUnlock_{userId}.

Note: I did not add migration as this feature has not shipped yet. QA should clear app data before resuming testing.

Code changes

  • Constants.cs: Fixed values described above

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team
**Original Pull Request:** https://github.com/bitwarden/android/pull/2712 **State:** closed **Merged:** Yes --- ## Type of change - [X] Bug fix - [ ] New feature development - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [ ] Other ## Objective <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> `UserKeyBiometricUnlockKey` was defined as `biometricUnlock_{userId}` which was already used for `BiometricUnlockKey`. It has been changed to `userKeyBiometricUnlock_{userId}`. For sanity `UserKeyAutoUnlockKey` was also changed to `userKeyAutoUnlock_{userId}`. **Note:** I did not add migration as this feature has not shipped yet. QA should clear app data before resuming testing. ## Code changes <!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes--> <!--Also refer to any related changes or PRs in other repositories--> * **Constants.cs:** Fixed values described above ## Before you submit - Please check for formatting errors (`dotnet format --verify-no-changes`) (required) - Please add **unit tests** where it makes sense to do so (encouraged but not required) - If this change requires a **documentation update** - notify the documentation team - If this change has particular **deployment requirements** - notify the DevOps team
GiteaMirror added the pull-request label 2025-11-26 23:36:58 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#3761