From 147ee0800d31eddb80ef8b0b503f8c032d911599 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 11 Dec 2022 07:51:11 +0100 Subject: [PATCH] Check if folder exists on create folder --- .../faircode/email/FragmentDialogFolder.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java index 6803f20616..c1cba5feac 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java @@ -437,15 +437,18 @@ public class FragmentDialogFolder extends FragmentDialogBase { if (parent != null) name = parent.name + parent.separator + name; - EntityFolder folder = new EntityFolder(); - folder.tbc = true; - folder.account = account.id; - folder.name = name; - folder.type = EntityFolder.USER; - folder.parent = (parent == null ? null : parent.id); - folder.setProperties(); - folder.inheritFrom(parent); - folder.id = db.folder().insertFolder(folder); + EntityFolder folder = db.folder().getFolderByName(account.id, name); + if (folder == null) { + folder = new EntityFolder(); + folder.tbc = true; + folder.account = account.id; + folder.name = name; + folder.type = EntityFolder.USER; + folder.parent = (parent == null ? null : parent.id); + folder.setProperties(); + folder.inheritFrom(parent); + folder.id = db.folder().insertFolder(folder); + } args.putLong("folder", folder.id);