Fixed folder display name

pull/156/head
M66B 6 years ago
parent fa562dc391
commit 0b5f544ab7

@ -669,9 +669,6 @@ public class FragmentAccount extends FragmentBase {
if (!junk && altJunk != null) if (!junk && altJunk != null)
altJunk.type = EntityFolder.JUNK; altJunk.type = EntityFolder.JUNK;
for (EntityFolder folder : result.folders)
folder.display = folder.getDisplayName(getContext());
if (result.folders.size() > 0) if (result.folders.size() > 0)
Collections.sort(result.folders, result.folders.get(0).getComparator(context)); Collections.sort(result.folders, result.folders.get(0).getComparator(context));
} }
@ -1189,13 +1186,8 @@ public class FragmentAccount extends FragmentBase {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
List<EntityFolder> folders = db.folder().getFolders(account); List<EntityFolder> folders = db.folder().getFolders(account);
if (folders != null) { if (folders != null && folders.size() > 0)
for (EntityFolder folder : folders)
folder.display = folder.getDisplayName(getContext());
if (folders.size() > 0)
Collections.sort(folders, folders.get(0).getComparator(context)); Collections.sort(folders, folders.get(0).getComparator(context));
}
return folders; return folders;
} }

@ -361,9 +361,6 @@ public class FragmentRule extends FragmentBase {
if (data.folders == null) if (data.folders == null)
data.folders = new ArrayList<>(); data.folders = new ArrayList<>();
for (EntityFolder folder : data.folders)
folder.display = folder.getDisplayName(context);
if (data.folders.size() > 0) if (data.folders.size() > 0)
Collections.sort(data.folders, data.folders.get(0).getComparator(context)); Collections.sort(data.folders, data.folders.get(0).getComparator(context));

Loading…
Cancel
Save