From 8dc9773c1e93cce968ad872bfdce9722657c935d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 27 May 2015 22:33:14 +0200
Subject: move synchronous encryption into activity, and preserve checkbox
 state

---
 OpenKeychain/src/main/res/menu/encrypt_activity.xml      | 9 +++++++++
 OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml | 5 -----
 OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml | 5 -----
 3 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/menu/encrypt_activity.xml

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

diff --git a/OpenKeychain/src/main/res/menu/encrypt_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_activity.xml
new file mode 100644
index 000000000..fdd19927e
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/encrypt_activity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/check_use_symmetric"
+        android:title="@string/label_symmetric"
+        android:checkable="true" />
+
+</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
index d6ed726fa..10928e4bb 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
@@ -14,11 +14,6 @@
         android:icon="@drawable/ic_action_encrypt_share_24dp"
         app:showAsAction="always" />
 
-    <item
-        android:id="@+id/check_use_symmetric"
-        android:title="@string/label_symmetric"
-        android:checkable="true" />
-
     <item
         android:id="@+id/check_delete_after_encrypt"
         android:title="@string/label_delete_after_encryption"
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
index 5a262fdd8..e49898093 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
@@ -14,11 +14,6 @@
         android:icon="@drawable/ic_action_encrypt_share_24dp"
         app:showAsAction="always" />
 
-    <item
-        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