diff options
| author | Thialfihar <thi@thialfihar.org> | 2014-04-29 19:01:11 +0200 | 
|---|---|---|
| committer | Thialfihar <thi@thialfihar.org> | 2014-04-29 19:01:11 +0200 | 
| commit | 1f7c61a33140ac2319766d5f193beddaa789b7d3 (patch) | |
| tree | f88f7dcc3291aa0a1ccd147e3a4229897ef048c5 /OpenKeychain/src/main/java/org | |
| parent | 324971e4484b2d227e261993977837ef63a87dc3 (diff) | |
| download | open-keychain-1f7c61a33140ac2319766d5f193beddaa789b7d3.tar.gz open-keychain-1f7c61a33140ac2319766d5f193beddaa789b7d3.tar.bz2 open-keychain-1f7c61a33140ac2319766d5f193beddaa789b7d3.zip | |
Rename setter methods for PgpDecryptVerify.Builder
Diffstat (limited to 'OpenKeychain/src/main/java/org')
3 files changed, 13 insertions, 13 deletions
| diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index 71900d002..506c161ba 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -118,18 +118,18 @@ public class PgpDecryptVerify {              this.mOutStream = outStream;          } -        public Builder progressable(Progressable progressable) { -            this.mProgressable = progressable; +        public Builder setProgressable(Progressable progressable) { +            mProgressable = progressable;              return this;          } -        public Builder allowSymmetricDecryption(boolean allowSymmetricDecryption) { -            this.mAllowSymmetricDecryption = allowSymmetricDecryption; +        public Builder setAllowSymmetricDecryption(boolean allowSymmetricDecryption) { +            mAllowSymmetricDecryption = allowSymmetricDecryption;              return this;          } -        public Builder passphrase(String passphrase) { -            this.mPassphrase = passphrase; +        public Builder setPassphrase(String passphrase) { +            mPassphrase = passphrase;              return this;          } @@ -140,7 +140,7 @@ public class PgpDecryptVerify {           * @param allowedKeyIds           * @return           */ -        public Builder allowedKeyIds(Set<Long> allowedKeyIds) { +        public Builder setAllowedKeyIds(Set<Long> allowedKeyIds) {              this.mAllowedKeyIds = allowedKeyIds;              return this;          } 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 6adabf18a..1e0cfaa8e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -337,10 +337,10 @@ public class OpenPgpService extends RemoteService {                          },                          inputData, os                  ); -                builder.allowSymmetricDecryption(false) // no support for symmetric encryption -                        .allowedKeyIds(allowedKeyIds) // allow only private keys associated with +                builder.setAllowSymmetricDecryption(false) // no support for symmetric encryption +                        .setAllowedKeyIds(allowedKeyIds) // allow only private keys associated with                                  // accounts of this app -                        .passphrase(passphrase); +                        .setPassphrase(passphrase);                  PgpDecryptVerifyResult decryptVerifyResult;                  try { 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 a3187bbe6..5615b59c4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -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(); | 
