aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-26 18:10:24 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-26 18:10:30 +0200
commitdc9e068790ead0399e8515e1fc72c99e90b8cd70 (patch)
tree9405e75f32f10c1d9049564b96589a9bce2114d0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
parent676a863b1415c09352f9c57a214ec1e3341a5a61 (diff)
downloadopen-keychain-dc9e068790ead0399e8515e1fc72c99e90b8cd70.tar.gz
open-keychain-dc9e068790ead0399e8515e1fc72c99e90b8cd70.tar.bz2
open-keychain-dc9e068790ead0399e8515e1fc72c99e90b8cd70.zip
upload: identify key by masterKeyId only
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
index ae7503a2e..ec4602703 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
@@ -86,7 +86,7 @@ public class UploadOperation extends BaseOperation<UploadKeyringParcel> {
HkpKeyserver hkpKeyserver = new HkpKeyserver(exportInput.mKeyserver);
try {
CanonicalizedPublicKeyRing keyring = mProviderHelper.getCanonicalizedPublicKeyRing(
- exportInput.mCanonicalizedPublicKeyringUri);
+ exportInput.mMasterKeyId);
return uploadKeyRingToServer(hkpKeyserver, keyring.getUncachedKeyRing(), proxy);
} catch (ProviderHelper.NotFoundException e) {
Log.e(Constants.TAG, "error uploading key", e);