From e45f000cb458e8608ad851ce7ecca0045e5ac6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 5 Mar 2015 16:57:57 +0100
Subject: Remove advanced preferences, move compression as menu item in encrypt
 activites, select hash and encryption algo based on hardcoded preferred lists

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

(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 fd0a85d6c..9a26d1757 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
@@ -12,4 +12,9 @@
         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" />
 </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 8deb59514..71d254bb9 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
@@ -4,4 +4,9 @@
         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"
+        android:checked="true"
+        android:checkable="true" />
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3