From 85abbe82b65ba10d603e971e872673610c77ceef Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 21 Jun 2026 16:34:27 +0200 Subject: [PATCH] Prevent deletion of folder with operations pending --- app/src/main/java/eu/faircode/email/FragmentFolders.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index cecd53ecf7..03946d7b79 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -1148,6 +1148,10 @@ public class FragmentFolders extends FragmentBase { if (folder == null) return null; + int count = db.operation().getOperationCount(id, null); + if (count > 0) + throw new IllegalArgumentException("Operations pending"); + db.folder().setFolderTbd(folder.id); db.setTransactionSuccessful(); @@ -1162,7 +1166,7 @@ public class FragmentFolders extends FragmentBase { @Override protected void onException(Bundle args, Throwable ex) { - Log.unexpectedError(getParentFragmentManager(), ex); + Log.unexpectedError(getParentFragmentManager(), ex, !(ex instanceof IllegalArgumentException)); } }.execute(this, args, "folder:delete"); }