diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-10 02:31:17 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-13 23:34:06 +0530 |
| commit | cdd9de99bf4b1c9d7a808faed7795fc2a14e7809 (patch) | |
| tree | 2d03aaca6bc14181b1c0bd2f30e32f4a9557d74f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java | |
| parent | faa66d6140e7f68d920e612c21fa01139b12170e (diff) | |
| download | open-keychain-cdd9de99bf4b1c9d7a808faed7795fc2a14e7809.tar.gz open-keychain-cdd9de99bf4b1c9d7a808faed7795fc2a14e7809.tar.bz2 open-keychain-cdd9de99bf4b1c9d7a808faed7795fc2a14e7809.zip | |
allowed operations to modify CryptoInputParcel they receive
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java index d0377cc24..eeed24db0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java @@ -103,7 +103,10 @@ public class CertifyOperation extends BaseOperation<CertifyActionsParcel> { if (passphrase == null) { return new CertifyResult(log, RequiredInputParcel.createRequiredSignPassphrase( - certificationKey.getKeyId(), certificationKey.getKeyId(), null) + certificationKey.getKeyId(), + certificationKey.getKeyId(), + null), + cryptoInput ); } break; @@ -189,7 +192,7 @@ public class CertifyOperation extends BaseOperation<CertifyActionsParcel> { if (!allRequiredInput.isEmpty()) { log.add(LogType.MSG_CRT_NFC_RETURN, 1); - return new CertifyResult(log, allRequiredInput.build()); + return new CertifyResult(log, allRequiredInput.build(), cryptoInput); } log.add(LogType.MSG_CRT_SAVING, 1); @@ -211,7 +214,7 @@ public class CertifyOperation extends BaseOperation<CertifyActionsParcel> { // explicit proxy not set if (!OrbotHelper.isOrbotInRequiredState(mContext)) { return new CertifyResult(null, - RequiredInputParcel.createOrbotRequiredOperation()); + RequiredInputParcel.createOrbotRequiredOperation(), cryptoInput); } proxy = Preferences.getPreferences(mContext).getProxyPrefs() .parcelableProxy.getProxy(); |