From 52be6a33ae5e10429c4e8f46991c3198a00cc4b4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 18 Oct 2018 17:45:39 +0000
Subject: [PATCH] Discard drafts

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 4 ++--
 app/src/main/res/menu/action_compose.xml                 | 2 +-
 app/src/main/res/values/strings.xml                      | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a588cb94..e4bc2814 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -241,7 +241,7 @@ public class FragmentCompose extends FragmentEx {
                 int action = item.getItemId();
                 if (action == R.id.action_delete) {
                     new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
-                            .setMessage(R.string.title_ask_delete)
+                            .setMessage(R.string.title_ask_discard)
                             .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
@@ -629,7 +629,7 @@ public class FragmentCompose extends FragmentEx {
     private void handleExit() {
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
             new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
-                    .setMessage(R.string.title_ask_delete)
+                    .setMessage(R.string.title_ask_discard)
                     .setPositiveButton(R.string.title_yes, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/res/menu/action_compose.xml b/app/src/main/res/menu/action_compose.xml
index 99f0d217..8b15df4a 100644
--- a/app/src/main/res/menu/action_compose.xml
+++ b/app/src/main/res/menu/action_compose.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/baseline_delete_24"
-        android:title="@string/title_delete"
+        android:title="@string/title_discard"
         app:showAsAction="ifRoom" />
 
     <item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d93cbdc2..32136268 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -192,6 +192,7 @@
     <string name="title_attachment_saved">Attachment saved</string>
     <string name="title_attachment_unavailable">Some attachments are not downloaded and will not be forwarded, continue?</string>
     <string name="title_ask_delete">Delete message permanently?</string>
+    <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
 
     <string name="title_compose">Compose</string>
@@ -202,6 +203,7 @@
     <string name="title_bcc">BCC:</string>
     <string name="title_subject">Subject:</string>
     <string name="title_body_hint">Your message</string>
+    <string name="title_discard">Discard</string>
     <string name="title_save">Save</string>
     <string name="title_send">Send</string>
 
@@ -216,7 +218,7 @@
     <string name="title_from_missing">Sender missing</string>
     <string name="title_to_missing">Recipient missing</string>
     <string name="title_attachments_missing">Attachments still loading</string>
-    <string name="title_draft_deleted">Draft deleted</string>
+    <string name="title_draft_deleted">Draft discarded</string>
     <string name="title_draft_saved">Draft saved</string>
     <string name="title_queued">Sending message</string>