mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 18:38:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

separate init and showVaultFilter property set (#1954)

Browse source
This commit is contained in:
mp-bw 2022-06-15 15:18:30 -04:00 committed by GitHub
parent 3aef86bd34
commit f24388c1b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/Pages/Vault/CiphersPageViewModel.cs
View file

@ -87,7 +87,7 @@ namespace Bit.App.Pages
public async Task InitAsync() public async Task InitAsync()
{ {
await InitVaultFilterAsync(); await InitVaultFilterAsync(true);
WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault(); WebsiteIconsEnabled = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
PerformSearchIfPopulated(); PerformSearchIfPopulated();
} }

2
src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
View file

@ -181,9 +181,9 @@ namespace Bit.App.Pages
return; return;
} }
await InitVaultFilterAsync(MainPage);
if (MainPage) if (MainPage)
{ {
await InitVaultFilterAsync();
PageTitle = ShowVaultFilter ? AppResources.Vaults : AppResources.MyVault; PageTitle = ShowVaultFilter ? AppResources.Vaults : AppResources.MyVault;
} }

5
src/App/Pages/VaultFilterViewModel.cs
View file

@ -61,7 +61,7 @@ namespace Bit.App.Pages
protected bool IsVaultFilterOrgVault => _vaultFilterSelection != AppResources.AllVaults && protected bool IsVaultFilterOrgVault => _vaultFilterSelection != AppResources.AllVaults &&
_vaultFilterSelection != AppResources.MyVault; _vaultFilterSelection != AppResources.MyVault;
protected async Task InitVaultFilterAsync() protected async Task InitVaultFilterAsync(bool shouldUpdateShowVaultFilter)
{ {
_organizations = await organizationService.GetAllAsync(); _organizations = await organizationService.GetAllAsync();
if (_organizations?.Any() ?? false) if (_organizations?.Any() ?? false)
@ -77,9 +77,12 @@ namespace Bit.App.Pages
VaultFilterDescription = AppResources.AllVaults; VaultFilterDescription = AppResources.AllVaults;
} }
} }
if (shouldUpdateShowVaultFilter)
{
await Task.Delay(100); await Task.Delay(100);
ShowVaultFilter = await policyService.ShouldShowVaultFilterAsync(); ShowVaultFilter = await policyService.ShouldShowVaultFilterAsync();
} }
}
protected async Task<List<CipherView>> GetAllCiphersAsync() protected async Task<List<CipherView>> GetAllCiphersAsync()
{ {