github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-24 14:28:58 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PR #2688] [MERGED] [PM-3386] Fix Master password vs OTP decision on TDE #72271

New Issue
Closed
opened 2026-05-16 21:10:49 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-16 21:10:49 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2688
Author: @fedemkr
Created: 8/14/2023
Status: ✅ Merged
Merged: 8/14/2023
Merged by: @fedemkr

Base: feature/pm-1029-tde-login ← Head: vault/pm-3386/fix-mp-reprompt-otp-on-server-check-tde

📝 Commits (1)

  • cdca4d4 PM-3386 Fix MP reprompt / OTP decision to be also based on the master key hash.

📊 Changes

6 files changed (+13 additions, -12 deletions)

View changed files

📝 src/Android/MainApplication.cs (+0 -1)
📝 src/App/Pages/Settings/ExportVaultPageViewModel.cs (+2 -2)
📝 src/App/Utilities/VerificationActionsFlowHelper.cs (+2 -4)
📝 src/Core/Abstractions/IUserVerificationService.cs (+1 -1)
📝 src/Core/Services/UserVerificationService.cs (+8 -3)
📝 src/iOS.Core/Utilities/iOSCoreHelpers.cs (+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

Fix decision on whether to use MP reprompt or OTP on TDE (or when session doesn't have a master key hash.

Code changes

  • UserVerificationService: Added check on master key hash and whether to check it on HasMasterPasswordAsync
  • ExportVaultPageViewModel, VerificationActionsFlowHelper: Put check master key hash on true, so if user doesn't have a MP key hash then OTP is used.

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/2688 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 8/14/2023 **Status:** ✅ Merged **Merged:** 8/14/2023 **Merged by:** [@fedemkr](https://github.com/fedemkr) **Base:** `feature/pm-1029-tde-login` ← **Head:** `vault/pm-3386/fix-mp-reprompt-otp-on-server-check-tde` --- ### 📝 Commits (1) - [`cdca4d4`](https://github.com/bitwarden/android/commit/cdca4d432d224b7ff94eac5088227f05c72d1082) PM-3386 Fix MP reprompt / OTP decision to be also based on the master key hash. ### 📊 Changes **6 files changed** (+13 additions, -12 deletions) <details> <summary>View changed files</summary> 📝 `src/Android/MainApplication.cs` (+0 -1) 📝 `src/App/Pages/Settings/ExportVaultPageViewModel.cs` (+2 -2) 📝 `src/App/Utilities/VerificationActionsFlowHelper.cs` (+2 -4) 📝 `src/Core/Abstractions/IUserVerificationService.cs` (+1 -1) 📝 `src/Core/Services/UserVerificationService.cs` (+8 -3) 📝 `src/iOS.Core/Utilities/iOSCoreHelpers.cs` (+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--> Fix decision on whether to use MP reprompt or OTP on TDE (or when session doesn't have a master key hash. ## 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--> * **UserVerificationService:** Added check on master key hash and whether to check it on `HasMasterPasswordAsync` * **ExportVaultPageViewModel, VerificationActionsFlowHelper:** Put check master key hash on `true`, so if user doesn't have a MP key hash then OTP is used. ## 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-16 21:10:49 -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#72271