cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename setter methods for PgpSignEncrypt.Builder

Browse Source
This commit is contained in:
Thialfihar
2014-04-29 18:57:43 +02:00
parent 9e6bf2abbb
commit 324971e448
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@@ -170,14 +170,14 @@ public class OpenPgpService extends RemoteService {
new ProviderHelper(getContext()),
PgpHelper.getFullVersion(getContext()),
inputData, os);
builder.enableAsciiArmorOutput(asciiArmor)
.signatureHashAlgorithm(accSettings.getHashAlgorithm())
.signatureForceV3(false)
.signatureMasterKeyId(accSettings.getKeyId())
.signaturePassphrase(passphrase);
builder.setEnableAsciiArmorOutput(asciiArmor)
.setSignatureHashAlgorithm(accSettings.getHashAlgorithm())
.setSignatureForceV3(false)
.setSignatureMasterKeyId(accSettings.getKeyId())
.setSignaturePassphrase(passphrase);
// TODO: currently always assume cleartext input, no sign-only of binary currently!
builder.cleartextInput(true);
builder.setCleartextInput(true);
try {
builder.build().execute();
@@ -254,10 +254,10 @@ public class OpenPgpService extends RemoteService {
new ProviderHelper(getContext()),
PgpHelper.getFullVersion(getContext()),
inputData, os);
builder.enableAsciiArmorOutput(asciiArmor)
.compressionId(accSettings.getCompression())
.symmetricEncryptionAlgorithm(accSettings.getEncryptionAlgorithm())
.encryptionMasterKeyIds(keyIds);
builder.setEnableAsciiArmorOutput(asciiArmor)
.setCompressionId(accSettings.getCompression())
.setSymmetricEncryptionAlgorithm(accSettings.getEncryptionAlgorithm())
.setEncryptionMasterKeyIds(keyIds);
if (sign) {
String passphrase;
@@ -274,13 +274,13 @@ public class OpenPgpService extends RemoteService {
}
// sign and encrypt
builder.signatureHashAlgorithm(accSettings.getHashAlgorithm())
.signatureForceV3(false)
.signatureMasterKeyId(accSettings.getKeyId())
.signaturePassphrase(passphrase);
builder.setSignatureHashAlgorithm(accSettings.getHashAlgorithm())
.setSignatureForceV3(false)
.setSignatureMasterKeyId(accSettings.getKeyId())
.setSignaturePassphrase(passphrase);
} else {
// encrypt only
builder.signatureMasterKeyId(Constants.key.none);
builder.setSignatureMasterKeyId(Constants.key.none);
}
try {