bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-14 23:33:34 +00:00
Code Issues Releases Wiki Activity

fix for bug stopping vault timeout to never (#1618)

Browse Source 
- use nullable int on settings page and in vault service
This commit is contained in:
Jake Fink
2021-10-29 10:31:38 -04:00
committed by GitHub
parent 0f992d27b3
commit 318a3e4de9
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ namespace Bit.Core.Services
return;
}
var vaultTimeoutMinutes = await GetVaultTimeout();
if (vaultTimeoutMinutes < 0)
if (vaultTimeoutMinutes < 0 || vaultTimeoutMinutes == null)
{
return;
}
@@ -178,8 +178,8 @@ namespace Bit.Core.Services
await _storageService.RemoveAsync(Constants.ProtectedPin);
}
public async Task<int> GetVaultTimeout() {
var vaultTimeout = (await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey)).GetValueOrDefault(-1);
public async Task<int?> GetVaultTimeout() {
var vaultTimeout = await _storageService.GetAsync<int?>(Constants.VaultTimeoutKey);
if (await _policyService.PolicyAppliesToUser(PolicyType.MaximumVaultTimeout)) {
var policy = (await _policyService.GetAll(PolicyType.MaximumVaultTimeout)).First();
@@ -190,7 +190,7 @@ namespace Bit.Core.Services
return vaultTimeout;
}
var timeout = Math.Min(vaultTimeout, policyTimeout.Value);
var timeout = vaultTimeout.HasValue ? Math.Min(vaultTimeout.Value, policyTimeout.Value) : policyTimeout.Value;
if (timeout < 0) {
timeout = policyTimeout.Value;