diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 21:48:13 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 21:48:13 +0200 |
| commit | 1dd68c71204d73265cf86a9739fa9bdd435fb64d (patch) | |
| tree | 9f1757a97a234e0e0d2c3d011789656bd3e0ee3f /OpenKeychain | |
| parent | bf0104af2e25ddfe747a960a626e38ae8d203593 (diff) | |
| parent | edf87d09cbbe631d09b264c8f1328c755aeb31c8 (diff) | |
| download | open-keychain-1dd68c71204d73265cf86a9739fa9bdd435fb64d.tar.gz open-keychain-1dd68c71204d73265cf86a9739fa9bdd435fb64d.tar.bz2 open-keychain-1dd68c71204d73265cf86a9739fa9bdd435fb64d.zip | |
Merge pull request #871 from timbray/master
Handle absence of personal information in Keybase search result
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java | 5 |
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(); |