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 #2646] [MERGED] [PM-1280] TDE 2FA - approval options navigation #23081

New Issue
Closed
opened 2026-04-16 23:14:50 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-16 23:14:50 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2646
Author: @andrebispo5
Created: 7/26/2023
Status: ✅ Merged
Merged: 7/27/2023
Merged by: @andrebispo5

Base: auth/pm-2408-admin-preapproved ← Head: auth/pm-1208-tde-2fa

📝 Commits (6)

  • 92aafa8 [PM-1208] Add navigation to device approval options after 2FA auth when TDE is enabled
  • c1410ad [PM-1208] Add navigations to iOS extensions
  • 4ba8b99 Merge branch 'auth/pm-2408-admin-preapproved' into auth/pm-1208-tde-2fa
  • 4467965 [PM-1208] PR Fix
  • 78f5caf code format
  • b404ec5 Merge branch 'auth/pm-2408-admin-preapproved' into auth/pm-1208-tde-2fa

📊 Changes

5 files changed (+37 additions, -1 deletions)

View changed files

📝 src/App/Pages/Accounts/TwoFactorPage.xaml.cs (+8 -0)
📝 src/App/Pages/Accounts/TwoFactorPageViewModel.cs (+26 -1)
📝 src/iOS.Autofill/CredentialProviderViewController.cs (+1 -0)
📝 src/iOS.Extension/LoadingViewController.cs (+1 -0)
📝 src/iOS.ShareExtension/LoadingViewController.cs (+1 -0)

📄 Description

Merge after https://github.com/bitwarden/mobile/pull/2643

Type of change

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

Objective

Navigate to device approval options after a successful 2FA authentication.

Code changes

  • src/App/Pages/Accounts/TwoFactorPageViewModel.cs: Add logic for TDE flow and action to call when device approval options is needed.
  • iOS Extension: Add missing action to navigate to device approval options screen.

Screenshots

https://github.com/bitwarden/mobile/assets/4648522/bb722b65-cb78-4d66-81d4-bd633ca4b46d

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/2646 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 7/26/2023 **Status:** ✅ Merged **Merged:** 7/27/2023 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `auth/pm-2408-admin-preapproved` ← **Head:** `auth/pm-1208-tde-2fa` --- ### 📝 Commits (6) - [`92aafa8`](https://github.com/bitwarden/android/commit/92aafa862db0a0cb551b95b6ffaebb820f95362d) [PM-1208] Add navigation to device approval options after 2FA auth when TDE is enabled - [`c1410ad`](https://github.com/bitwarden/android/commit/c1410ad5ccf714bb407ea895edba92b5595d50c3) [PM-1208] Add navigations to iOS extensions - [`4ba8b99`](https://github.com/bitwarden/android/commit/4ba8b99dd00c0bd0b94f6b7ea9a6a623816c8c88) Merge branch 'auth/pm-2408-admin-preapproved' into auth/pm-1208-tde-2fa - [`4467965`](https://github.com/bitwarden/android/commit/4467965860563e3de8d4b8966156a8765e2114cc) [PM-1208] PR Fix - [`78f5caf`](https://github.com/bitwarden/android/commit/78f5caf7d4df9e0620c0964f8abb4a24ad385d5a) code format - [`b404ec5`](https://github.com/bitwarden/android/commit/b404ec545eec9fb4ea2a8e432854acc54cd4c48e) Merge branch 'auth/pm-2408-admin-preapproved' into auth/pm-1208-tde-2fa ### 📊 Changes **5 files changed** (+37 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Accounts/TwoFactorPage.xaml.cs` (+8 -0) 📝 `src/App/Pages/Accounts/TwoFactorPageViewModel.cs` (+26 -1) 📝 `src/iOS.Autofill/CredentialProviderViewController.cs` (+1 -0) 📝 `src/iOS.Extension/LoadingViewController.cs` (+1 -0) 📝 `src/iOS.ShareExtension/LoadingViewController.cs` (+1 -0) </details> ### 📄 Description Merge after https://github.com/bitwarden/mobile/pull/2643 ## 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--> Navigate to device approval options after a successful 2FA authentication. ## 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--> * **src/App/Pages/Accounts/TwoFactorPageViewModel.cs:** Add logic for TDE flow and action to call when device approval options is needed. * **iOS Extension:** Add missing action to navigate to device approval options screen. ## Screenshots <!--Required for any UI changes. Delete if not applicable--> https://github.com/bitwarden/mobile/assets/4648522/bb722b65-cb78-4d66-81d4-bd633ca4b46d ## 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-16 23:14:50 -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#23081
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?