diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 19:43:46 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 19:43:46 +0200 |
commit | 45b450e78a4aab5bac6fa61c78388b64f75b3b69 (patch) | |
tree | 3b532382d28015224242f018550fbb8bb6736d44 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | 9b15482c4146e407c642822f2a65e41c28b3a730 (diff) | |
download | open-keychain-45b450e78a4aab5bac6fa61c78388b64f75b3b69.tar.gz open-keychain-45b450e78a4aab5bac6fa61c78388b64f75b3b69.tar.bz2 open-keychain-45b450e78a4aab5bac6fa61c78388b64f75b3b69.zip |
PgpDecryptVerify is now context-free
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, 10 insertions, 1 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 38664f996..d54bc7de6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -444,7 +444,16 @@ public class KeychainIntentService extends IntentService // verifyText and decrypt returning additional resultData values for the // verification of signatures - PgpDecryptVerify.Builder builder = new PgpDecryptVerify.Builder(this, inputData, outStream); + PgpDecryptVerify.Builder builder = new PgpDecryptVerify.Builder( + new ProviderHelper(this), + new PgpDecryptVerify.PassphraseCache() { + @Override + public String getCachedPassphrase(long masterKeyId) { + return PassphraseCacheService.getCachedPassphrase( + KeychainIntentService.this, masterKeyId); + } + }, + inputData, outStream); builder.progressDialogUpdater(this); builder.allowSymmetricDecryption(true) |