From e31b3967f3078094aa9ffa66e9a9f7b01cd9847c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 28 Oct 2018 17:16:25 +0000
Subject: [PATCH] Moved encrypt to menu

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

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 969c8b0e..606b88e1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -423,6 +423,9 @@ public class FragmentCompose extends FragmentEx {
             case R.id.menu_addresses:
                 onMenuAddresses();
                 return true;
+            case R.id.menu_encrypt:
+                onAction(R.id.menu_encrypt);
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -1371,7 +1374,7 @@ public class FragmentCompose extends FragmentEx {
                             Toast.makeText(context, R.string.title_draft_deleted, Toast.LENGTH_LONG).show();
                         }
                     });
-                } else if (action == R.id.action_save || action == R.id.action_encrypt) {
+                } else if (action == R.id.action_save || action == R.id.menu_encrypt) {
                     db.message().updateMessage(draft);
                     draft.write(context, body);
 
@@ -1462,7 +1465,7 @@ public class FragmentCompose extends FragmentEx {
             } else if (action == R.id.action_save) {
                 // Do nothing
 
-            } else if (action == R.id.action_encrypt) {
+            } else if (action == R.id.menu_encrypt) {
                 onEncrypt();
 
             } else if (action == R.id.action_send) {
diff --git a/app/src/main/res/menu/action_compose.xml b/app/src/main/res/menu/action_compose.xml
index 236169d8..83ee9356 100644
--- a/app/src/main/res/menu/action_compose.xml
+++ b/app/src/main/res/menu/action_compose.xml
@@ -11,11 +11,6 @@
         android:icon="@drawable/baseline_save_alt_24"
         android:title="@string/title_save" />
 
-    <item
-        android:id="@+id/action_encrypt"
-        android:icon="@drawable/baseline_lock_24"
-        android:title="@string/title_encrypt" />
-
     <item
         android:id="@+id/action_send"
         android:icon="@drawable/baseline_send_24"
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index 560f217d..3320afe5 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -37,4 +37,10 @@
         android:icon="@drawable/baseline_people_24"
         android:title="@string/title_show_addresses"
         app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/menu_encrypt"
+        android:icon="@drawable/baseline_lock_24"
+        android:title="@string/title_encrypt"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 232e5cf2..f5eb58e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,7 +182,6 @@
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>
-    <string name="title_decrypt">Decrypt</string>
 
     <string name="title_trash">Trash</string>
     <string name="title_delete">Delete</string>
@@ -212,7 +211,6 @@
     <string name="title_body_hint">Your message</string>
     <string name="title_discard">Discard</string>
     <string name="title_save">Save</string>
-    <string name="title_encrypt">Encrypt</string>
     <string name="title_send">Send</string>
 
     <string name="title_clipboard_empty">Clipboard empty</string>
@@ -230,6 +228,8 @@
     <string name="title_draft_saved">Draft saved</string>
     <string name="title_queued">Sending message</string>
 
+    <string name="title_encrypt">Encrypt</string>
+    <string name="title_decrypt">Decrypt</string>
     <string name="title_no_openpgp">OpenKeychain not found</string>
 
     <string name="title_search">Search</string>