aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-19 00:38:36 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-19 00:38:36 +0200
commit7fc188dbd60fde7c37a20b551d5f728019d0986c (patch)
treeb8555ccaeadb2e6e04910bc1a04ae07864d0c0a3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
parent0db425b28981209136f738c3ddaac3e549779a88 (diff)
downloadopen-keychain-7fc188dbd60fde7c37a20b551d5f728019d0986c.tar.gz
open-keychain-7fc188dbd60fde7c37a20b551d5f728019d0986c.tar.bz2
open-keychain-7fc188dbd60fde7c37a20b551d5f728019d0986c.zip
New callback model for ImportKeysActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java19
1 files changed, 10 insertions, 9 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 43557279f..2f14d77a8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -53,15 +53,16 @@ public class KeybaseKeyserver extends Keyserver {
// only list them if they have a key
if (JWalk.optObject(match, "components", "key_fingerprint") != null) {
- String keybaseId = JWalk.getString(match, "components", "username", "val");
- String fingerprint = JWalk.getString(match, "components", "key_fingerprint", "val");
- fingerprint = fingerprint.replace(" ", "").toUpperCase();
-
- if (keybaseId.equals(query) || fingerprint.startsWith(query.toUpperCase())) {
- results.add(makeEntry(match));
- } else {
- results.add(makeEntry(match));
- }
+ // TODO: needed anymore?
+// String keybaseId = JWalk.getString(match, "components", "username", "val");
+// String fingerprint = JWalk.getString(match, "components", "key_fingerprint", "val");
+// fingerprint = fingerprint.replace(" ", "").toUpperCase();
+// if (keybaseId.equals(query) || fingerprint.startsWith(query.toUpperCase())) {
+// results.add(makeEntry(match));
+// } else {
+// results.add(makeEntry(match));
+// }
+ results.add(makeEntry(match));
}
}
} catch (Exception e) {