From 9d343333fb2758dfcc3fe6382fb5718d9dfc7124 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 7 Oct 2024 21:00:11 +0200 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/EntityFolder.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java index 8b0f92a794..c6de796a8c 100644 --- 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)); }