aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
diff options
context:
space:
mode:
authorTim Bray <timbray@gmail.com>2014-09-21 10:24:48 -0700
committerTim Bray <timbray@gmail.com>2014-09-21 10:24:48 -0700
commitedf87d09cbbe631d09b264c8f1328c755aeb31c8 (patch)
treea0a9caac11b574c8818280b77eee53925927743a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
parentd4387c01795a0fc62319cd715c72699c10d4a7cb (diff)
downloadopen-keychain-edf87d09cbbe631d09b264c8f1328c755aeb31c8.tar.gz
open-keychain-edf87d09cbbe631d09b264c8f1328c755aeb31c8.tar.bz2
open-keychain-edf87d09cbbe631d09b264c8f1328c755aeb31c8.zip
Handle absence of personal information in Keybase search result
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java5
1 files changed, 4 insertions, 1 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 2c26ddcc6..2363a40b3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -82,7 +82,10 @@ public class KeybaseKeyserver extends Keyserver {
entry.setAlgorithm(KeyFormattingUtils.getAlgorithmInfo(algorithmId, bitStrength, null));
ArrayList<String> userIds = new ArrayList<String>();
- String name = fullName + " <keybase.io/" + username + ">";
+ String name = "<keybase.io/" + username + ">";
+ if (fullName != null) {
+ name = fullName + " " + name;
+ }
userIds.add(name);
List<String> proofLabels = match.getProofLabels();