moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-15 13:25:06 -05:00
Code Issues Releases Wiki Activity

Merge pull request #889 from timbray/master

Browse Source 
Fix bug where Keybase extraData gets lost when SKS wins the search race.
This commit is contained in:
Dominik Schürmann 2014-09-25 11:33:57 +02:00
commit 4f0ac61b0e
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
View File

@ -59,6 +59,8 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
// being a little anal about the ArrayList#addAll contract here // being a little anal about the ArrayList#addAll contract here
private boolean mergeDupes(ImportKeysListEntry incoming, ImportKeysListEntry existing) { private boolean mergeDupes(ImportKeysListEntry incoming, ImportKeysListEntry existing) {
boolean modified = false; boolean modified = false;
// if any source thinks it’s expired/revoked, it is
if (incoming.isRevoked()) { if (incoming.isRevoked()) {
existing.setRevoked(true); existing.setRevoked(true);
modified = true; modified = true;
@ -67,8 +69,16 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
existing.setExpired(true); existing.setExpired(true);
modified = true; modified = true;
} }
// we’re going to want to try to fetch the key from everywhere we found it, so remember
// all the origins
for (String origin : incoming.getOrigins()) { for (String origin : incoming.getOrigins()) {
existing.addOrigin(origin); existing.addOrigin(origin);
// to work properly, Keybase-sourced entries need to pass along the extra
if (KeybaseKeyserver.ORIGIN.equals(origin)) {
existing.setExtraData(incoming.getExtraData());
}
} }
ArrayList<String> incomingIDs = incoming.getUserIds(); ArrayList<String> incomingIDs = incoming.getUserIds();
ArrayList<String> existingIDs = existing.getUserIds(); ArrayList<String> existingIDs = existing.getUserIds();