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

[PR #932] [MERGED] [Auto Logout] Final review of feature #2669

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/932
Author: @vincentsalucci
Created: 5/29/2020
Status: ✅ Merged
Merged: 5/29/2020
Merged by: @kspearrin

Base: master ← Head: feature-auto-logout

📝 Commits (10+)

  • b736059 Initial commit of LockService name refactor (#831)
  • b07d0f8 Merge branch 'master' into feature-auto-logout
  • 8674540 [Auto-Logout] Update Service layer logic (#835)
  • f167774 Initial commit: lockOption/lock refactor app layer (#840)
  • 0f0cfcb [Auto-Logout] Settings Refactor - Application Layer Part 2 (#844)
  • 9d66d81 Merge branch 'master' into feature-auto-logout
  • a2b3951 Merge branch 'master' into feature-auto-logout
  • 2110141 Fixed dupe string resource (#854)
  • abc7e8f Merge branch 'master' into feature-auto-logout
  • b162dec Updated dependency to use VaultTimeoutService (#896)

📊 Changes

80 files changed (+742 additions, -377 deletions)

View changed files

📝 src/Android/Autofill/AutofillService.cs (+4 -4)
📝 src/Android/Effects/FabShadowEffect.cs (+2 -1)
📝 src/Android/MainActivity.cs (+9 -9)
📝 src/Android/Receivers/LockAlarmReceiver.cs (+2 -2)
📝 src/Android/Renderers/CipherViewCellRenderer.cs (+4 -7)
📝 src/Android/Services/DeviceActionService.cs (+11 -4)
📝 src/App/Abstractions/IDeviceActionService.cs (+1 -0)
📝 src/App/App.xaml.cs (+54 -39)
📝 src/App/Models/AppOptions.cs (+1 -0)
📝 src/App/Pages/Accounts/LockPageViewModel.cs (+9 -9)
📝 src/App/Pages/Accounts/LoginPage.xaml (+2 -2)
📝 src/App/Pages/Accounts/LoginPage.xaml.cs (+7 -3)
📝 src/App/Pages/Accounts/LoginPageViewModel.cs (+14 -3)
📝 src/App/Pages/Accounts/TwoFactorPage.xaml.cs (+2 -1)
📝 src/App/Pages/Accounts/TwoFactorPageViewModel.cs (+3 -2)
📝 src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs (+6 -2)
📝 src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs (+3 -2)
📝 src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs (+75 -28)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs (+3 -3)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs (+3 -3)

...and 60 more files

📄 Description

Objective

Merge Auto Logout feature into the master branch. Review all prior commits.

🔄 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/932 **Author:** [@vincentsalucci](https://github.com/vincentsalucci) **Created:** 5/29/2020 **Status:** ✅ Merged **Merged:** 5/29/2020 **Merged by:** [@kspearrin](https://github.com/kspearrin) **Base:** `master` ← **Head:** `feature-auto-logout` --- ### 📝 Commits (10+) - [`b736059`](https://github.com/bitwarden/android/commit/b73605983e18b3e6a498a5ea44ce61ff5c71fbe7) Initial commit of LockService name refactor (#831) - [`b07d0f8`](https://github.com/bitwarden/android/commit/b07d0f8cf168d0c7b6649377e4588ac7d29562f5) Merge branch 'master' into feature-auto-logout - [`8674540`](https://github.com/bitwarden/android/commit/867454005360888e7f2e63896eb8e22deb7725fd) [Auto-Logout] Update Service layer logic (#835) - [`f167774`](https://github.com/bitwarden/android/commit/f1677743ed69be755d8e9ab1886b5f94c59cdf22) Initial commit: lockOption/lock refactor app layer (#840) - [`0f0cfcb`](https://github.com/bitwarden/android/commit/0f0cfcbcb4bd735d5bf4953ae452a0d9bc88b435) [Auto-Logout] Settings Refactor - Application Layer Part 2 (#844) - [`9d66d81`](https://github.com/bitwarden/android/commit/9d66d8161468276d76fecfa7591a4b2fb7293cd0) Merge branch 'master' into feature-auto-logout - [`a2b3951`](https://github.com/bitwarden/android/commit/a2b3951ad3e98603a810a10cbeb4afb07ebbff70) Merge branch 'master' into feature-auto-logout - [`2110141`](https://github.com/bitwarden/android/commit/21101419fee1ac1e53e8344af71879ca9bce2a8c) Fixed dupe string resource (#854) - [`abc7e8f`](https://github.com/bitwarden/android/commit/abc7e8f413b190cc6adb201082aed63df4f793fd) Merge branch 'master' into feature-auto-logout - [`b162dec`](https://github.com/bitwarden/android/commit/b162dece174fd9e543ca21e093e5f1fb3e3d8f9c) Updated dependency to use VaultTimeoutService (#896) ### 📊 Changes **80 files changed** (+742 additions, -377 deletions) <details> <summary>View changed files</summary> 📝 `src/Android/Autofill/AutofillService.cs` (+4 -4) 📝 `src/Android/Effects/FabShadowEffect.cs` (+2 -1) 📝 `src/Android/MainActivity.cs` (+9 -9) 📝 `src/Android/Receivers/LockAlarmReceiver.cs` (+2 -2) 📝 `src/Android/Renderers/CipherViewCellRenderer.cs` (+4 -7) 📝 `src/Android/Services/DeviceActionService.cs` (+11 -4) 📝 `src/App/Abstractions/IDeviceActionService.cs` (+1 -0) 📝 `src/App/App.xaml.cs` (+54 -39) 📝 `src/App/Models/AppOptions.cs` (+1 -0) 📝 `src/App/Pages/Accounts/LockPageViewModel.cs` (+9 -9) 📝 `src/App/Pages/Accounts/LoginPage.xaml` (+2 -2) 📝 `src/App/Pages/Accounts/LoginPage.xaml.cs` (+7 -3) 📝 `src/App/Pages/Accounts/LoginPageViewModel.cs` (+14 -3) 📝 `src/App/Pages/Accounts/TwoFactorPage.xaml.cs` (+2 -1) 📝 `src/App/Pages/Accounts/TwoFactorPageViewModel.cs` (+3 -2) 📝 `src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs` (+6 -2) 📝 `src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs` (+3 -2) 📝 `src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs` (+75 -28) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs` (+3 -3) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs` (+3 -3) _...and 60 more files_ </details> ### 📄 Description ## Objective > Merge `Auto Logout` feature into the master branch. Review all prior commits. --- <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:22:26 -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#2669
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?