diff options
| author | Tim Bray <timbray@gmail.com> | 2014-04-28 10:47:39 -0700 |
|---|---|---|
| committer | Tim Bray <timbray@gmail.com> | 2014-04-29 15:04:05 -0700 |
| commit | ea1032dbfdbb42f39ef37af510e38b64f9854d5a (patch) | |
| tree | b9530ba6d5fc2a799bcd4efd54f6f67ea822e17b /OpenKeychain | |
| parent | e663dadc32633dc12f846539196276265ccc3534 (diff) | |
| download | open-keychain-ea1032dbfdbb42f39ef37af510e38b64f9854d5a.tar.gz open-keychain-ea1032dbfdbb42f39ef37af510e38b64f9854d5a.tar.bz2 open-keychain-ea1032dbfdbb42f39ef37af510e38b64f9854d5a.zip | |
Clean up debug crud
Diffstat (limited to 'OpenKeychain')
2 files changed, 1 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index fcd31b2fe..e085b5b72 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -56,7 +56,6 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListEntry; import org.sufficientlysecure.keychain.util.HkpKeyServer; import org.sufficientlysecure.keychain.util.InputData; -import org.sufficientlysecure.keychain.util.KeyServer; import org.sufficientlysecure.keychain.util.KeybaseKeyServer; import org.sufficientlysecure.keychain.util.KeychainServiceListener; import org.sufficientlysecure.keychain.util.Log; @@ -763,7 +762,6 @@ public class KeychainIntentService extends IntentService // get first object in block Object obj; if ((obj = objectFactory.nextObject()) != null) { - Log.d(Constants.TAG, "Found class: " + obj.getClass()); if (obj instanceof PGPKeyRing) { downloadedKey = (PGPKeyRing) obj; @@ -820,7 +818,6 @@ public class KeychainIntentService extends IntentService // get first object in block Object obj; if ((obj = objectFactory.nextObject()) != null) { - Log.d(Constants.TAG, "Found class: " + obj.getClass()); if (obj instanceof PGPKeyRing) { downloadedKey = (PGPKeyRing) obj; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java index 4b802c0e1..c5f97f0dd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java @@ -111,8 +111,8 @@ public class KeybaseKeyServer extends KeyServer { mKeyCache.put(keybaseID, JWalk.getString(match,"them", "public_keys", "primary", "bundle")); String name = JWalk.getString(match, "them", "profile", "full_name"); ArrayList<String> userIds = new ArrayList<String>(); + name = "keybase.io/" + keybaseID + " " + name; userIds.add(name); - userIds.add("keybase.io/" + keybaseID); // TODO: Maybe should be keybaseID@keybase.io ? entry.setUserIds(userIds); entry.setPrimaryUserId(name); return entry; |