From e2471501c54ce50d87b49972903d3803fee50277 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 20 Sep 2023 21:17:43 +0200 Subject: [PATCH] Allow permanent deletion from notifications --- app/src/main/java/eu/faircode/email/Core.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 802b5e7d02..60373ab4ab 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -5773,6 +5773,8 @@ class Core { String sound = prefs.getString("sound", null); boolean alert_once = prefs.getBoolean("alert_once", true); boolean perform_expunge = prefs.getBoolean("perform_expunge", true); + boolean delete_confirmation = prefs.getBoolean("delete_confirmation", true); + // Get contact info Map messageFrom = new HashMap<>(); @@ -6089,7 +6091,8 @@ class Core { } if (notify_trash && - ((message.accountProtocol == EntityAccount.TYPE_POP && message.accountLeaveDeleted) || + (!delete_confirmation || + (message.accountProtocol == EntityAccount.TYPE_POP && message.accountLeaveDeleted) || (message.accountProtocol == EntityAccount.TYPE_IMAP && !perform_expunge))) { Intent delete = new Intent(context, ServiceUI.class) .setAction("delete:" + message.id)