bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-11 13:53:29 +00:00
Code Issues Releases Wiki Activity

Revert "reset lock delay when returning from activity result (#2539)" (#2597)

Browse Source 
This reverts commit 0288a6659c.
This commit is contained in:
mpbw2
2023-07-03 09:56:10 -04:00
committed by GitHub
parent 1d541e5b8e
commit 4abb472998
5 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/Services/VaultTimeoutService.cs
View File

@@ -50,8 +50,7 @@ namespace Bit.Core.Services
_loggedOutCallback = loggedOutCallback;
}
public long? DelayTimeoutMs { get; set; }
public bool ResetTimeoutDelay { get; set; }
public long? DelayLockAndLogoutMs { get; set; }
public async Task<bool> IsLockedAsync(string userId = null)
{
@@ -118,7 +117,7 @@ namespace Bit.Core.Services
{
return false;
}
if (vaultTimeoutMinutes == 0 && !DelayTimeoutMs.HasValue)
if (vaultTimeoutMinutes == 0 && !DelayLockAndLogoutMs.HasValue)
{
return true;
}
@@ -128,13 +127,8 @@ namespace Bit.Core.Services
return false;
}
var diffMs = _platformUtilsService.GetActiveTime() - lastActiveTime;
if (DelayTimeoutMs.HasValue && diffMs < DelayTimeoutMs)
if (DelayLockAndLogoutMs.HasValue && diffMs < DelayLockAndLogoutMs)
{
if (ResetTimeoutDelay)
{
DelayTimeoutMs = null;
ResetTimeoutDelay = false;
}
return false;
}
var vaultTimeoutMs = vaultTimeoutMinutes * 60000;