From a5271bf2297fc49474b5f1ab2755fb073cb7f3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 16 Mar 2015 17:00:53 +0100
Subject: Allow encrypt of filenames via overflow menu

---
 .../src/main/res/menu/encrypt_file_activity.xml        | 18 ++++++++++++++----
 .../src/main/res/menu/encrypt_text_activity.xml        |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/res/menu')

diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
index f4aeb76c9..1dd9896bc 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
@@ -18,17 +18,27 @@
         android:id="@+id/check_use_symmetric"
         android:title="@string/label_symmetric"
         android:checkable="true" />
-    <item
-        android:id="@+id/check_use_armor"
-        android:title="@string/label_file_ascii_armor"
-        android:checkable="true" />
+
     <item
         android:id="@+id/check_delete_after_encrypt"
         android:title="@string/label_delete_after_encryption"
         android:checkable="true" />
+
     <item
         android:id="@+id/check_enable_compression"
         android:title="@string/label_enable_compression"
         android:checked="true"
         android:checkable="true" />
+
+    <item
+        android:id="@+id/encrypt_filenames"
+        android:title="@string/label_encrypt_filenames"
+        android:checked="true"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_use_armor"
+        android:title="@string/label_file_ascii_armor"
+        android:checkable="true" />
+    
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
index bb9f4058a..408b70822 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
@@ -18,6 +18,7 @@
         android:id="@+id/check_use_symmetric"
         android:title="@string/label_symmetric"
         android:checkable="true" />
+
     <item
         android:id="@+id/check_enable_compression"
         android:title="@string/label_enable_compression"
-- 
cgit v1.2.3


From fd8f5ebb2fb9c3ee1e66432b9537b2cb421269de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 16 Mar 2015 18:20:44 +0100
Subject: Allow for hidden recipients in encrypt methods

---
 OpenKeychain/src/main/res/menu/encrypt_file_activity.xml | 10 ++++++++--
 OpenKeychain/src/main/res/menu/encrypt_text_activity.xml |  7 +++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/menu')

diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
index 1dd9896bc..2c5e9d738 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
@@ -31,7 +31,7 @@
         android:checkable="true" />
 
     <item
-        android:id="@+id/encrypt_filenames"
+        android:id="@+id/check_encrypt_filenames"
         android:title="@string/label_encrypt_filenames"
         android:checked="true"
         android:checkable="true" />
@@ -40,5 +40,11 @@
         android:id="@+id/check_use_armor"
         android:title="@string/label_file_ascii_armor"
         android:checkable="true" />
-    
+
+    <item
+        android:id="@+id/check_hidden_recipients"
+        android:title="@string/label_hidden_recipients"
+        android:checked="false"
+        android:checkable="true" />
+
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
index 408b70822..33862b730 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
@@ -24,4 +24,11 @@
         android:title="@string/label_enable_compression"
         android:checked="true"
         android:checkable="true" />
+
+    <item
+        android:id="@+id/check_hidden_recipients"
+        android:title="@string/label_hidden_recipients"
+        android:checked="false"
+        android:checkable="true" />
+
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 025eaf075708c939497c2e6ad85b368efeee4a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 16 Mar 2015 20:34:27 +0100
Subject: Disable hidden recipients for now

---
 OpenKeychain/src/main/res/menu/encrypt_file_activity.xml | 10 +++++-----
 OpenKeychain/src/main/res/menu/encrypt_text_activity.xml | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenKeychain/src/main/res/menu')

diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
index 2c5e9d738..d6ed726fa 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
@@ -41,10 +41,10 @@
         android:title="@string/label_file_ascii_armor"
         android:checkable="true" />
 
-    <item
-        android:id="@+id/check_hidden_recipients"
-        android:title="@string/label_hidden_recipients"
-        android:checked="false"
-        android:checkable="true" />
+    <!--<item-->
+        <!--android:id="@+id/check_hidden_recipients"-->
+        <!--android:title="@string/label_hidden_recipients"-->
+        <!--android:checked="false"-->
+        <!--android:checkable="true" />-->
 
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
index 33862b730..5a262fdd8 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
@@ -25,10 +25,10 @@
         android:checked="true"
         android:checkable="true" />
 
-    <item
-        android:id="@+id/check_hidden_recipients"
-        android:title="@string/label_hidden_recipients"
-        android:checked="false"
-        android:checkable="true" />
+    <!--<item-->
+        <!--android:id="@+id/check_hidden_recipients"-->
+        <!--android:title="@string/label_hidden_recipients"-->
+        <!--android:checked="false"-->
+        <!--android:checkable="true" />-->
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 98817d13ee2e33b92f3a339df312709be027e964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 19 Mar 2015 17:16:23 +0100
Subject: Manage my keys wizard

---
 OpenKeychain/src/main/res/menu/key_list.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/menu')

diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 386a9d46e..15e098138 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -16,7 +16,7 @@
 
     <item
         android:id="@+id/menu_key_list_create"
-        android:title="@string/menu_create_key"
+        android:title="@string/menu_manage_keys"
         app:showAsAction="never" />
 
     <item
-- 
cgit v1.2.3