diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-30 13:52:56 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-30 13:52:56 +0200 |
| commit | ef209450c67f6d47756ffd900fcb8ab4083482f4 (patch) | |
| tree | f7b4e1914058a75884e68cf34e640954e50dc97d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | 99fe806ea35a037dcd352db86d46eb501a850f47 (diff) | |
| download | open-keychain-ef209450c67f6d47756ffd900fcb8ab4083482f4.tar.gz open-keychain-ef209450c67f6d47756ffd900fcb8ab4083482f4.tar.bz2 open-keychain-ef209450c67f6d47756ffd900fcb8ab4083482f4.zip | |
some decrypt/verify bug fixes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 05336cc31..5f9c98ac5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -250,11 +250,14 @@ public class KeychainIntentService extends IntentService implements Progressable CryptoInputParcel cryptoInput = data.getParcelable(EXTRA_CRYPTO_INPUT); PgpDecryptVerifyInputParcel input = data.getParcelable(DECRYPT_VERIFY_PARCEL); - // verifyText and decrypt returning additional resultData values for the - // verification of signatures + // this action is here for compatibility only + input.setDecryptMetadataOnly(true); + + /* Operation */ PgpDecryptVerify op = new PgpDecryptVerify(this, new ProviderHelper(this), this); DecryptVerifyResult decryptVerifyResult = op.execute(input, cryptoInput); + /* Result */ sendMessageToHandler(MessageStatus.OKAY, decryptVerifyResult); break; @@ -355,6 +358,10 @@ public class KeychainIntentService extends IntentService implements Progressable CryptoInputParcel cryptoInput = data.getParcelable(EXTRA_CRYPTO_INPUT); PgpDecryptVerifyInputParcel input = data.getParcelable(DECRYPT_VERIFY_PARCEL); + // for compatibility + // TODO merge with ACTION_DECRYPT_METADATA + input.setDecryptMetadataOnly(false); + /* Operation */ PgpDecryptVerify op = new PgpDecryptVerify(this, new ProviderHelper(this), this); DecryptVerifyResult decryptVerifyResult = op.execute(input, cryptoInput); |