From 35ed2e51873a9858cc8a8497da4d8362ec44c3f0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 25 May 2019 16:21:25 +0200
Subject: [PATCH] Fixed recreating folder

---
 app/src/main/java/eu/faircode/email/Core.java | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index f348c22322..b34845ed7d 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -772,22 +772,6 @@ class Core {
 
         Log.i("Start sync folders account=" + account.name);
 
-        // Get default folder
-        Folder defaultFolder = istore.getDefaultFolder();
-        char separator = defaultFolder.getSeparator();
-        EntityLog.log(context, account.name + " folder separator=" + separator);
-
-        // Get remote folders
-        Folder[] ifolders = (subscribed_only
-                ? defaultFolder.listSubscribed("*")
-                : defaultFolder.list("*"));
-        if (subscribed_only && ifolders.length == 0) {
-            Log.i("No subscribed folders");
-            ifolders = defaultFolder.list("*");
-        }
-
-        Log.i("Remote folder count=" + ifolders.length + " separator=" + separator);
-
         // Get folder names
         List<String> names = new ArrayList<>();
         for (EntityFolder folder : db.folder().getFolders(account.id))
@@ -808,6 +792,22 @@ class Core {
                 names.add(folder.name);
         Log.i("Local folder count=" + names.size());
 
+        // Get default folder
+        Folder defaultFolder = istore.getDefaultFolder();
+        char separator = defaultFolder.getSeparator();
+        EntityLog.log(context, account.name + " folder separator=" + separator);
+
+        // Get remote folders
+        Folder[] ifolders = (subscribed_only
+                ? defaultFolder.listSubscribed("*")
+                : defaultFolder.list("*"));
+        if (subscribed_only && ifolders.length == 0) {
+            Log.i("No subscribed folders");
+            ifolders = defaultFolder.list("*");
+        }
+
+        Log.i("Remote folder count=" + ifolders.length + " separator=" + separator);
+
         Map<String, EntityFolder> nameFolder = new HashMap<>();
         Map<String, List<EntityFolder>> parentFolders = new HashMap<>();
         for (Folder ifolder : ifolders) {