mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 23:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

no folder fixes for groupings display

Browse source
This commit is contained in:
Kyle Spearrin 2018-12-10 09:41:21 -05:00
parent fdea212415
commit dff91dc67d
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/App/Pages/Vault/VaultListCiphersPage.cs
View file

@ -328,14 +328,16 @@ namespace Bit.App.Pages
if(_folder || !string.IsNullOrWhiteSpace(_folderId)) if(_folder || !string.IsNullOrWhiteSpace(_folderId))
{ {
ciphers = await _cipherService.GetAllByFolderAsync(_folderId); ciphers = await _cipherService.GetAllByFolderAsync(_folderId);
if(!string.IsNullOrWhiteSpace(_folderId))
var folders = await _folderService.GetAllAsync();
var fGroupings = folders.Select(f => new Grouping(f, null)).OrderBy(g => g.Name).ToList();
var fTreeNodes = Helpers.GetAllNested(fGroupings);
var fTreeNode = Helpers.GetTreeNodeObject(fTreeNodes, _folderId);
if(fTreeNode.Children?.Any() ?? false)
{ {
Groupings = fTreeNode.Children.Select(n => new GroupingOrCipher(n)).ToArray(); var folders = await _folderService.GetAllAsync();
var fGroupings = folders.Select(f => new Grouping(f, null)).OrderBy(g => g.Name).ToList();
var fTreeNodes = Helpers.GetAllNested(fGroupings);
var fTreeNode = Helpers.GetTreeNodeObject(fTreeNodes, _folderId);
if(fTreeNode.Children?.Any() ?? false)
{
Groupings = fTreeNode.Children.Select(n => new GroupingOrCipher(n)).ToArray();
}
} }
} }
else if(!string.IsNullOrWhiteSpace(_collectionId)) else if(!string.IsNullOrWhiteSpace(_collectionId))