PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

show partial list of keys if an error is thrown

Browse source
This commit is contained in:
Vincent Breitmoser 2018-07-03 20:12:24 +02:00
parent 93e8c74ec6
commit 76e624f12f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/processing/ImportKeysListLoader.java
View file

@ -123,6 +123,7 @@ public class ImportKeysListLoader
} }
} catch (IOException e) { } catch (IOException e) {
Timber.e(e, "IOException on parsing key file! Return NoValidKeysException!"); Timber.e(e, "IOException on parsing key file! Return NoValidKeysException!");
if (mData.isEmpty()) {
OperationResult.OperationLog log = new OperationResult.OperationLog(); OperationResult.OperationLog log = new OperationResult.OperationLog();
log.add(OperationResult.LogType.MSG_GET_NO_VALID_KEYS, 0); log.add(OperationResult.LogType.MSG_GET_NO_VALID_KEYS, 0);
GetKeyResult getKeyResult = new GetKeyResult(GetKeyResult.RESULT_ERROR_NO_VALID_KEYS, log); GetKeyResult getKeyResult = new GetKeyResult(GetKeyResult.RESULT_ERROR_NO_VALID_KEYS, log);
@ -130,6 +131,7 @@ public class ImportKeysListLoader
mEntryListWrapper = new AsyncTaskResultWrapper<>(mData, getKeyResult); mEntryListWrapper = new AsyncTaskResultWrapper<>(mData, getKeyResult);
} }
} }
}
@NonNull @NonNull
private InputData getInputData(BytesLoaderState ls) private InputData getInputData(BytesLoaderState ls)