diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-12 23:06:35 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
| commit | f8da3d784b5f314f8ab58deab7c0a496dc8b11f3 (patch) | |
| tree | 1ef65f4aeffb7b1f11c7c8823a336e3ce2b6a9ee /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java | |
| parent | ec8c57b7803cf2f4435778cc455d0acc30482c24 (diff) | |
| download | open-keychain-f8da3d784b5f314f8ab58deab7c0a496dc8b11f3.tar.gz open-keychain-f8da3d784b5f314f8ab58deab7c0a496dc8b11f3.tar.bz2 open-keychain-f8da3d784b5f314f8ab58deab7c0a496dc8b11f3.zip | |
added keyserver/proxy support to certify operation
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 | 4 |
1 files changed, 3 insertions, 1 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 ef08964a3..9092a7354 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java @@ -46,6 +46,7 @@ import org.sufficientlysecure.keychain.service.input.RequiredInputParcel; import org.sufficientlysecure.keychain.service.input.RequiredInputParcel.NfcSignOperationsBuilder; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.util.Log; +import org.sufficientlysecure.keychain.util.ParcelableProxy; import org.sufficientlysecure.keychain.util.Passphrase; import java.net.Proxy; @@ -213,7 +214,8 @@ public class CertifyOperation extends BaseOperation<CertifyActionsParcel> { SaveKeyringResult result = mProviderHelper.savePublicKeyRing(certifiedKey); if (exportOperation != null) { - ExportResult uploadResult = importExportOperation.uploadKeyRingToServer(keyServer, certifiedKey, proxy); + ExportResult uploadResult = importExportOperation.uploadKeyRingToServer(keyServer, certifiedKey, + parcelableProxy.getProxy()); log.add(uploadResult, 2); if (uploadResult.success()) { |