From c7bf26a8ecf73dffb13f370784f50f9f5b57ef81 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 22 Oct 2022 08:28:12 +0200
Subject: [PATCH] Quick delete instead of trash in trash/junk folder

---
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index f144ad3cec..231e9da20b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -6215,6 +6215,7 @@ public class FragmentMessages extends FragmentBase
                     boolean more_delete = prefs.getBoolean("more_delete", false);
                     boolean more_move = prefs.getBoolean("more_move", true);
 
+                    boolean inTrash = EntityFolder.TRASH.equals(type);
                     boolean inJunk = EntityFolder.JUNK.equals(type);
 
                     int count = 0;
@@ -6231,6 +6232,12 @@ public class FragmentMessages extends FragmentBase
                     if (trash)
                         count++;
 
+                    if (!delete && !trash && (inTrash || inJunk) &&
+                            more_trash && count < MAX_QUICK_ACTIONS && result.canDelete()) {
+                        delete = true;
+                        count++;
+                    }
+
                     boolean junk = (more_junk && count < MAX_QUICK_ACTIONS && result.canJunk());
                     if (junk)
                         count++;