github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-17 03:59:18 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PR #2667] [MERGED] [PM-2713] Final merge from Key Migration branch to TDE Feature branch #117615

New Issue
Closed
opened 2026-06-09 12:58:10 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-06-09 12:58:10 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2667
Author: @jlf0dev
Created: 8/7/2023
Status: ✅ Merged
Merged: 8/10/2023
Merged by: @jlf0dev

Base: feature/pm-1029-tde-login ← Head: auth/pm-2713/drop-master-key-dependency

📝 Commits (10+)

  • fd5ef49 [PM-2713] add async to key connector service methods
  • 903f099 [PM-2713] rename ephemeral pin key
  • b620a9c add state for biometric key and accept UserKey instead of string for auto key
  • 2522bbc Get UserKey from bio state on unlock
  • bf749d3 PM-2713 Fix auto-migrating EncKeyEncrypted into MasterKey encrypted UserKey when requesting DecryptUserKeyWithMasterKeyAsync is called
  • d6567fe Merge branch 'auth/pm-2713/drop-master-key-dependency' into add-bio-key-migration
  • 4e1361e renaming bio key and fix build
  • fc2a91c PM-3194 Fix biometrics button to be shown on upgrade when no UserKey is present yet
  • e46a94d revert removal of key connector service from auth service
  • b38a5af PM-2713 set user key when using KC

📊 Changes

22 files changed (+164 additions, -76 deletions)

View changed files

📝 src/Android/MainApplication.cs (+1 -1)
📝 src/Android/Services/BiometricService.cs (+6 -7)
📝 src/App/Pages/Accounts/LockPageViewModel.cs (+6 -5)
📝 src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs (+2 -2)
📝 src/App/Pages/TabsPage.cs (+1 -1)
➕ src/App/Services/BaseBiometricService.cs (+25 -0)
📝 src/Core/Abstractions/IApiService.cs (+1 -1)
📝 src/Core/Abstractions/IBiometricService.cs (+1 -0)
📝 src/Core/Abstractions/ICryptoService.cs (+1 -0)
📝 src/Core/Abstractions/IKeyConnectorService.cs (+5 -5)
📝 src/Core/Abstractions/IStateService.cs (+3 -1)
📝 src/Core/Constants.cs (+1 -0)
📝 src/Core/Models/Domain/Account.cs (+1 -1)
📝 src/Core/Services/ApiService.cs (+1 -1)
📝 src/Core/Services/AuthService.cs (+12 -10)
📝 src/Core/Services/CryptoService.cs (+60 -17)
📝 src/Core/Services/KeyConnectorService.cs (+10 -10)
📝 src/Core/Services/StateService.cs (+18 -4)
📝 src/Core/Services/SyncService.cs (+1 -1)
📝 src/Core/Utilities/ServiceContainer.cs (+1 -1)

...and 2 more files

📄 Description

Type of change

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

Objective

Merges the final changes from the key migration to our TDE feature branch. See #2633 for background on key migration.

Most of these changes are bug fixes and refactors. There may be merge conflicts, but the goal here is to get these changes reviewed before getting lost in our feature branch.

Code changes

  • file.ext: Description of what was changed and why

Screenshots

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/2667 **Author:** [@jlf0dev](https://github.com/jlf0dev) **Created:** 8/7/2023 **Status:** ✅ Merged **Merged:** 8/10/2023 **Merged by:** [@jlf0dev](https://github.com/jlf0dev) **Base:** `feature/pm-1029-tde-login` ← **Head:** `auth/pm-2713/drop-master-key-dependency` --- ### 📝 Commits (10+) - [`fd5ef49`](https://github.com/bitwarden/android/commit/fd5ef49811fbc55b7d48f271a871087d4308bb45) [PM-2713] add async to key connector service methods - [`903f099`](https://github.com/bitwarden/android/commit/903f099134652d1c4b7ecc79004829fc86327dea) [PM-2713] rename ephemeral pin key - [`b620a9c`](https://github.com/bitwarden/android/commit/b620a9c09fb32273a11b8c404161a1bf349812a9) add state for biometric key and accept UserKey instead of string for auto key - [`2522bbc`](https://github.com/bitwarden/android/commit/2522bbc60fa584f26345c0cf5217ba85c248cd74) Get UserKey from bio state on unlock - [`bf749d3`](https://github.com/bitwarden/android/commit/bf749d39de5f33dcf3c9870e6619029279538846) PM-2713 Fix auto-migrating EncKeyEncrypted into MasterKey encrypted UserKey when requesting DecryptUserKeyWithMasterKeyAsync is called - [`d6567fe`](https://github.com/bitwarden/android/commit/d6567fe819b17f1f786d4ef6756359bc134bf8a9) Merge branch 'auth/pm-2713/drop-master-key-dependency' into add-bio-key-migration - [`4e1361e`](https://github.com/bitwarden/android/commit/4e1361e94af3be619c55eec60282ff0e24ba9ca3) renaming bio key and fix build - [`fc2a91c`](https://github.com/bitwarden/android/commit/fc2a91c4350b9d31975c14479590eb1322f34d28) PM-3194 Fix biometrics button to be shown on upgrade when no UserKey is present yet - [`e46a94d`](https://github.com/bitwarden/android/commit/e46a94deeb21f6f7db5441f001b7ff3fec48c0ca) revert removal of key connector service from auth service - [`b38a5af`](https://github.com/bitwarden/android/commit/b38a5af6cdf4bad69146f00e36b08178b04a5290) PM-2713 set user key when using KC ### 📊 Changes **22 files changed** (+164 additions, -76 deletions) <details> <summary>View changed files</summary> 📝 `src/Android/MainApplication.cs` (+1 -1) 📝 `src/Android/Services/BiometricService.cs` (+6 -7) 📝 `src/App/Pages/Accounts/LockPageViewModel.cs` (+6 -5) 📝 `src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs` (+2 -2) 📝 `src/App/Pages/TabsPage.cs` (+1 -1) ➕ `src/App/Services/BaseBiometricService.cs` (+25 -0) 📝 `src/Core/Abstractions/IApiService.cs` (+1 -1) 📝 `src/Core/Abstractions/IBiometricService.cs` (+1 -0) 📝 `src/Core/Abstractions/ICryptoService.cs` (+1 -0) 📝 `src/Core/Abstractions/IKeyConnectorService.cs` (+5 -5) 📝 `src/Core/Abstractions/IStateService.cs` (+3 -1) 📝 `src/Core/Constants.cs` (+1 -0) 📝 `src/Core/Models/Domain/Account.cs` (+1 -1) 📝 `src/Core/Services/ApiService.cs` (+1 -1) 📝 `src/Core/Services/AuthService.cs` (+12 -10) 📝 `src/Core/Services/CryptoService.cs` (+60 -17) 📝 `src/Core/Services/KeyConnectorService.cs` (+10 -10) 📝 `src/Core/Services/StateService.cs` (+18 -4) 📝 `src/Core/Services/SyncService.cs` (+1 -1) 📝 `src/Core/Utilities/ServiceContainer.cs` (+1 -1) _...and 2 more files_ </details> ### 📄 Description ## Type of change - [ ] Bug fix - [x] 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--> Merges the final changes from the key migration to our TDE feature branch. See #2633 for background on key migration. Most of these changes are bug fixes and refactors. There may be merge conflicts, but the goal here is to get these changes reviewed before getting lost in our feature branch. ## 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--> * **file.ext:** Description of what was changed and why ## Screenshots <!--Required for any UI changes. Delete if not applicable--> ## 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-06-09 12:58:10 -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 labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
GiteaMirror ninjasurge (Kaehlen Rog)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#117615