From a11d791c935f7f7c036451f7af2f2760afa39344 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 15 May 2021 07:39:33 +0200 Subject: [PATCH] Disable double confirm for delete trash/junk --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index ccac67399f..edd1c37f12 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3359,7 +3359,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. Bundle aargs = new Bundle(); aargs.putString("question", getResources() .getQuantityString(R.plurals.title_deleting_messages, ids.size(), ids.size())); - aargs.putString("confirm", getString(R.string.title_no_undo)); + if (!EntityFolder.TRASH.equals(type) && !EntityFolder.JUNK.equals(type)) + aargs.putString("confirm", getString(R.string.title_no_undo)); aargs.putLongArray("ids", Helper.toLongArray(ids)); aargs.putBoolean("warning", true); @@ -3740,7 +3741,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. Bundle aargs = new Bundle(); aargs.putString("question", getResources() .getQuantityString(R.plurals.title_deleting_messages, ids.size(), ids.size())); - aargs.putString("confirm", getString(R.string.title_no_undo)); + if (!EntityFolder.TRASH.equals(type) && !EntityFolder.JUNK.equals(type)) + aargs.putString("confirm", getString(R.string.title_no_undo)); aargs.putLongArray("ids", Helper.toLongArray(ids)); aargs.putBoolean("warning", true);