[PR #3652] [MERGED] PM-10379: Update the timeout action logic to occur immediately after requirements are met #4314

Closed
opened 2025-11-26 23:42:48 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/3652
Author: @david-livefront
Created: 7/30/2024
Status: Merged
Merged: 7/30/2024
Merged by: @david-livefront

Base: mainHead: PM-10379-update-timeout-logic


📝 Commits (1)

  • 4077eec PM-10379: Update the timeout action logic to occur immediately after requirements are met

📊 Changes

15 files changed (+240 additions, -468 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt (+0 -19)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt (+0 -15)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt (+1 -6)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+1 -11)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt (+109 -67)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt (+0 -11)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt (+1 -11)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt (+0 -11)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModel.kt (+0 -10)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt (+0 -62)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt (+0 -19)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+0 -18)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt (+128 -189)
📝 app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt (+0 -11)
📝 app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModelTest.kt (+0 -8)

📄 Description

🎟️ Tracking

PM-10379

📔 Objective

This PR enforces that the timeout action occurs as early as possible and not just when the app is foregrounded. This was causing a bug where the vault would be left unlocked after the user used the Autofill feature until either the background process was manually killed or the app was manually foregrounded.

This is a pretty big shift compared to the previous implementation since the app would store a LastActiveTimeMillis on disk and reference that value when foregrounding the app.

The new mechanism is based entirely on when the app is backgrounded, the user becoming inactive (change user), or on app startup. At those times we either enforce the timeout or set a timer for when the timeout should be enforced.

This LastActiveTimeMillis was based on the MAUI implementation but upon looking at the code history, much of that code was left behind from a previous iterations that worked very differently than it does today. This change reflects all the current requirements without any additional logic that is not needed.

Some of that code history can be seen here:

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 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/3652 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 7/30/2024 **Status:** ✅ Merged **Merged:** 7/30/2024 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-10379-update-timeout-logic` --- ### 📝 Commits (1) - [`4077eec`](https://github.com/bitwarden/android/commit/4077eecad3ff8c0f132d9079ab5bfc93091451eb) PM-10379: Update the timeout action logic to occur immediately after requirements are met ### 📊 Changes **15 files changed** (+240 additions, -468 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSource.kt` (+0 -19) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt` (+0 -15) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepository.kt` (+1 -6) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+1 -11) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt` (+109 -67) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt` (+0 -11) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt` (+1 -11) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt` (+0 -11) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModel.kt` (+0 -10) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt` (+0 -62) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/util/FakeAuthDiskSource.kt` (+0 -19) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+0 -18) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt` (+128 -189) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModelTest.kt` (+0 -11) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarViewModelTest.kt` (+0 -8) </details> ### 📄 Description ## 🎟️ Tracking [PM-10379](https://bitwarden.atlassian.net/browse/PM-10379) ## 📔 Objective This PR enforces that the timeout action occurs as early as possible and not just when the app is foregrounded. This was causing a bug where the vault would be left unlocked after the user used the Autofill feature until either the background process was manually killed or the app was manually foregrounded. This is a pretty big shift compared to the previous implementation since the app would store a `LastActiveTimeMillis` on disk and reference that value when foregrounding the app. The new mechanism is based entirely on when the app is backgrounded, the user becoming inactive (change user), or on app startup. At those times we either enforce the timeout or set a timer for when the timeout should be enforced. This `LastActiveTimeMillis` was based on the MAUI implementation but upon looking at the code history, much of that code was left behind from a previous iterations that worked very differently than it does today. This change reflects all the current requirements without any additional logic that is not needed. Some of that code history can be seen here: * [Restore Vault Timeout Timer for Android](https://github.com/bitwarden/mobile/pull/1220) * [Fix for Vault Timeout Locking Issue on Android](https://github.com/bitwarden/mobile/pull/1442) ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes [PM-10379]: https://bitwarden.atlassian.net/browse/PM-10379?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <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:42:48 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#4314