diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-29 19:51:21 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-29 19:51:21 +0200 |
commit | e0a0bf04ee6fa4794a82b44dae905bc814d85491 (patch) | |
tree | 60d2d7c10368e094e5940fcd299bb4ffee60c3aa /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |
parent | 5c145cf44decbdb686673a49e28310b6811931f2 (diff) | |
parent | 1f7c61a33140ac2319766d5f193beddaa789b7d3 (diff) | |
download | open-keychain-e0a0bf04ee6fa4794a82b44dae905bc814d85491.tar.gz open-keychain-e0a0bf04ee6fa4794a82b44dae905bc814d85491.tar.bz2 open-keychain-e0a0bf04ee6fa4794a82b44dae905bc814d85491.zip |
Merge pull request #601 from thi/rename-builder-methods
Rename builder methods
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 28 |
1 files changed, 14 insertions, 14 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 7b12f525c..5615b59c4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -313,24 +313,24 @@ public class KeychainIntentService extends IntentService new ProviderHelper(this), PgpHelper.getFullVersion(this), inputData, outStream); - builder.progressable(this); + builder.setProgressable(this); - builder.enableAsciiArmorOutput(useAsciiArmor) - .compressionId(compressionId) - .symmetricEncryptionAlgorithm( + builder.setEnableAsciiArmorOutput(useAsciiArmor) + .setCompressionId(compressionId) + .setSymmetricEncryptionAlgorithm( Preferences.getPreferences(this).getDefaultEncryptionAlgorithm()) - .signatureForceV3(Preferences.getPreferences(this).getForceV3Signatures()) - .encryptionMasterKeyIds(encryptionKeyIds) - .symmetricPassphrase(symmetricPassphrase) - .signatureMasterKeyId(signatureKeyId) - .signatureHashAlgorithm( + .setSignatureForceV3(Preferences.getPreferences(this).getForceV3Signatures()) + .setEncryptionMasterKeyIds(encryptionKeyIds) + .setSymmetricPassphrase(symmetricPassphrase) + .setSignatureMasterKeyId(signatureKeyId) + .setSignatureHashAlgorithm( Preferences.getPreferences(this).getDefaultHashAlgorithm()) - .signaturePassphrase( + .setSignaturePassphrase( PassphraseCacheService.getCachedPassphrase(this, signatureKeyId)); // this assumes that the bytes are cleartext (valid for current implementation!) if (target == TARGET_BYTES) { - builder.cleartextInput(true); + builder.setCleartextInput(true); } builder.build().execute(); @@ -457,10 +457,10 @@ public class KeychainIntentService extends IntentService } }, inputData, outStream); - builder.progressable(this); + builder.setProgressable(this); - builder.allowSymmetricDecryption(true) - .passphrase(passphrase); + builder.setAllowSymmetricDecryption(true) + .setPassphrase(passphrase); PgpDecryptVerifyResult decryptVerifyResult = builder.build().execute(); |