github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-08 04:16:40 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #2610] [MERGED] [PM-1201] Change timeout actions available based on hasMasterPassword #9821

New Issue
Closed
opened 2026-04-11 02:29:44 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-11 02:29:44 -05:00
Owner
Copy Link

📋 Pull Request Information

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

Base: feature/pm-1208-f3-options ← Head: feature/pm-1201-timeout

📝 Commits (5)

  • 7c282ba [PM-1201] Change timeout actions available based on hasMasterPassword
  • 4fe277b Merge branch 'feature/pm-1208-f3-options' into feature/pm-1201-timeout
  • 6434510 [PM-1201] PR Fixes
  • 03bd41c [PM-1201] PR Fixes
  • 0634192 [PM-1201] PR Fix

📊 Changes

3 files changed (+48 additions, -5 deletions)

View changed files

📝 src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs (+36 -5)
📝 src/App/Resources/AppResources.Designer.cs (+9 -0)
📝 src/App/Resources/AppResources.resx (+3 -0)

📄 Description

Type of change

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

Objective

For users without a master password, the unlock settings need to be different:

  • Vault timeout action defaults to “log out”
  • Vault timeout action “lock” is only available as an option if the user has enabled PIN unlock or biometrics unlock.
  • If user disables PIN/Biometric unlock methods, then the vault timeout action defaults back to “log out”

Code changes

  • Get DecryptionOptions to check if the user has master password set.
    if the user doesn't have a master password set up:
  • Change PIN and Biometric disable logic to reset timeout action to Logout
  • Change default timeout action to logout if there is no saved action.

Screenshots

https://github.com/bitwarden/mobile/assets/4648522/972cd706-61a7-4c35-bab6-9368848dc6d2

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/2610 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 7/10/2023 **Status:** ✅ Merged **Merged:** 7/12/2023 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `feature/pm-1208-f3-options` ← **Head:** `feature/pm-1201-timeout` --- ### 📝 Commits (5) - [`7c282ba`](https://github.com/bitwarden/android/commit/7c282bae46d04886576eaa635be3597a51baf9c0) [PM-1201] Change timeout actions available based on hasMasterPassword - [`4fe277b`](https://github.com/bitwarden/android/commit/4fe277bfb1b36c769e2bbd0f97d5bb69d6614636) Merge branch 'feature/pm-1208-f3-options' into feature/pm-1201-timeout - [`6434510`](https://github.com/bitwarden/android/commit/64345100f5023f4625678397c29ef415b5421fd9) [PM-1201] PR Fixes - [`03bd41c`](https://github.com/bitwarden/android/commit/03bd41c8b9ce9ec3d0607d0a1cb3ebd23dfde775) [PM-1201] PR Fixes - [`0634192`](https://github.com/bitwarden/android/commit/06341926b10ab8be25d8d1d244a690abce872b1c) [PM-1201] PR Fix ### 📊 Changes **3 files changed** (+48 additions, -5 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs` (+36 -5) 📝 `src/App/Resources/AppResources.Designer.cs` (+9 -0) 📝 `src/App/Resources/AppResources.resx` (+3 -0) </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 <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> For users without a master password, the unlock settings need to be different: - Vault timeout action defaults to “log out” - Vault timeout action “lock” is only available as an option if the user has enabled PIN unlock or biometrics unlock. - If user disables PIN/Biometric unlock methods, then the vault timeout action defaults back to “log out” ## 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--> - Get DecryptionOptions to check if the user has master password set. if the user doesn't have a master password set up: - Change PIN and Biometric disable logic to reset timeout action to Logout - Change default timeout action to logout if there is no saved action. ## Screenshots <!--Required for any UI changes. Delete if not applicable--> https://github.com/bitwarden/mobile/assets/4648522/972cd706-61a7-4c35-bab6-9368848dc6d2 ## 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-11 02:29:44 -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#9821
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?