diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-18 23:19:22 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-18 23:19:22 +0200 |
commit | 6e9acafc6db5652e1d0c595967809934e912ccd7 (patch) | |
tree | 96bf7a7bf4822dac3c4c7800aa6b1d08f1912168 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java | |
parent | 19072824bada5ae2fcac6e4e991bf300f270b081 (diff) | |
parent | 1386282840128529f54572b6dee216cf5c5cf044 (diff) | |
download | open-keychain-6e9acafc6db5652e1d0c595967809934e912ccd7.tar.gz open-keychain-6e9acafc6db5652e1d0c595967809934e912ccd7.tar.bz2 open-keychain-6e9acafc6db5652e1d0c595967809934e912ccd7.zip |
Merge highlight keyserver pull request
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 | 5 |
1 files changed, 3 insertions, 2 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 3094b065e..5b66b50c5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java @@ -31,6 +31,7 @@ import java.net.URLEncoder; import java.util.ArrayList; public class KeybaseKeyserver extends Keyserver { + private String mQuery; @Override public ArrayList<ImportKeysListEntry> search(String query) throws QueryException, TooManyResponses, @@ -83,15 +84,15 @@ public class KeybaseKeyserver extends Keyserver { } private ImportKeysListEntry makeEntry(JSONObject match) throws QueryException, JSONException { - final ImportKeysListEntry entry = new ImportKeysListEntry(); + entry.setQuery(mQuery); + String keybaseId = JWalk.getString(match, "components", "username", "val"); String fullName = JWalk.getString(match, "components", "full_name", "val"); String fingerprint = JWalk.getString(match, "components", "key_fingerprint", "val"); fingerprint = fingerprint.replace(" ", "").toUpperCase(); // not strictly necessary but doesn't hurt entry.setFingerprintHex(fingerprint); - // in anticipation of a full fingerprint, only use the last 16 chars as 64-bit key id entry.setKeyIdHex("0x" + fingerprint.substring(Math.max(0, fingerprint.length() - 16))); // store extra info, so we can query for the keybase id directly entry.setExtraData(keybaseId); |