From aed3ec547407ea051301ddcd36e106b6e3f5cea8 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 22 Oct 2019 16:42:05 -0400 Subject: [PATCH] check authed and unlocked before trying to load --- .../Vault/GroupingsPage/GroupingsPageViewModel.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs index be81c420e..0c1926270 100644 --- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs +++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs @@ -37,6 +37,8 @@ namespace Bit.App.Pages private readonly IFolderService _folderService; private readonly ICollectionService _collectionService; private readonly ISyncService _syncService; + private readonly IUserService _userService; + private readonly ILockService _lockService; private readonly IDeviceActionService _deviceActionService; private readonly IPlatformUtilsService _platformUtilsService; private readonly IMessagingService _messagingService; @@ -48,6 +50,8 @@ namespace Bit.App.Pages _folderService = ServiceContainer.Resolve("folderService"); _collectionService = ServiceContainer.Resolve("collectionService"); _syncService = ServiceContainer.Resolve("syncService"); + _userService = ServiceContainer.Resolve("userService"); + _lockService = ServiceContainer.Resolve("lockService"); _deviceActionService = ServiceContainer.Resolve("deviceActionService"); _platformUtilsService = ServiceContainer.Resolve("platformUtilsService"); _messagingService = ServiceContainer.Resolve("messagingService"); @@ -134,6 +138,15 @@ namespace Bit.App.Pages { return; } + var authed = await _userService.IsAuthenticatedAsync(); + if(!authed) + { + return; + } + if(await _lockService.IsLockedAsync()) + { + return; + } _doingLoad = true; LoadedOnce = true; ShowNoData = false;