From 0b5f544ab7f6ce0c0ebc92b16176ed9b7d37ad92 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 28 May 2019 16:01:22 +0200 Subject: [PATCH] Fixed folder display name --- .../main/java/eu/faircode/email/FragmentAccount.java | 12 ++---------- .../main/java/eu/faircode/email/FragmentRule.java | 3 --- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 8e558585f8..fb0b90eebb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -669,9 +669,6 @@ public class FragmentAccount extends FragmentBase { if (!junk && altJunk != null) altJunk.type = EntityFolder.JUNK; - for (EntityFolder folder : result.folders) - folder.display = folder.getDisplayName(getContext()); - if (result.folders.size() > 0) Collections.sort(result.folders, result.folders.get(0).getComparator(context)); } @@ -1189,13 +1186,8 @@ public class FragmentAccount extends FragmentBase { DB db = DB.getInstance(context); List folders = db.folder().getFolders(account); - if (folders != null) { - for (EntityFolder folder : folders) - folder.display = folder.getDisplayName(getContext()); - - if (folders.size() > 0) - Collections.sort(folders, folders.get(0).getComparator(context)); - } + if (folders != null && folders.size() > 0) + Collections.sort(folders, folders.get(0).getComparator(context)); return folders; } diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java index a7277e3771..b8e0081fd1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentRule.java +++ b/app/src/main/java/eu/faircode/email/FragmentRule.java @@ -361,9 +361,6 @@ public class FragmentRule extends FragmentBase { if (data.folders == null) data.folders = new ArrayList<>(); - for (EntityFolder folder : data.folders) - folder.display = folder.getDisplayName(context); - if (data.folders.size() > 0) Collections.sort(data.folders, data.folders.get(0).getComparator(context));