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

[SG-390] Fix for missing org items with single org & personal ownership enabled (#1953)

Browse source 
* fix for missing org items with single org & personal ownership enabled

* fix for ui issue with vault filter state change on pull to refresh
This commit is contained in:
mp-bw 2022-06-15 10:43:54 -04:00 committed by GitHub
parent 448758a697
commit c53a85cd50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ namespace Bit.App.Pages
protected abstract ILogger logger { get; } protected abstract ILogger logger { get; }
protected bool _showVaultFilter; protected bool _showVaultFilter;
protected bool _hideMyVaultFilterOption; protected bool _personalOwnershipPolicyApplies;
protected string _vaultFilterSelection; protected string _vaultFilterSelection;
protected List<Organization> _organizations; protected List<Organization> _organizations;
@ -64,15 +64,21 @@ namespace Bit.App.Pages
protected async Task InitVaultFilterAsync() protected async Task InitVaultFilterAsync()
{ {
_organizations = await organizationService.GetAllAsync(); _organizations = await organizationService.GetAllAsync();
if (_organizations?.Any() ?? false)
{
_personalOwnershipPolicyApplies = await policyService.PolicyAppliesToUser(PolicyType.PersonalOwnership);
var singleOrgPolicyApplies = await policyService.PolicyAppliesToUser(PolicyType.OnlyOrg);
if (_personalOwnershipPolicyApplies && singleOrgPolicyApplies)
{
VaultFilterDescription = _organizations.First().Name;
}
else if (_vaultFilterSelection == null)
{
VaultFilterDescription = AppResources.AllVaults;
}
}
await Task.Delay(100);
ShowVaultFilter = await policyService.ShouldShowVaultFilterAsync(); ShowVaultFilter = await policyService.ShouldShowVaultFilterAsync();
if (ShowVaultFilter)
{
_hideMyVaultFilterOption = await policyService.PolicyAppliesToUser(PolicyType.PersonalOwnership);
if (_vaultFilterSelection == null)
{
_vaultFilterSelection = AppResources.AllVaults;
}
}
} }
protected async Task<List<CipherView>> GetAllCiphersAsync() protected async Task<List<CipherView>> GetAllCiphersAsync()
@ -93,7 +99,7 @@ namespace Bit.App.Pages
protected async Task VaultFilterOptionsAsync() protected async Task VaultFilterOptionsAsync()
{ {
var options = new List<string> { AppResources.AllVaults }; var options = new List<string> { AppResources.AllVaults };
if (!_hideMyVaultFilterOption) if (!_personalOwnershipPolicyApplies)
{ {
options.Add(AppResources.MyVault); options.Add(AppResources.MyVault);
} }