From 76e624f12fd8ab4ac8639dd9619f3db6a44b9813 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 3 Jul 2018 20:12:24 +0200 Subject: [PATCH] show partial list of keys if an error is thrown --- .../keyimport/processing/ImportKeysListLoader.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/processing/ImportKeysListLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/processing/ImportKeysListLoader.java index 0e5b50168..a53e82118 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/processing/ImportKeysListLoader.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/processing/ImportKeysListLoader.java @@ -123,11 +123,13 @@ public class ImportKeysListLoader } } catch (IOException e) { Timber.e(e, "IOException on parsing key file! Return NoValidKeysException!"); - OperationResult.OperationLog log = new OperationResult.OperationLog(); - log.add(OperationResult.LogType.MSG_GET_NO_VALID_KEYS, 0); - GetKeyResult getKeyResult = new GetKeyResult(GetKeyResult.RESULT_ERROR_NO_VALID_KEYS, log); - mData.clear(); - mEntryListWrapper = new AsyncTaskResultWrapper<>(mData, getKeyResult); + if (mData.isEmpty()) { + OperationResult.OperationLog log = new OperationResult.OperationLog(); + log.add(OperationResult.LogType.MSG_GET_NO_VALID_KEYS, 0); + GetKeyResult getKeyResult = new GetKeyResult(GetKeyResult.RESULT_ERROR_NO_VALID_KEYS, log); + mData.clear(); + mEntryListWrapper = new AsyncTaskResultWrapper<>(mData, getKeyResult); + } } }