bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-15 07:43:37 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
mpbw2
2023-05-25 11:43:45 -04:00
committed by GitHub
parent c7fd113f26
commit 0288a6659c
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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