From c13ccda65846f71c07e5e8f3b22b087db5d38eca Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Sat, 13 Sep 2014 21:15:14 -0700
Subject: Keys found on multiple servers are now imported from all of them

---
 .../java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java')

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) {
-- 
cgit v1.2.3