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

Fixed unified inbox folders with child folders

This commit is contained in:
M66B 2019-06-07 17:08:57 +02:00
parent 845eff88b4
commit b4fbf80141
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -690,37 +690,42 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (folders.size() > 0)
Collections.sort(folders, folders.get(0).getComparator(context));
List<TupleFolderEx> parents = new ArrayList<>();
Map<Long, TupleFolderEx> idFolder = new HashMap<>();
Map<Long, List<TupleFolderEx>> parentChilds = new HashMap<>();
List<TupleFolderEx> hierarchical;
if (account < 0)
hierarchical = folders;
else {
List<TupleFolderEx> parents = new ArrayList<>();
Map<Long, TupleFolderEx> idFolder = new HashMap<>();
Map<Long, List<TupleFolderEx>> parentChilds = new HashMap<>();
for (TupleFolderEx folder : folders) {
idFolder.put(folder.id, folder);
if (folder.parent == null)
parents.add(folder);
else {
if (!parentChilds.containsKey(folder.parent))
parentChilds.put(folder.parent, new ArrayList<TupleFolderEx>());
parentChilds.get(folder.parent).add(folder);
for (TupleFolderEx folder : folders) {
idFolder.put(folder.id, folder);
if (folder.parent == null)
parents.add(folder);
else {
if (!parentChilds.containsKey(folder.parent))
parentChilds.put(folder.parent, new ArrayList<TupleFolderEx>());
parentChilds.get(folder.parent).add(folder);
}
}
}
TupleFolderEx root = new TupleFolderEx();
root.name = "[root]";
root.child_refs = parents;
for (TupleFolderEx parent : parents)
parent.parent_ref = root;
TupleFolderEx root = new TupleFolderEx();
root.name = "[root]";
root.child_refs = parents;
for (TupleFolderEx parent : parents)
parent.parent_ref = root;
for (long pid : parentChilds.keySet()) {
TupleFolderEx parent = idFolder.get(pid);
if (parent != null) {
parent.child_refs = parentChilds.get(pid);
for (TupleFolderEx child : parent.child_refs)
child.parent_ref = parent;
for (long pid : parentChilds.keySet()) {
TupleFolderEx parent = idFolder.get(pid);
if (parent != null) {
parent.child_refs = parentChilds.get(pid);
for (TupleFolderEx child : parent.child_refs)
child.parent_ref = parent;
}
}
}
List<TupleFolderEx> hierarchical = getHierarchical(parents, 0);
hierarchical = getHierarchical(parents, 0);
}
DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, hierarchical), false);