diff options
| author | Tim Bray <timbray@gmail.com> | 2014-09-13 21:15:14 -0700 |
|---|---|---|
| committer | Tim Bray <timbray@gmail.com> | 2014-09-13 21:43:07 -0700 |
| commit | c13ccda65846f71c07e5e8f3b22b087db5d38eca (patch) | |
| tree | 3b2ff078d9c09386e5a44dd34399283d0e6ea02a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java | |
| parent | 7de86a09bc3bae47c44b9dcb65bbda1298ccf843 (diff) | |
| download | open-keychain-c13ccda65846f71c07e5e8f3b22b087db5d38eca.tar.gz open-keychain-c13ccda65846f71c07e5e8f3b22b087db5d38eca.tar.bz2 open-keychain-c13ccda65846f71c07e5e8f3b22b087db5d38eca.zip | |
Keys found on multiple servers are now imported from all of them
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java index 00bbca69c..15bcd8576 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java @@ -67,6 +67,9 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> { existing.setExpired(true); modified = true; } + for (String origin : incoming.getOrigins()) { + existing.addOrigin(origin); + } ArrayList<String> incomingIDs = incoming.getUserIds(); ArrayList<String> existingIDs = existing.getUserIds(); for (String incomingID : incomingIDs) { |