PM-34193: bug: Unlock vault from Never-Lock should be on io thread (#6727)

david-livefront · web-flow · commit c2ef20e1ed74 · 2026-03-27T14:01:52.000-04:00
diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt
@@ -98,6 +98,7 @@ class VaultLockManagerImpl(
     context: Context,
 ) : VaultLockManager {
     private val unconfinedScope = CoroutineScope(dispatcherManager.unconfined)
+    private val ioScope = CoroutineScope(dispatcherManager.io)
 
     /**
      * This [Map] tracks all active timeout [Job]s that are running and their associated data using
@@ -478,7 +479,7 @@ class VaultLockManagerImpl(
                     .map { userId -> vaultTimeoutChangesForUserFlow(userId = userId) }
                     .merge()
             }
-            .launchIn(unconfinedScope)
+            .launchIn(ioScope)
     }
 
     private fun observeUserLogoutResults() {

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ class VaultLockManagerImpl(`
`98`	`98`	`context: Context,`
`99`	`99`	`) : VaultLockManager {`
`100`	`100`	`private val unconfinedScope = CoroutineScope(dispatcherManager.unconfined)`
	`101`	`+ private val ioScope = CoroutineScope(dispatcherManager.io)`
`101`	`102`
`102`	`103`	`/**`
`103`	`104`	`* This [Map] tracks all active timeout [Job]s that are running and their associated data using`
`@@ -478,7 +479,7 @@ class VaultLockManagerImpl(`
`478`	`479`	`.map { userId -> vaultTimeoutChangesForUserFlow(userId = userId) }`
`479`	`480`	`.merge()`
`480`	`481`	`}`
`481`		`- .launchIn(unconfinedScope)`
	`482`	`+ .launchIn(ioScope)`
`482`	`483`	`}`
`483`	`484`
`484`	`485`	`private fun observeUserLogoutResults() {`