aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-05-27 22:33:14 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-28 16:33:44 +0200
commit40ab96539c7658b18a0c4d95786f28fda1f69516 (patch)
treeba829e043ae8693487f6ad2e61db7e0699ca0a84 /OpenKeychain/src
parent7c20c8df932e108c4156a316ddc68ff3610bba4e (diff)
downloadopen-keychain-40ab96539c7658b18a0c4d95786f28fda1f69516.tar.gz
open-keychain-40ab96539c7658b18a0c4d95786f28fda1f69516.tar.bz2
open-keychain-40ab96539c7658b18a0c4d95786f28fda1f69516.zip
move synchronous encryption into activity, and preserve checkbox state
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java30
-rw-r--r-- mUseArmor = item.isChecked();
break;
}
case R.id.check_delete_after_encrypt: {
+ item.setChecked(!item.isChecked());
mDeleteAfterEncrypt = item.isChecked();
break;
}
case R.id.check_enable_compression: {
+ item.setChecked(!item.isChecked());
mUseCompression = item.isChecked();
break;
}
case R.id.check_encrypt_filenames: {
+ item.setChecked(!item.isChecked());
mEncryptFilenames = item.isChecked();
break;
}
@@ -137,11 +137,6 @@ public class EncryptTextFragment extends CryptoOperationFragment {
item.setChecked(!item.isChecked());
}
switch (item.getItemId()) {
- case R.id.check_use_symmetric: {
- EncryptActivity modeInterface = (EncryptActivity) getActivity();
- modeInterface.toggleModeFragment();
- break;
- }
case R.id.check_enable_compression: {
mUseCompression = item.isChecked();
break;
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
@@ -15,11 +15,6 @@
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"
android:checkable="true" />
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
@@ -15,11 +15,6 @@
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"
android:checked="true"