From 0c3a478a431e37566dad6dfe3e396ff6c2034765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 21 Jun 2014 21:31:00 +0200 Subject: [PATCH] Cleanup pull keybase code --- .../keychain/keyimport/KeybaseKeyserver.java | 7 +------ 1 file changed, 1 insertion(+), 6 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 98e5111f7..29ab06264 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java @@ -62,8 +62,7 @@ public class KeybaseKeyserver extends Keyserver { entry.setQuery(mQuery); entry.setOrigin(ORIGIN); - String username = null; - username = match.getUsername(); + String username = match.getUsername(); String fullName = match.getFullName(); String fingerprint = match.getFingerprint(); entry.setFingerprintHex(fingerprint); @@ -93,10 +92,6 @@ public class KeybaseKeyserver extends Keyserver { @Override public String get(String id) throws QueryFailedException { try { - /* - JSONObject user = getUser(id); - return JWalk.getString(user, "them", "public_keys", "primary", "bundle"); - */ return User.keyForUsername(id); } catch (KeybaseException e) { throw new QueryFailedException(e.getMessage());