diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 16:58:20 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 16:58:20 +0100 |
commit | ee79cc76d399ff499ee794ac694147341c8e5133 (patch) | |
tree | 9fb19b864666b1ab068dbccc0ecbff119a7a7e80 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations | |
parent | 1c83c33d35ae68a301c18d94c155d3bb7ddf3dd0 (diff) | |
download | open-keychain-ee79cc76d399ff499ee794ac694147341c8e5133.tar.gz open-keychain-ee79cc76d399ff499ee794ac694147341c8e5133.tar.bz2 open-keychain-ee79cc76d399ff499ee794ac694147341c8e5133.zip |
make use of proxies a Keyserver property
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java index 76223becc..a04200ba1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java @@ -188,7 +188,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> { // Make sure we have the keyserver instance cached if (keyServer == null) { log.add(LogType.MSG_IMPORT_KEYSERVER, 1, keyServerUri); - keyServer = new HkpKeyserver(keyServerUri); + keyServer = new HkpKeyserver(keyServerUri, proxy); } try { @@ -197,10 +197,10 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> { if (entry.mExpectedFingerprint != null) { log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER, 2, "0x" + entry.mExpectedFingerprint.substring(24)); - data = keyServer.get("0x" + entry.mExpectedFingerprint, proxy).getBytes(); + data = keyServer.get("0x" + entry.mExpectedFingerprint).getBytes(); } else { log.add(LogType.MSG_IMPORT_FETCH_KEYSERVER, 2, entry.mKeyIdHex); - data = keyServer.get(entry.mKeyIdHex, proxy).getBytes(); + data = keyServer.get(entry.mKeyIdHex).getBytes(); } key = UncachedKeyRing.decodeFromData(data); if (key != null) { @@ -218,12 +218,12 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> { if (entry.mKeybaseName != null) { // Make sure we have this cached if (keybaseServer == null) { - keybaseServer = new KeybaseKeyserver(); + keybaseServer = new KeybaseKeyserver(proxy); } try { log.add(LogType.MSG_IMPORT_FETCH_KEYBASE, 2, entry.mKeybaseName); - byte[] data = keybaseServer.get(entry.mKeybaseName, proxy).getBytes(); + byte[] data = keybaseServer.get(entry.mKeybaseName).getBytes(); UncachedKeyRing keybaseKey = UncachedKeyRing.decodeFromData(data); // If there already is a key, merge the two 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 836894f59..e5f11eaa6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java @@ -105,7 +105,7 @@ public class UploadOperation extends BaseOperation<UploadKeyringParcel> { HkpKeyserver hkpKeyserver; { - hkpKeyserver = new HkpKeyserver(uploadInput.mKeyserver); + hkpKeyserver = new HkpKeyserver(uploadInput.mKeyserver, proxy); log.add(LogType.MSG_UPLOAD_SERVER, 1, hkpKeyserver.toString()); } @@ -114,7 +114,7 @@ public class UploadOperation extends BaseOperation<UploadKeyringParcel> { return new UploadResult(UploadResult.RESULT_ERROR, log); } - return uploadKeyRingToServer(log, hkpKeyserver, keyring, proxy); + return uploadKeyRingToServer(log, hkpKeyserver, keyring); } @Nullable @@ -155,7 +155,7 @@ public class UploadOperation extends BaseOperation<UploadKeyringParcel> { @NonNull private UploadResult uploadKeyRingToServer( - OperationLog log, HkpKeyserver server, CanonicalizedPublicKeyRing keyring, Proxy proxy) { + OperationLog log, HkpKeyserver server, CanonicalizedPublicKeyRing keyring) { ByteArrayOutputStream bos = new ByteArrayOutputStream(); ArmoredOutputStream aos = null; @@ -166,7 +166,7 @@ public class UploadOperation extends BaseOperation<UploadKeyringParcel> { aos.close(); String armoredKey = bos.toString("UTF-8"); - server.add(armoredKey, proxy); + server.add(armoredKey); updateProgress(R.string.progress_uploading, 1, 1); |