From e45636c07a5bb17f8327e20ee8feac9904bebba8 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 29 Oct 2015 18:21:49 +0100 Subject: import: make operation cancelable (again), make "update all" cancelable (also, use unbounded blocking queue to fix update of more than 10 keys) --- .../java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java | 1 - 1 file changed, 1 deletion(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java index 6eab13126..c2190318b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java @@ -446,7 +446,6 @@ public class HkpKeyserver extends Keyserver { * Tries to find a server responsible for a given domain * * @return A responsible Keyserver or null if not found. - * TODO: Add proxy functionality */ public static HkpKeyserver resolve(String domain, Proxy proxy) { try { -- cgit v1.2.3