aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-21 02:31:30 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-21 02:31:30 +0100
commitaaddd26b51a9d3a8e230a704cb33de8e9a5bcbef (patch)
tree257cdf197b20a450a3561c9e5e3cd83000792aa6 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
parentb4f977673f32278e6a5c2ef5abd071e2d934adaf (diff)
downloadopen-keychain-aaddd26b51a9d3a8e230a704cb33de8e9a5bcbef.tar.gz
open-keychain-aaddd26b51a9d3a8e230a704cb33de8e9a5bcbef.tar.bz2
open-keychain-aaddd26b51a9d3a8e230a704cb33de8e9a5bcbef.zip
verification of cleartext signatures works
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index 1f3280af3..7df416417 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -83,6 +83,9 @@ public class DecryptActivity extends DrawerActivity {
private long mSignatureKeyId = 0;
private boolean mReturnResult = false;
+
+ // TODO: replace signed only checks with something more intelligent
+ // PgpOperationIncoming should handle all automatically!!!
private boolean mSignedOnly = false;
private boolean mAssumeSymmetricEncryption = false;
@@ -456,7 +459,7 @@ public class DecryptActivity extends DrawerActivity {
} else {
if (mDecryptTarget == Id.target.file) {
askForOutputFilename();
- } else {
+ } else { // mDecryptTarget == Id.target.message
decryptStart();
}
}
@@ -633,7 +636,6 @@ public class DecryptActivity extends DrawerActivity {
data.putLong(KeychainIntentService.ENCRYPT_SECRET_KEY_ID, mSecretKeyId);
- data.putBoolean(KeychainIntentService.DECRYPT_SIGNED_ONLY, mSignedOnly);
data.putBoolean(KeychainIntentService.DECRYPT_RETURN_BYTES, mReturnBinary);
data.putBoolean(KeychainIntentService.DECRYPT_ASSUME_SYMMETRIC, mAssumeSymmetricEncryption);