aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-06 22:57:51 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-06 22:57:51 +0200
commita0f43febbbce9e486140aa89757aebd291781cf9 (patch)
treeadf22d655188a8c2f7dd5ac7ff25e98f074cfc4a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
parentd2430fe0e37f5996e3dbe758ea8c00ebde61445e (diff)
parent5601f1b76f42276950487d635c9ea87006f15621 (diff)
downloadopen-keychain-a0f43febbbce9e486140aa89757aebd291781cf9.tar.gz
open-keychain-a0f43febbbce9e486140aa89757aebd291781cf9.tar.bz2
open-keychain-a0f43febbbce9e486140aa89757aebd291781cf9.zip
Merge pull request #649 from mar-v-in/automatic-contact-discovery
Automatic contact discovery and more
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java2
1 files changed, 2 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 145738e66..43557279f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -31,6 +31,7 @@ import java.net.URLEncoder;
import java.util.ArrayList;
public class KeybaseKeyserver extends Keyserver {
+ public static final String ORIGIN = "keybase:keybase.io";
private String mQuery;
@Override
@@ -87,6 +88,7 @@ public class KeybaseKeyserver extends Keyserver {
final ImportKeysListEntry entry = new ImportKeysListEntry();
entry.setQuery(mQuery);
+ entry.setOrigin(ORIGIN);
String keybaseId = JWalk.getString(match, "components", "username", "val");
String fullName = JWalk.getString(match, "components", "full_name", "val");