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

[PR #2656] [MERGED] Trusted Device Encryption feature #29719

New Issue
Closed
opened 2026-04-18 13:38:22 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-18 13:38:22 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2656
Author: @trmartin4
Created: 8/3/2023
Status: ✅ Merged
Merged: 8/17/2023
Merged by: @mpbw2

Base: master ← Head: feature/pm-1029-tde-login

📝 Commits (10+)

  • 84a82f0 [PM-1208] Add Device approval options screen. View model waiting for additional logic to be added.
  • 8786630 [PM-1208] Add device related api endpoint. Add AccoundDecryptOptions model and property to user Account.
  • e164fb9 Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options
  • cbbc41b [PM-1208] Add continue button and not you option
  • 6268f07 Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options
  • 3053eaa [PM-1379] add DeviceTrustCryptoService with establish trust logic (#2535)
  • 800b4c7 Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options
  • 58542fd Merge branch 'master' into feature/pm-1029-tde-login
  • 548bd12 Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options
  • c2d4fa4 [PM-2583] Answer auth request with mp field as null if doesn't have it. (#2609)

📊 Changes

90 files changed (+3248 additions, -1265 deletions)

View changed files

📝 src/Android/MainApplication.cs (+3 -3)
📝 src/Android/Services/BiometricService.cs (+6 -7)
📝 src/App/Abstractions/IPasswordRepromptService.cs (+2 -3)
📝 src/App/Pages/Accounts/LockPage.xaml (+2 -2)
📝 src/App/Pages/Accounts/LockPage.xaml.cs (+6 -5)
📝 src/App/Pages/Accounts/LockPageViewModel.cs (+108 -79)
➕ src/App/Pages/Accounts/LoginApproveDevicePage.xaml (+76 -0)
➕ src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs (+64 -0)
➕ src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs (+150 -0)
📝 src/App/Pages/Accounts/LoginPage.xaml.cs (+2 -1)
📝 src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml (+25 -27)
📝 src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs (+4 -1)
📝 src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs (+179 -14)
📝 src/App/Pages/Accounts/LoginSsoPage.xaml.cs (+9 -0)
📝 src/App/Pages/Accounts/LoginSsoPageViewModel.cs (+82 -13)
📝 src/App/Pages/Accounts/RegisterPageViewModel.cs (+10 -7)
📝 src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs (+3 -3)
📝 src/App/Pages/Accounts/SetPasswordPageViewModel.cs (+17 -24)
📝 src/App/Pages/Accounts/TwoFactorPage.xaml.cs (+23 -15)
📝 src/App/Pages/Accounts/TwoFactorPageViewModel.cs (+92 -12)

...and 70 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

This is the merge of the TDE feature branch into master. Each individual PR on the branch has been reviewed.

Code changes

See individual PRs for context.

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/2656 **Author:** [@trmartin4](https://github.com/trmartin4) **Created:** 8/3/2023 **Status:** ✅ Merged **Merged:** 8/17/2023 **Merged by:** [@mpbw2](https://github.com/mpbw2) **Base:** `master` ← **Head:** `feature/pm-1029-tde-login` --- ### 📝 Commits (10+) - [`84a82f0`](https://github.com/bitwarden/android/commit/84a82f0876c03da87079f3a57fa8b367b79bc6b7) [PM-1208] Add Device approval options screen. View model waiting for additional logic to be added. - [`8786630`](https://github.com/bitwarden/android/commit/87866304a629562155b9bb8c454af69444fdf82e) [PM-1208] Add device related api endpoint. Add AccoundDecryptOptions model and property to user Account. - [`e164fb9`](https://github.com/bitwarden/android/commit/e164fb98233615496aad3537b8b8036c2a6ac028) Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options - [`cbbc41b`](https://github.com/bitwarden/android/commit/cbbc41be67b32fa38e0ff437e53495df5611d436) [PM-1208] Add continue button and not you option - [`6268f07`](https://github.com/bitwarden/android/commit/6268f0776bd398d4e12204e251116541bcda34dd) Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options - [`3053eaa`](https://github.com/bitwarden/android/commit/3053eaa0367a905411a82396eff831bca1dcd8f0) [PM-1379] add DeviceTrustCryptoService with establish trust logic (#2535) - [`800b4c7`](https://github.com/bitwarden/android/commit/800b4c71deaf677e672fefb472b9b85539bd3738) Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options - [`58542fd`](https://github.com/bitwarden/android/commit/58542fd2554c1676344682cc0ab30c257213ce6e) Merge branch 'master' into feature/pm-1029-tde-login - [`548bd12`](https://github.com/bitwarden/android/commit/548bd12a8e45fe81eee3ffc0594a74e2afe08f36) Merge branch 'feature/pm-1029-tde-login' into feature/pm-1208-f3-options - [`c2d4fa4`](https://github.com/bitwarden/android/commit/c2d4fa4429b92c9ba111ab46c4bb65bce80e0a09) [PM-2583] Answer auth request with mp field as null if doesn't have it. (#2609) ### 📊 Changes **90 files changed** (+3248 additions, -1265 deletions) <details> <summary>View changed files</summary> 📝 `src/Android/MainApplication.cs` (+3 -3) 📝 `src/Android/Services/BiometricService.cs` (+6 -7) 📝 `src/App/Abstractions/IPasswordRepromptService.cs` (+2 -3) 📝 `src/App/Pages/Accounts/LockPage.xaml` (+2 -2) 📝 `src/App/Pages/Accounts/LockPage.xaml.cs` (+6 -5) 📝 `src/App/Pages/Accounts/LockPageViewModel.cs` (+108 -79) ➕ `src/App/Pages/Accounts/LoginApproveDevicePage.xaml` (+76 -0) ➕ `src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs` (+64 -0) ➕ `src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs` (+150 -0) 📝 `src/App/Pages/Accounts/LoginPage.xaml.cs` (+2 -1) 📝 `src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml` (+25 -27) 📝 `src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs` (+4 -1) 📝 `src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs` (+179 -14) 📝 `src/App/Pages/Accounts/LoginSsoPage.xaml.cs` (+9 -0) 📝 `src/App/Pages/Accounts/LoginSsoPageViewModel.cs` (+82 -13) 📝 `src/App/Pages/Accounts/RegisterPageViewModel.cs` (+10 -7) 📝 `src/App/Pages/Accounts/RemoveMasterPasswordPageViewModel.cs` (+3 -3) 📝 `src/App/Pages/Accounts/SetPasswordPageViewModel.cs` (+17 -24) 📝 `src/App/Pages/Accounts/TwoFactorPage.xaml.cs` (+23 -15) 📝 `src/App/Pages/Accounts/TwoFactorPageViewModel.cs` (+92 -12) _...and 70 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 This is the merge of the TDE feature branch into master. Each individual PR on the branch has been reviewed. ## Code changes See individual PRs for context. ## 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-18 13:38:22 -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#29719
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?