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 #2712] [MERGED] [PM-3608] fix for TDE pref naming collision #40851

New Issue
Closed
opened 2026-04-23 19:39:57 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-23 19:39:57 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2712
Author: @mpbw2
Created: 8/22/2023
Status: ✅ Merged
Merged: 8/22/2023
Merged by: @mpbw2

Base: master ← Head: bugfix/tde-prefs

📝 Commits (2)

📊 Changes

1 file changed (+2 additions, -2 deletions)

View changed files

📝 src/Core/Constants.cs (+2 -2)

📄 Description

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

🔄 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/2712 **Author:** [@mpbw2](https://github.com/mpbw2) **Created:** 8/22/2023 **Status:** ✅ Merged **Merged:** 8/22/2023 **Merged by:** [@mpbw2](https://github.com/mpbw2) **Base:** `master` ← **Head:** `bugfix/tde-prefs` --- ### 📝 Commits (2) - [`a1fdd04`](https://github.com/bitwarden/android/commit/a1fdd046f40f82db62a159dfdd975d8227642ab6) fix for TDE pref naming collision - [`8d3fb21`](https://github.com/bitwarden/android/commit/8d3fb21dea9e5b725109fb3ce6e2e62926f964a9) fix case ### 📊 Changes **1 file changed** (+2 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `src/Core/Constants.cs` (+2 -2) </details> ### 📄 Description ## 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 --- <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-04-23 19:39:57 -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#40851
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?