From 9e3f19e375094fac36e55937e9cd5e99ff0508ca Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 30 Aug 2019 07:54:43 +0200 Subject: [PATCH] Discard empty message without questions --- .../java/eu/faircode/email/FragmentCompose.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 534f573db9..0149572271 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -994,13 +994,17 @@ public class FragmentCompose extends FragmentBase { } private void onActionDiscard() { - Bundle args = new Bundle(); - args.putString("question", getString(R.string.title_ask_discard)); + if (isEmpty()) + onAction(R.id.action_delete); + else { + Bundle args = new Bundle(); + args.putString("question", getString(R.string.title_ask_discard)); - FragmentDialogAsk fragment = new FragmentDialogAsk(); - fragment.setArguments(args); - fragment.setTargetFragment(this, REQUEST_DISCARD); - fragment.show(getFragmentManager(), "compose:discard"); + FragmentDialogAsk fragment = new FragmentDialogAsk(); + fragment.setArguments(args); + fragment.setTargetFragment(this, REQUEST_DISCARD); + fragment.show(getFragmentManager(), "compose:discard"); + } } private void onActionSend() {