github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-15 06:59:05 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #844] [MERGED] [Auto-Logout] Settings Refactor - Application Layer Part 2 #2610

New Issue
Closed
opened 2025-11-26 23:21:41 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:21:41 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/844
Author: @vincentsalucci
Created: 4/20/2020
Status: ✅ Merged
Merged: 4/22/2020
Merged by: @vincentsalucci

Base: feature-auto-logout ← Head: fal-settings-refactor

📝 Commits (5)

  • a19fda1 Initial commit of app layer part 2
  • b8e476b Updated biometrics position
  • a29f28d Reverted resource name refactor
  • d920033 LockOptions refactor revert
  • ffc4f9c Updated method casing :: Removed VaultTimeout prefix for timeouts

📊 Changes

5 files changed (+117 additions, -65 deletions)

View changed files

📝 src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs (+6 -2)
📝 src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs (+67 -21)
📝 src/App/Resources/AppResources.Designer.cs (+28 -29)
📝 src/App/Resources/AppResources.resx (+15 -12)
📝 src/App/Utilities/AppHelpers.cs (+1 -1)

📄 Description

Objective

Adjust Settings UI with new strings and add selection for VaultTimeoutAction. Include a warning dialog to prompt users of the potential consequences of logging out during vault timeout.

Code Changes

  • SettingsPage.xaml.cs: Added action for clicking on the new action row. Refactored name of references.
  • SettingsPageViewModel.cs: Refactored naming schemes to use VaultTimeout. Added VaultTimeoutActions list. Get/set stored values for timeout/action. Applied saving functions for both timeout and action. Added UI for new VaultTimeoutAction row (fixed but with biometrics ordinal). Added helper methods for retrieving values from list keys.
  • AppHelper.cs: Fixed issue with retrieving potentially saved timeout action during install process.
  • String resources: Updated existing strings (that will not need new translations) to use VaultTimeout scheme. Added new strings

iOS

0-timeout-options
1-timeout-logout-warning

Android

0-android-vault-timeout
1-android-log-out-warning

🔄 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/844 **Author:** [@vincentsalucci](https://github.com/vincentsalucci) **Created:** 4/20/2020 **Status:** ✅ Merged **Merged:** 4/22/2020 **Merged by:** [@vincentsalucci](https://github.com/vincentsalucci) **Base:** `feature-auto-logout` ← **Head:** `fal-settings-refactor` --- ### 📝 Commits (5) - [`a19fda1`](https://github.com/bitwarden/android/commit/a19fda182d51c19b746aa0e7d30f732e5705f4a2) Initial commit of app layer part 2 - [`b8e476b`](https://github.com/bitwarden/android/commit/b8e476b39959151a775347a31fe1123fa477cebf) Updated biometrics position - [`a29f28d`](https://github.com/bitwarden/android/commit/a29f28da64eb12488a3d3fb3b55ecaf723c8ec8f) Reverted resource name refactor - [`d920033`](https://github.com/bitwarden/android/commit/d920033035c3f90f3c68fc8e05fd3cd47d035e50) LockOptions refactor revert - [`ffc4f9c`](https://github.com/bitwarden/android/commit/ffc4f9c7dcc5a9d0631a521ab10b7a156fb852bf) Updated method casing :: Removed VaultTimeout prefix for timeouts ### 📊 Changes **5 files changed** (+117 additions, -65 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs` (+6 -2) 📝 `src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs` (+67 -21) 📝 `src/App/Resources/AppResources.Designer.cs` (+28 -29) 📝 `src/App/Resources/AppResources.resx` (+15 -12) 📝 `src/App/Utilities/AppHelpers.cs` (+1 -1) </details> ### 📄 Description ## Objective > Adjust Settings UI with new strings and add selection for `VaultTimeoutAction`. Include a warning dialog to prompt users of the potential consequences of logging out during vault timeout. ## Code Changes - **SettingsPage.xaml.cs**: Added action for clicking on the new action row. Refactored name of references. - **SettingsPageViewModel.cs**: Refactored naming schemes to use `VaultTimeout`. Added `VaultTimeoutActions` list. Get/set stored values for timeout/action. Applied saving functions for both timeout and action. Added UI for new `VaultTimeoutAction` row (fixed but with biometrics ordinal). Added helper methods for retrieving values from list keys. - **AppHelper.cs**: Fixed issue with retrieving potentially saved timeout action during install process. - **String resources**: Updated existing strings (that will not need new translations) to use `VaultTimeout` scheme. Added new strings ## iOS ![0-timeout-options](https://user-images.githubusercontent.com/26154748/79906157-ef5b4000-83dc-11ea-9e9e-e58e9cefa3f2.png) ![1-timeout-logout-warning](https://user-images.githubusercontent.com/26154748/79906159-eff3d680-83dc-11ea-98bf-a4c34c661481.png) ## Android ![0-android-vault-timeout](https://user-images.githubusercontent.com/26154748/79906184-faae6b80-83dc-11ea-921b-3b48c2f5763e.png) ![1-android-log-out-warning](https://user-images.githubusercontent.com/26154748/79906187-fbdf9880-83dc-11ea-9977-c64b8cf12ef3.png) --- <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:21:41 -06: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#2610
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?