[PR #2011] [MERGED] [EC-341] Fix show alternative 2FA on iOS extensions #3289

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2011
Author: @fedemkr
Created: 7/25/2022
Status: Merged
Merged: 8/4/2022
Merged by: @fedemkr

Base: masterHead: bug/EC-341-fix-alternative-2fa-ios-extensions


📝 Commits (2)

  • e95c499 EC-341 Fix show alternative 2FA on iOS extensions
  • fd567c2 EC-341 Fix iOS.Core.csproj reference

📊 Changes

8 files changed (+80 additions, -28 deletions)

View changed files

📝 src/App/Pages/Accounts/TwoFactorPage.xaml (+9 -5)
📝 src/App/Pages/Accounts/TwoFactorPage.xaml.cs (+0 -16)
📝 src/App/Pages/Accounts/TwoFactorPageViewModel.cs (+15 -0)
📝 src/iOS.Autofill/CredentialProviderViewController.cs (+1 -0)
📝 src/iOS.Autofill/iOS.Autofill.csproj (+11 -0)
📝 src/iOS.Core/Services/DeviceActionService.cs (+26 -7)
📝 src/iOS.Extension/iOS.Extension.csproj (+9 -0)
📝 src/iOS.ShareExtension/iOS.ShareExtension.csproj (+9 -0)

📄 Description

Type of change

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

Objective

On iOS Extensions when 2FA view is presented, it should allow to change between different 2FA if setup.

Code changes

  • TwoFactorPage.xaml: Changed Toolbar item More Clicked event to Command
  • TwoFactorPage.xaml.cs: Removed More_Clicked event and moved logic to VM command
  • TwoFactorPageViewModel.cs: Added MoreCommand with the logic of the More_Clicked and changed it to use DeviceActionService instead of directly Page to show the action sheet in order for it to work on the extensions.
  • iOS.Autofill.csproj: Added reference to the "more"/"three dots" images to get in the bundle
  • DeviceActionService.cs: Improved null check of the ViewController, if that one was null on some cases the Task was not finishing given that it was not setting the result.
  • iOS.Extension.csproj: Added reference to the "more"/"three dots" images to get in the bundle
  • iOS.ShareExtension.csproj: Added reference to the "more"/"three dots" images to get in the bundle

Before you submit

  • I have checked for formatting errors (dotnet tool run dotnet-format --check) (required)
  • I have added unit tests where it makes sense to do so (encouraged but not required)
  • This change requires a documentation update (notify the documentation team)
  • 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/2011 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 7/25/2022 **Status:** ✅ Merged **Merged:** 8/4/2022 **Merged by:** [@fedemkr](https://github.com/fedemkr) **Base:** `master` ← **Head:** `bug/EC-341-fix-alternative-2fa-ios-extensions` --- ### 📝 Commits (2) - [`e95c499`](https://github.com/bitwarden/android/commit/e95c49907f5b90845ccad044e45d434e40799c15) EC-341 Fix show alternative 2FA on iOS extensions - [`fd567c2`](https://github.com/bitwarden/android/commit/fd567c225f33c5390ff64b239fa7a77f10a00b93) EC-341 Fix iOS.Core.csproj reference ### 📊 Changes **8 files changed** (+80 additions, -28 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Accounts/TwoFactorPage.xaml` (+9 -5) 📝 `src/App/Pages/Accounts/TwoFactorPage.xaml.cs` (+0 -16) 📝 `src/App/Pages/Accounts/TwoFactorPageViewModel.cs` (+15 -0) 📝 `src/iOS.Autofill/CredentialProviderViewController.cs` (+1 -0) 📝 `src/iOS.Autofill/iOS.Autofill.csproj` (+11 -0) 📝 `src/iOS.Core/Services/DeviceActionService.cs` (+26 -7) 📝 `src/iOS.Extension/iOS.Extension.csproj` (+9 -0) 📝 `src/iOS.ShareExtension/iOS.ShareExtension.csproj` (+9 -0) </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--> On iOS Extensions when 2FA view is presented, it should allow to change between different 2FA if setup. ## 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--> * **TwoFactorPage.xaml:** Changed Toolbar item More Clicked event to Command * **TwoFactorPage.xaml.cs:** Removed More_Clicked event and moved logic to VM command * **TwoFactorPageViewModel.cs:** Added MoreCommand with the logic of the More_Clicked and changed it to use `DeviceActionService` instead of directly `Page` to show the action sheet in order for it to work on the extensions. * **iOS.Autofill.csproj:** Added reference to the "more"/"three dots" images to get in the bundle * **DeviceActionService.cs:** Improved null check of the ViewController, if that one was null on some cases the Task was not finishing given that it was not setting the result. * **iOS.Extension.csproj:** Added reference to the "more"/"three dots" images to get in the bundle * **iOS.ShareExtension.csproj:** Added reference to the "more"/"three dots" images to get in the bundle ## Before you submit - [X] I have checked for formatting errors (`dotnet tool run dotnet-format --check`) (required) - [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required) - [ ] This change requires a **documentation update** (notify the documentation team) - [ ] 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 2025-11-26 23:30:46 -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#3289