diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 18:21:49 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 18:22:04 +0100 |
| commit | e45636c07a5bb17f8327e20ee8feac9904bebba8 (patch) | |
| tree | 0f9ec9ca8916c07bae2c5f7dc422ba08f9636f77 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport | |
| parent | 55e22e68b45657d97128f99f0f13bc8a16a9d61a (diff) | |
| download | open-keychain-e45636c07a5bb17f8327e20ee8feac9904bebba8.tar.gz open-keychain-e45636c07a5bb17f8327e20ee8feac9904bebba8.tar.bz2 open-keychain-e45636c07a5bb17f8327e20ee8feac9904bebba8.zip | |
import: make operation cancelable (again), make "update all" cancelable
(also, use unbounded blocking queue to fix update of more than 10 keys)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java | 1 |
1 files changed, 0 insertions, 1 deletions
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 { |