diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-01 16:08:40 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-01 16:08:40 +0200 |
commit | ebb7f559216fd2f4d82f824e4fa7ceddbfa7cd1c (patch) | |
tree | 5e90d6b9f1f816c44a3959bbed121bea49fb896a /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |
parent | fadc08480fdad9bfa672ef4821af4d0c82ef076b (diff) | |
download | open-keychain-ebb7f559216fd2f4d82f824e4fa7ceddbfa7cd1c.tar.gz open-keychain-ebb7f559216fd2f4d82f824e4fa7ceddbfa7cd1c.tar.bz2 open-keychain-ebb7f559216fd2f4d82f824e4fa7ceddbfa7cd1c.zip |
Fix symmetric decryption
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 2ad7e348b..2060c6f61 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -98,7 +98,6 @@ public class KeychainIntentService extends IntentService // decrypt/verify public static final String DECRYPT_CIPHERTEXT_BYTES = "ciphertext_bytes"; - public static final String DECRYPT_ASSUME_SYMMETRIC = "assume_symmetric"; public static final String DECRYPT_PASSPHRASE = "passphrase"; // save keyring @@ -344,7 +343,6 @@ public class KeychainIntentService extends IntentService int target = data.getInt(TARGET); byte[] bytes = data.getByteArray(DECRYPT_CIPHERTEXT_BYTES); - boolean assumeSymmetricEncryption = data.getBoolean(DECRYPT_ASSUME_SYMMETRIC); String passphrase = data.getString(DECRYPT_PASSPHRASE); InputStream inStream; @@ -424,7 +422,7 @@ public class KeychainIntentService extends IntentService PgpDecryptVerify.Builder builder = new PgpDecryptVerify.Builder(this, inputData, outStream); builder.progressDialogUpdater(this); - builder.assumeSymmetric(assumeSymmetricEncryption) + builder.allowSymmetricDecryption(true) .passphrase(passphrase); PgpDecryptVerifyResult decryptVerifyResult = builder.build().execute(); |