From b11a23af56c79c544bf49f642530906b3d668a59 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 22 Dec 2018 15:46:54 +0000 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/EntityFolder.java | 6 +++++- app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java index d2975d0adb..a7daafabda 100644 --- a/app/src/main/java/eu/faircode/email/EntityFolder.java +++ b/app/src/main/java/eu/faircode/email/EntityFolder.java @@ -165,10 +165,14 @@ public class EntityFolder implements Serializable { static int getLevel(Character separator, String name) { int level = 0; - if (separator != null) + if (separator != null) { for (int i = 0; i < name.length(); i++) if (name.charAt(i) == separator) level++; + if (name.startsWith("INBOX" + separator)) + level--; + } + return level; } diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index c349440f06..ff70d329bb 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1952,8 +1952,6 @@ public class ServiceSynchronize extends LifecycleService { if (selectable) { int level = EntityFolder.getLevel(separator, fullName); - if (fullName.startsWith("INBOX" + separator)) - level--; EntityFolder folder = db.folder().getFolderByName(account.id, fullName); if (folder == null) {