moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 19:22:14 -05:00
Code Issues Releases Wiki Activity

Clean up debug crud

Browse Source
This commit is contained in:
Tim Bray 2014-04-28 10:47:39 -07:00
parent e663dadc32
commit ea1032dbfd
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@ -56,7 +56,6 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListEntry; import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListEntry;
import org.sufficientlysecure.keychain.util.HkpKeyServer; import org.sufficientlysecure.keychain.util.HkpKeyServer;
import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.InputData;
import org.sufficientlysecure.keychain.util.KeyServer;
import org.sufficientlysecure.keychain.util.KeybaseKeyServer; import org.sufficientlysecure.keychain.util.KeybaseKeyServer;
import org.sufficientlysecure.keychain.util.KeychainServiceListener; import org.sufficientlysecure.keychain.util.KeychainServiceListener;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
@ -763,7 +762,6 @@ public class KeychainIntentService extends IntentService
// get first object in block // get first object in block
Object obj; Object obj;
if ((obj = objectFactory.nextObject()) != null) { if ((obj = objectFactory.nextObject()) != null) {
Log.d(Constants.TAG, "Found class: " + obj.getClass());
if (obj instanceof PGPKeyRing) { if (obj instanceof PGPKeyRing) {
downloadedKey = (PGPKeyRing) obj; downloadedKey = (PGPKeyRing) obj;
@ -820,7 +818,6 @@ public class KeychainIntentService extends IntentService
// get first object in block // get first object in block
Object obj; Object obj;
if ((obj = objectFactory.nextObject()) != null) { if ((obj = objectFactory.nextObject()) != null) {
Log.d(Constants.TAG, "Found class: " + obj.getClass());
if (obj instanceof PGPKeyRing) { if (obj instanceof PGPKeyRing) {
downloadedKey = (PGPKeyRing) obj; downloadedKey = (PGPKeyRing) obj;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeybaseKeyServer.java
View File

@ -111,8 +111,8 @@ public class KeybaseKeyServer extends KeyServer {
mKeyCache.put(keybaseID, JWalk.getString(match,"them", "public_keys", "primary", "bundle")); mKeyCache.put(keybaseID, JWalk.getString(match,"them", "public_keys", "primary", "bundle"));
String name = JWalk.getString(match, "them", "profile", "full_name"); String name = JWalk.getString(match, "them", "profile", "full_name");
ArrayList<String> userIds = new ArrayList<String>(); ArrayList<String> userIds = new ArrayList<String>();
name = "keybase.io/" + keybaseID + " " + name;
userIds.add(name); userIds.add(name);
userIds.add("keybase.io/" + keybaseID); // TODO: Maybe should be keybaseID@keybase.io ?
entry.setUserIds(userIds); entry.setUserIds(userIds);
entry.setPrimaryUserId(name); entry.setPrimaryUserId(name);
return entry; return entry;