Sort folders on display name

app/src/main/java/eu/faircode/email/AdapterFolder.java

@@ -395,7 +395,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
         List<EntityFolder> folders = new ArrayList<>();
         folders.addAll(_folders);
-        EntityFolder.sort(folders);
+        EntityFolder.sort(context, folders);
 
         all.clear();
         for (EntityFolder folder : folders)

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -1503,7 +1503,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                 !EntityFolder.JUNK.equals(folder.type))
                             targets.add(folder);
 
-                    EntityFolder.sort(targets);
+                    EntityFolder.sort(context, targets);
 
                     return targets;
                 }

app/src/main/java/eu/faircode/email/EntityFolder.java

@@ -259,7 +259,7 @@ public class EntityFolder implements Serializable {
         return folder;
     }
 
-    static void sort(List<EntityFolder> folders) {
+    static void sort(final Context context, List<EntityFolder> folders) {
         final Collator collator = Collator.getInstance(Locale.getDefault());
         collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
 
@@ -274,9 +274,9 @@ public class EntityFolder implements Serializable {
                 int c = -f1.synchronize.compareTo(f2.synchronize);
                 if (c != 0)
                     return c;
-                return collator.compare(
+                String name1 = f1.getDisplayName(context);
-                        f1.name == null ? "" : f1.name,
+                String name2 = f2.getDisplayName(context);
-                        f2.name == null ? "" : f2.name);
+                return collator.compare(name1, name2);
             }
         });
     }

app/src/main/java/eu/faircode/email/FragmentAccount.java

@@ -1154,7 +1154,7 @@ public class FragmentAccount extends FragmentEx {
     }
 
     private void setFolders(List<EntityFolder> folders) {
-        EntityFolder.sort(folders);
+        EntityFolder.sort(getContext(), folders);
 
         EntityFolder none = new EntityFolder();
         none.name = "";

app/src/main/java/eu/faircode/email/FragmentIdentity.java

@@ -836,7 +836,7 @@ public class FragmentIdentity extends FragmentEx {
                 result.identity = db.identity().getIdentity(iid);
                 result.folders = db.folder().getFolders(aid);
 
-                EntityFolder.sort(result.folders);
+                EntityFolder.sort(context, result.folders);
 
                 return result;
             }

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -1079,7 +1079,7 @@ public class FragmentMessages extends FragmentEx {
                                     (fid < 0 ? !folder.unified : !folder.id.equals(fid)))
                                 targets.add(folder);
 
-                        EntityFolder.sort(targets);
+                        EntityFolder.sort(context, targets);
 
                         return targets;
                     }