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

restore vault timeout timer for Android (#1220)

Browse Source
This commit is contained in:
Matt Portune
2021-01-15 14:04:07 -05:00
committed by GitHub
parent cdc08e7e8a
commit 56935a7210
10 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,22 +81,23 @@ namespace Bit.Core.Services
return;
}
// This only returns null
var vaultTimeout = _platformUtilsService.LockTimeout();
if (vaultTimeout == null)
var vaultTimeoutMinutes = _platformUtilsService.LockTimeout();
if (vaultTimeoutMinutes == null)
{
vaultTimeout = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
vaultTimeoutMinutes = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
}
if (vaultTimeout.GetValueOrDefault(-1) < 0)
if (vaultTimeoutMinutes.GetValueOrDefault(-1) < 0)
{
return;
}
var lastActive = await _storageService.GetAsync<long?>(Constants.LastActiveKey);
if (lastActive == null)
var lastActiveTime = await _storageService.GetAsync<long?>(Constants.LastActiveTimeKey);
if (lastActiveTime == null)
{
return;
}
var diff = _platformUtilsService.GetActiveTime() - lastActive;
if (diff >= vaultTimeout * 60)
var diffMs = _platformUtilsService.GetActiveTime() - lastActiveTime;
var vaultTimeoutMs = vaultTimeoutMinutes * 60000;
if (diffMs >= vaultTimeoutMs)
{
// Pivot based on saved action
var action = await _storageService.GetAsync<string>(Constants.VaultTimeoutActionKey);