github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-22 20:41:29 -05:00
Code Issues 144 Packages Projects Releases 118 Wiki Activity

[PR #2415] [MERGED] [AC-1045] vault timeout action policy #3554

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2415
Author: @jlf0dev
Created: 3/10/2023
Status: ✅ Merged
Merged: 4/14/2023
Merged by: @jlf0dev

Base: master ← Head: ac-1045-vault-timeout-action-policy

📝 Commits (10+)

  • c1d6cb3 [EC-1045] lock action if policy and show message
  • 5f1715b [EC-1045] add text for policy message
  • aec1dc7 [EC-1045] add consts to policy service
  • 09f42f9 [EC-1045] missed a const
  • e15c2aa [AC-1045] fix build
  • 379e08a Merge branch 'master' into ec-1045-vault-timeout-action-policy
  • 6898aab [AC-1045] fix bug where UI wasn't updating after sync
  • 8aba7ad [AC-1045] change FirstOrDefault to First to avoid nulls
  • 043c410 [AC-1045] refactor get vault timeout functions
  • ab67dd8 [AC-1045] don't filter action options unecessarily

📊 Changes

9 files changed (+144 additions, -76 deletions)

View changed files

📝 src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs (+62 -27)
📝 src/App/Resources/AppResources.Designer.cs (+19 -1)
📝 src/App/Resources/AppResources.resx (+7 -1)
📝 src/Core/Abstractions/IPolicyService.cs (+1 -0)
📝 src/Core/Abstractions/IVaultTimeoutService.cs (+1 -0)
📝 src/Core/Services/PolicyService.cs (+45 -12)
📝 src/Core/Services/SyncService.cs (+3 -3)
📝 src/Core/Services/VaultTimeoutService.cs (+5 -31)
📝 src/Core/Utilities/ServiceContainer.cs (+1 -1)

📄 Description

Type of change

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

Objective

This change locks the "Vault timeout action" in settings if the vault timeout policy is set with a specified action. It also changes the callout in settings to include the vault timeout action.

Code changes

  • file.ext: Description of what was changed and why

Screenshots

image image

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/2415 **Author:** [@jlf0dev](https://github.com/jlf0dev) **Created:** 3/10/2023 **Status:** ✅ Merged **Merged:** 4/14/2023 **Merged by:** [@jlf0dev](https://github.com/jlf0dev) **Base:** `master` ← **Head:** `ac-1045-vault-timeout-action-policy` --- ### 📝 Commits (10+) - [`c1d6cb3`](https://github.com/bitwarden/android/commit/c1d6cb39a098da18efea974e6dd227cef7864a22) [EC-1045] lock action if policy and show message - [`5f1715b`](https://github.com/bitwarden/android/commit/5f1715b76a2e19705512a37ed33874bf32b17c41) [EC-1045] add text for policy message - [`aec1dc7`](https://github.com/bitwarden/android/commit/aec1dc7e9d8748fd639b5fa09ac8d896dcaa9f10) [EC-1045] add consts to policy service - [`09f42f9`](https://github.com/bitwarden/android/commit/09f42f97db9b4eb383b3be2bda46faff93d0862c) [EC-1045] missed a const - [`e15c2aa`](https://github.com/bitwarden/android/commit/e15c2aa7578d75d178a56c0e71c2885587ea2112) [AC-1045] fix build - [`379e08a`](https://github.com/bitwarden/android/commit/379e08a26893913121285bf992a6d6a148aad630) Merge branch 'master' into ec-1045-vault-timeout-action-policy - [`6898aab`](https://github.com/bitwarden/android/commit/6898aab38351aba3c8522e7401de42e1bfc4f1b5) [AC-1045] fix bug where UI wasn't updating after sync - [`8aba7ad`](https://github.com/bitwarden/android/commit/8aba7ad71e5a5671465d72fddf33bb53c1261d1a) [AC-1045] change FirstOrDefault to First to avoid nulls - [`043c410`](https://github.com/bitwarden/android/commit/043c410598f1fbb65d003ca6aefa6f6d370c7625) [AC-1045] refactor get vault timeout functions - [`ab67dd8`](https://github.com/bitwarden/android/commit/ab67dd8de60bbcde61f4ca92980a2722f54ec4f6) [AC-1045] don't filter action options unecessarily ### 📊 Changes **9 files changed** (+144 additions, -76 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs` (+62 -27) 📝 `src/App/Resources/AppResources.Designer.cs` (+19 -1) 📝 `src/App/Resources/AppResources.resx` (+7 -1) 📝 `src/Core/Abstractions/IPolicyService.cs` (+1 -0) 📝 `src/Core/Abstractions/IVaultTimeoutService.cs` (+1 -0) 📝 `src/Core/Services/PolicyService.cs` (+45 -12) 📝 `src/Core/Services/SyncService.cs` (+3 -3) 📝 `src/Core/Services/VaultTimeoutService.cs` (+5 -31) 📝 `src/Core/Utilities/ServiceContainer.cs` (+1 -1) </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--> This change locks the "Vault timeout action" in settings if the vault timeout policy is set with a specified action. It also changes the callout in settings to include the vault timeout action. ## 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--> * **file.ext:** Description of what was changed and why ## Screenshots <!--Required for any UI changes. Delete if not applicable--> <img width="556" alt="image" src="https://user-images.githubusercontent.com/24985544/219115463-6b0865df-ee57-46f3-888d-e69a7c1500da.png"> <img width="600" alt="image" src="https://user-images.githubusercontent.com/24985544/219115861-f452e977-57fb-41e0-bfcb-467cdeea1ecd.png"> ## 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 2025-11-26 23:34:20 -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#3554
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?