cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix OOM bug in multi threaded key import, fixes #1960

Browse Source
This commit is contained in:
Dominik Schürmann
2016-12-28 18:52:29 +01:00
parent 3363bbfb87
commit 1bf4ccf67c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
View File

@@ -477,6 +477,9 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
new ExecutorCompletionService<>(importExecutor); new ExecutorCompletionService<>(importExecutor);
while (keyListIterator.hasNext()) { // submit all key rings to be imported while (keyListIterator.hasNext()) { // submit all key rings to be imported
final ParcelableKeyRing pkRing = keyListIterator.next();
Callable<ImportKeyResult> importOperationCallable = new Callable<ImportKeyResult> Callable<ImportKeyResult> importOperationCallable = new Callable<ImportKeyResult>
() { () {
@@ -487,7 +490,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
} }
ArrayList<ParcelableKeyRing> list = new ArrayList<>(); ArrayList<ParcelableKeyRing> list = new ArrayList<>();
list.add(keyListIterator.next()); list.add(pkRing);
ProgressScaler ignoreProgressable = new ProgressScaler(); ProgressScaler ignoreProgressable = new ProgressScaler();
return serialKeyRingImport(list.iterator(), 1, keyServer, ignoreProgressable, return serialKeyRingImport(list.iterator(), 1, keyServer, ignoreProgressable,