mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Show parent folders of subscribed folders

This commit is contained in:
M66B 2020-06-11 14:15:59 +02:00
parent 4898f2aceb
commit a0f74982bd
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@ -996,17 +996,24 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (parents.size() > 0)
Collections.sort(parents, parents.get(0).getComparator(context));
for (TupleFolderEx parent : parents)
if ((show_hidden || !parent.hide) &&
(!subscribed_only ||
parent.accountProtocol != EntityAccount.TYPE_IMAP ||
(parent.subscribed != null && parent.subscribed))) {
for (TupleFolderEx parent : parents) {
if (parent.hide && !show_hidden)
continue;
List<TupleFolderEx> childs = null;
if (parent.child_refs != null)
childs = getHierarchical(parent.child_refs, indentation + 1);
if (!subscribed_only ||
parent.accountProtocol != EntityAccount.TYPE_IMAP ||
(parent.subscribed != null && parent.subscribed) ||
(childs != null && childs.size() > 0)) {
parent.indentation = indentation;
result.add(parent);
if (!parent.collapsed && parent.child_refs != null)
result.addAll(getHierarchical(parent.child_refs, indentation + 1));
if (!parent.collapsed && childs != null)
result.addAll(childs);
}
}
return result;
}