mirror of
https://github.com/bitwarden/android.git
synced 2024-12-25 10:28:28 +03:00
show nested collections in groupings pages
This commit is contained in:
parent
5350e5385c
commit
0116572fec
1 changed files with 2 additions and 1 deletions
|
@ -328,7 +328,7 @@ namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
Folders = await _folderService.GetAllDecryptedAsync();
|
Folders = await _folderService.GetAllDecryptedAsync();
|
||||||
NestedFolders = await _folderService.GetAllNestedAsync();
|
NestedFolders = await _folderService.GetAllNestedAsync();
|
||||||
HasFolders = NestedFolders.Any();
|
HasFolders = NestedFolders.Any(f => f.Node?.Id != null);
|
||||||
Collections = await _collectionService.GetAllDecryptedAsync();
|
Collections = await _collectionService.GetAllDecryptedAsync();
|
||||||
NestedCollections = await _collectionService.GetAllNestedAsync(Collections);
|
NestedCollections = await _collectionService.GetAllNestedAsync(Collections);
|
||||||
HasCollections = NestedCollections.Any();
|
HasCollections = NestedCollections.Any();
|
||||||
|
@ -366,6 +366,7 @@ namespace Bit.App.Pages
|
||||||
if(collectionNode?.Node != null)
|
if(collectionNode?.Node != null)
|
||||||
{
|
{
|
||||||
PageTitle = collectionNode.Node.Name;
|
PageTitle = collectionNode.Node.Name;
|
||||||
|
NestedCollections = (collectionNode.Children?.Count ?? 0) > 0 ? collectionNode.Children : null;
|
||||||
}
|
}
|
||||||
Filter = c => c.CollectionIds?.Contains(CollectionId) ?? false;
|
Filter = c => c.CollectionIds?.Contains(CollectionId) ?? false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue