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

Merge branch 'master' into feature-accountswitch

Browse Source
This commit is contained in:
Matt Portune
2022-01-19 09:31:13 -05:00
parent 796cf6dc25 6f3999016f
commit d52a1bf668
4 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/App/App.xaml.cs
View File

@@ -188,6 +188,8 @@ namespace Bit.App
if (Device.RuntimePlatform == Device.Android) if (Device.RuntimePlatform == Device.Android)
{ {
await _vaultTimeoutService.CheckVaultTimeoutAsync(); await _vaultTimeoutService.CheckVaultTimeoutAsync();
// Reset delay on every start
_vaultTimeoutService.DelayLockAndLogoutMs = null;
} }
_messagingService.Send("startEventTimer"); _messagingService.Send("startEventTimer");
} }
@@ -220,7 +222,7 @@ namespace Bit.App
private async Task SleptAsync() private async Task SleptAsync()
{ {
await HandleVaultTimeoutAsync(); await _vaultTimeoutService.CheckVaultTimeoutAsync();
_messagingService.Send("stopEventTimer"); _messagingService.Send("stopEventTimer");
} }
@@ -318,33 +320,6 @@ namespace Bit.App
} }
} }
private async Task HandleVaultTimeoutAsync()
{
if (await _vaultTimeoutService.IsLockedAsync())
{
return;
}
var authed = await _stateService.IsAuthenticatedAsync();
if (!authed)
{
return;
}
var vaultTimeout = await _stateService.GetVaultTimeoutAsync();
vaultTimeout = vaultTimeout.GetValueOrDefault(-1);
if (vaultTimeout == 0)
{
var action = await _stateService.GetVaultTimeoutActionAsync();
if (action == "logOut")
{
await _vaultTimeoutService.LogOutAsync();
}
else
{
await _vaultTimeoutService.LockAsync(true);
}
}
}
private async Task ClearCacheIfNeededAsync() private async Task ClearCacheIfNeededAsync()
{ {
var lastClear = await _stateService.GetLastFileCacheClearAsync(); var lastClear = await _stateService.GetLastFileCacheClearAsync();

7
src/App/Pages/Vault/AttachmentsPageViewModel.cs
View File

@@ -18,6 +18,7 @@ namespace Bit.App.Pages
private readonly ICipherService _cipherService; private readonly ICipherService _cipherService;
private readonly ICryptoService _cryptoService; private readonly ICryptoService _cryptoService;
private readonly IStateService _stateService; private readonly IStateService _stateService;
private readonly IVaultTimeoutService _vaultTimeoutService;
private readonly IPlatformUtilsService _platformUtilsService; private readonly IPlatformUtilsService _platformUtilsService;
private CipherView _cipher; private CipherView _cipher;
private Cipher _cipherDomain; private Cipher _cipherDomain;
@@ -33,6 +34,7 @@ namespace Bit.App.Pages
_cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService"); _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
_platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"); _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
_stateService = ServiceContainer.Resolve<IStateService>("stateService"); _stateService = ServiceContainer.Resolve<IStateService>("stateService");
_vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
Attachments = new ExtendedObservableCollection<AttachmentView>(); Attachments = new ExtendedObservableCollection<AttachmentView>();
DeleteAttachmentCommand = new Command<AttachmentView>(DeleteAsync); DeleteAttachmentCommand = new Command<AttachmentView>(DeleteAsync);
PageTitle = AppResources.Attachments; PageTitle = AppResources.Attachments;
@@ -135,6 +137,11 @@ namespace Bit.App.Pages
public async Task ChooseFileAsync() public async Task ChooseFileAsync()
{ {
// Prevent Android from locking if vault timeout set to "immediate"
if (Device.RuntimePlatform == Device.Android)
{
_vaultTimeoutService.DelayLockAndLogoutMs = 60000;
}
await _deviceActionService.SelectFileAsync(); await _deviceActionService.SelectFileAsync();
} }

2
src/Core/Abstractions/IVaultTimeoutService.cs
View File

@@ -5,6 +5,8 @@ namespace Bit.Core.Abstractions
{ {
public interface IVaultTimeoutService public interface IVaultTimeoutService
{ {
long? DelayLockAndLogoutMs { get; set; }
Task CheckVaultTimeoutAsync(); Task CheckVaultTimeoutAsync();
Task<bool> ShouldTimeoutAsync(string userId = null); Task<bool> ShouldTimeoutAsync(string userId = null);
Task ExecuteTimeoutActionAsync(string userId = null); Task ExecuteTimeoutActionAsync(string userId = null);

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

@@ -52,6 +52,8 @@ namespace Bit.Core.Services
_loggedOutCallback = loggedOutCallback; _loggedOutCallback = loggedOutCallback;
} }
public long? DelayLockAndLogoutMs { get; set; }
public async Task<bool> IsLockedAsync(string userId = null) public async Task<bool> IsLockedAsync(string userId = null)
{ {
var hasKey = await _cryptoService.HasKeyAsync(userId); var hasKey = await _cryptoService.HasKeyAsync(userId);
@@ -95,12 +97,20 @@ namespace Bit.Core.Services
{ {
return false; return false;
} }
if (vaultTimeoutMinutes == 0 && !DelayLockAndLogoutMs.HasValue)
{
return true;
}
var lastActiveTime = await _stateService.GetLastActiveTimeAsync(userId); var lastActiveTime = await _stateService.GetLastActiveTimeAsync(userId);
if (lastActiveTime == null) if (lastActiveTime == null)
{ {
return false; return false;
} }
var diffMs = _platformUtilsService.GetActiveTime() - lastActiveTime; var diffMs = _platformUtilsService.GetActiveTime() - lastActiveTime;
if (DelayLockAndLogoutMs.HasValue && diffMs < DelayLockAndLogoutMs)
{
return false;
}
var vaultTimeoutMs = vaultTimeoutMinutes * 60000; var vaultTimeoutMs = vaultTimeoutMinutes * 60000;
return diffMs >= vaultTimeoutMs; return diffMs >= vaultTimeoutMs;
} }