diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 15:43:16 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 15:43:16 +0100 |
commit | a665dd60fbf52eccb04980bb040569967a617ebe (patch) | |
tree | 4b64f7abff1a282aa393a1bfa16a7ff50f097e1c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java | |
parent | 64a09a89451b09aaa54090c2e6373814edb5d0eb (diff) | |
download | open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.tar.gz open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.tar.bz2 open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.zip |
use Proxy.NO_PROXY instead of null value for no proxy
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java index 4e68e76c5..4d2bc8593 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java @@ -24,6 +24,9 @@ import java.net.Proxy; import java.util.ArrayList; import java.util.Vector; +import android.support.annotation.NonNull; + + /** * Search two or more types of server for online keys. */ @@ -31,8 +34,8 @@ public class CloudSearch { private final static long SECONDS = 1000; - public static ArrayList<ImportKeysListEntry> search(final String query, Preferences.CloudSearchPrefs cloudPrefs, - final Proxy proxy) + public static ArrayList<ImportKeysListEntry> search( + @NonNull final String query, Preferences.CloudSearchPrefs cloudPrefs, @NonNull final Proxy proxy) throws Keyserver.CloudSearchFailureException { final ArrayList<Keyserver> servers = new ArrayList<>(); @@ -68,7 +71,7 @@ public class CloudSearch { // wait for either all the searches to come back, or 10 seconds. If using proxy, wait 30 seconds. synchronized (results) { try { - if (proxy != null) { + if (proxy == Proxy.NO_PROXY) { results.wait(30 * SECONDS); } else { results.wait(10 * SECONDS); |