diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-11 08:24:33 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
commit | ec8c57b7803cf2f4435778cc455d0acc30482c24 (patch) | |
tree | 8a8f945f389de68ba2964f630df58b948982c8e4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java | |
parent | 592b1285963a90e5b4e47022c5d7dc29c7b951d9 (diff) | |
download | open-keychain-ec8c57b7803cf2f4435778cc455d0acc30482c24.tar.gz open-keychain-ec8c57b7803cf2f4435778cc455d0acc30482c24.tar.bz2 open-keychain-ec8c57b7803cf2f4435778cc455d0acc30482c24.zip |
added proxy support to KeybaseLib
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java index 7bbe42993..c2865410e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java @@ -37,7 +37,6 @@ public class KeybaseKeyserver extends Keyserver { @Override public ArrayList<ImportKeysListEntry> search(String query, Proxy proxy) throws QueryFailedException, QueryNeedsRepairException { - // TODO: implement proxy ArrayList<ImportKeysListEntry> results = new ArrayList<>(); if (query.startsWith("0x")) { @@ -50,7 +49,7 @@ public class KeybaseKeyserver extends Keyserver { mQuery = query; try { - Iterable<Match> matches = Search.search(query); + Iterable<Match> matches = Search.search(query, proxy); for (Match match : matches) { results.add(makeEntry(match)); } @@ -101,9 +100,8 @@ public class KeybaseKeyserver extends Keyserver { @Override public String get(String id, Proxy proxy) throws QueryFailedException { - // TODO: implement proxy try { - return User.keyForUsername(id); + return User.keyForUsername(id, proxy); } catch (KeybaseException e) { throw new QueryFailedException(e.getMessage()); } |