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

ImportKeys: Avoid exception while downloading without saving

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-01 22:38:35 +02:00
parent d095df1740
commit cdef20601f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,7 +339,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
} }
importedMasterKeyIds.add(key.getMasterKeyId()); importedMasterKeyIds.add(key.getMasterKeyId());
} }
if (entry.mBytes == null) { if (!skipSave && (entry.mBytes == null)) {
// synonymous to isDownloadFromKeyserver. // synonymous to isDownloadFromKeyserver.
// If no byte data was supplied, import from keyserver took place // If no byte data was supplied, import from keyserver took place
// this prevents file imports being noted as keyserver imports // this prevents file imports being noted as keyserver imports
@@ -362,7 +362,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
// synchronized on mProviderHelper to prevent // synchronized on mProviderHelper to prevent
// https://github.com/open-keychain/open-keychain/issues/1221 since a consolidate deletes // https://github.com/open-keychain/open-keychain/issues/1221 since a consolidate deletes
// and re-inserts keys, which could conflict with a parallel db key update // and re-inserts keys, which could conflict with a parallel db key update
if (!skipSave && secret > 0) { if (!skipSave && (secret > 0)) {
setPreventCancel(); setPreventCancel();
ConsolidateResult result; ConsolidateResult result;
synchronized (mProviderHelper) { synchronized (mProviderHelper) {