From 1bf4ccf67c5445d76a356866a659ff35792b25d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 28 Dec 2016 18:52:29 +0100
Subject: [PATCH] Fix OOM bug in multi threaded key import, fixes #1960

---
 .../keychain/operations/ImportOperation.java                 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
index f9f811d39..3c2ed142a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
@@ -477,6 +477,9 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
                 new ExecutorCompletionService<>(importExecutor);
 
         while (keyListIterator.hasNext()) { // submit all key rings to be imported
+
+            final ParcelableKeyRing pkRing = keyListIterator.next();
+
             Callable<ImportKeyResult> importOperationCallable = new Callable<ImportKeyResult>
                     () {
 
@@ -487,7 +490,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
                     }
 
                     ArrayList<ParcelableKeyRing> list = new ArrayList<>();
-                    list.add(keyListIterator.next());
+                    list.add(pkRing);
                     ProgressScaler ignoreProgressable = new ProgressScaler();
 
                     return serialKeyRingImport(list.iterator(), 1, keyServer, ignoreProgressable,