aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
diff options
context:
space:
mode:
authorTim Bray <timbray@gmail.com>2014-04-28 10:47:39 -0700
committerTim Bray <timbray@gmail.com>2014-04-29 15:04:05 -0700
commitea1032dbfdbb42f39ef37af510e38b64f9854d5a (patch)
treeb9530ba6d5fc2a799bcd4efd54f6f67ea822e17b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
parente663dadc32633dc12f846539196276265ccc3534 (diff)
downloadopen-keychain-ea1032dbfdbb42f39ef37af510e38b64f9854d5a.tar.gz
open-keychain-ea1032dbfdbb42f39ef37af510e38b64f9854d5a.tar.bz2
open-keychain-ea1032dbfdbb42f39ef37af510e38b64f9854d5a.zip
Clean up debug crud
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java
index 4b802c0e1..c5f97f0dd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java
@@ -111,8 +111,8 @@ public class KeybaseKeyServer extends KeyServer {
mKeyCache.put(keybaseID, JWalk.getString(match,"them", "public_keys", "primary", "bundle"));
String name = JWalk.getString(match, "them", "profile", "full_name");
ArrayList<String> userIds = new ArrayList<String>();
+ name = "keybase.io/" + keybaseID + " " + name;
userIds.add(name);
- userIds.add("keybase.io/" + keybaseID); // TODO: Maybe should be keybaseID@keybase.io ?
entry.setUserIds(userIds);
entry.setPrimaryUserId(name);
return entry;