From dc9e068790ead0399e8515e1fc72c99e90b8cd70 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 26 Sep 2015 18:10:24 +0200
Subject: upload: identify key by masterKeyId only

---
 .../org/sufficientlysecure/keychain/operations/UploadOperation.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java')

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);
-- 
cgit v1.2.3