Refactoring

4 weeks ago · 9d343333fb
parent 40f4820848
commit 9d343333fb
1 changed files with 2 additions and 5 deletions
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@ -837,11 +837,8 @@ public class EntityFolder extends EntityOrder implements Serializable {
                if (c != 0)
                    return c;

-                if (context == null)
-                    return collator.compare(f1.name, f2.name);
-
-                String name1 = f1.getDisplayName(context);
-                String name2 = f2.getDisplayName(context);
+                String name1 = (context == null ? f1.name : f1.getDisplayName(context));
+                String name2 = (context == null ? f2.name : f2.getDisplayName(context));
                return Normalizer.normalize(name1, Normalizer.Form.NFD).compareToIgnoreCase(
                        Normalizer.normalize(name2, Normalizer.Form.NFD));
            }