moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-24 01:32:16 -05:00
Code Issues Releases Wiki Activity

List full keybase id or strong key id matches on top

Browse Source
This commit is contained in:
Thialfihar 2014-05-14 14:08:33 +02:00
parent f4a8e71c33
commit d50e798c13
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java
View File

@ -55,10 +55,19 @@ public class KeybaseKeyServer extends KeyServer {
// only list them if they have a key // only list them if they have a key
if (JWalk.optObject(match, "components", "key_fingerprint") != null) { if (JWalk.optObject(match, "components", "key_fingerprint") != null) {
results.add(makeEntry(match)); String keybaseId = JWalk.getString(match, "components", "username", "val");
String fingerprint = JWalk.getString(match, "components", "key_fingerprint", "val");
fingerprint = fingerprint.replace(" ", "").toUpperCase();
if (keybaseId.equals(query) || fingerprint.startsWith(query.toUpperCase())) {
results.add(makeEntry(match));
} else {
results.add(makeEntry(match));
}
} }
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(Constants.TAG, "keybase result parsing error", e);
throw new QueryException("Unexpected structure in keybase search result: " + e.getMessage()); throw new QueryException("Unexpected structure in keybase search result: " + e.getMessage());
} }