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

[PR #2668] [MERGED] [PM-3319] Check for admin request in Lock page #51935

New Issue
Closed
opened 2026-05-01 15:39:09 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-01 15:39:09 -05:00
Owner
Copy Link

📋 Pull Request Information

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

Base: feature/pm-1029-tde-login ← Head: auth/pm-3319-pending-request

📝 Commits (2)

  • 3cc4cf8 [PM-3319] Ignore admin auth request when choosing mp as decryption option.
  • e612fca [PM-3319] PR fix

📊 Changes

4 files changed (+6 additions, -4 deletions)

View changed files

📝 src/App/Pages/Accounts/LockPage.xaml.cs (+2 -1)
📝 src/App/Pages/Accounts/LockPageViewModel.cs (+3 -1)
📝 src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs (+1 -1)
📝 src/App/Resources/AppResources.resx (+0 -1)

📄 Description

Type of change

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

Objective

After requesting approval from admin or other device, trying to approve device with Master Password will not work.

Code changes

Add parameter to ignore pending requests check in LockPage

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/2668 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 8/7/2023 **Status:** ✅ Merged **Merged:** 8/8/2023 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `feature/pm-1029-tde-login` ← **Head:** `auth/pm-3319-pending-request` --- ### 📝 Commits (2) - [`3cc4cf8`](https://github.com/bitwarden/android/commit/3cc4cf8fb6644cc541dee69f847eab7751e7cf32) [PM-3319] Ignore admin auth request when choosing mp as decryption option. - [`e612fca`](https://github.com/bitwarden/android/commit/e612fca83a421f49a845b7b0256633564d90f9a1) [PM-3319] PR fix ### 📊 Changes **4 files changed** (+6 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Accounts/LockPage.xaml.cs` (+2 -1) 📝 `src/App/Pages/Accounts/LockPageViewModel.cs` (+3 -1) 📝 `src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs` (+1 -1) 📝 `src/App/Resources/AppResources.resx` (+0 -1) </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--> After requesting approval from admin or other device, trying to approve device with Master Password will not work. ## 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--> Add parameter to ignore pending requests check in `LockPage` ## 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-05-01 15:39:09 -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#51935
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?