aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java17
1 files changed, 17 insertions, 0 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 57355d808..953cf3cbb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java
@@ -115,6 +115,23 @@ public class KeybaseKeyServer extends KeyServer {
ArrayList<String> userIds = new ArrayList<String>();
String name = fullName + " <keybase.io/" + keybaseId + ">";
userIds.add(name);
+ try {
+ userIds.add("github.com/" + JWalk.getString(match, "components", "github", "val"));
+ } catch (JSONException e) {
+ // ignore
+ }
+ try {
+ userIds.add("twitter.com/" + JWalk.getString(match, "components", "twitter", "val"));
+ } catch (JSONException e) {
+ // ignore
+ }
+ try {
+ JSONArray array = JWalk.getArray(match, "components", "websites");
+ JSONObject website = array.getJSONObject(0);
+ userIds.add(JWalk.getString(website, "val"));
+ } catch (JSONException e) {
+ // ignore
+ }
entry.setUserIds(userIds);
entry.setPrimaryUserId(name);
return entry;