From 43ee22046d930dd8ce300e0c6b47c810480d2c1f Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 3 Oct 2019 10:03:01 +0200 Subject: [PATCH] Fixed creating missing parent folders --- app/src/main/java/eu/faircode/email/Core.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 682334daaa..ec2fdd9a38 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -1305,23 +1305,31 @@ class Core { } } - Log.i("Updating folder parents=" + parentFolders.size()); + Log.i("Creating folders parents=" + parentFolders.size()); for (String parentName : parentFolders.keySet()) { EntityFolder parent = nameFolder.get(parentName); if (parent == null && parentName != null) { - parent = new EntityFolder(); - parent.account = account.id; - parent.name = parentName; - parent.type = EntityFolder.SYSTEM; - parent.synchronize = false; - parent.subscribed = false; - parent.poll = false; - parent.sync_days = 0; - parent.keep_days = 0; - parent.selectable = false; - parent.id = db.folder().insertFolder(parent); + parent = db.folder().getFolderByName(account.id, parentName); + if (parent == null) { + parent = new EntityFolder(); + parent.account = account.id; + parent.name = parentName; + parent.type = EntityFolder.SYSTEM; + parent.synchronize = false; + parent.subscribed = false; + parent.poll = false; + parent.sync_days = 0; + parent.keep_days = 0; + parent.selectable = false; + parent.id = db.folder().insertFolder(parent); + } nameFolder.put(parentName, parent); } + } + + Log.i("Updating folders parents=" + parentFolders.size()); + for (String parentName : parentFolders.keySet()) { + EntityFolder parent = nameFolder.get(parentName); for (EntityFolder child : parentFolders.get(parentName)) db.folder().setFolderParent(child.id, parent == null ? null : parent.id); }