diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 19:14:39 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 19:14:39 +0200 |
commit | bd6aeea6db7d5af5b3751453db95b6c968d54100 (patch) | |
tree | 74bf627dc98ce8cdd34eae8857130fa7547b60c1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
parent | 5346d2e8786c176ff80a9be1651fe98b7e229ce5 (diff) | |
download | open-keychain-bd6aeea6db7d5af5b3751453db95b6c968d54100.tar.gz open-keychain-bd6aeea6db7d5af5b3751453db95b6c968d54100.tar.bz2 open-keychain-bd6aeea6db7d5af5b3751453db95b6c968d54100.zip |
PgpSignEncrypt is now context-free
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 48cc8502f..91df79104 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -33,6 +33,7 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyResult; +import org.sufficientlysecure.keychain.pgp.PgpHelper; import org.sufficientlysecure.keychain.pgp.PgpSignEncrypt; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; @@ -165,7 +166,10 @@ public class OpenPgpService extends RemoteService { InputData inputData = new InputData(is, inputLength); // sign-only - PgpSignEncrypt.Builder builder = new PgpSignEncrypt.Builder(getContext(), inputData, os); + PgpSignEncrypt.Builder builder = new PgpSignEncrypt.Builder( + new ProviderHelper(getContext()), + PgpHelper.getFullVersion(getContext()), + inputData, os); builder.enableAsciiArmorOutput(asciiArmor) .signatureHashAlgorithm(accSettings.getHashAlgorithm()) .signatureForceV3(false) @@ -231,7 +235,10 @@ public class OpenPgpService extends RemoteService { long inputLength = is.available(); InputData inputData = new InputData(is, inputLength); - PgpSignEncrypt.Builder builder = new PgpSignEncrypt.Builder(getContext(), inputData, os); + PgpSignEncrypt.Builder builder = new PgpSignEncrypt.Builder( + new ProviderHelper(getContext()), + PgpHelper.getFullVersion(getContext()), + inputData, os); builder.enableAsciiArmorOutput(asciiArmor) .compressionId(accSettings.getCompression()) .symmetricEncryptionAlgorithm(accSettings.getEncryptionAlgorithm()) |