diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-10-31 00:20:00 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-10-31 00:21:13 +0530 |
| commit | 4284aac0aa0d0bf4ce6f0edbc65a9837c06e1c8e (patch) | |
| tree | e50a7682ffcef5f30a3fb4d818aad6d3f11b65ec /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations | |
| parent | 0641b9cba68aa0093f1b1b7aa937caa50e9f5669 (diff) | |
| download | open-keychain-4284aac0aa0d0bf4ce6f0edbc65a9837c06e1c8e.tar.gz open-keychain-4284aac0aa0d0bf4ce6f0edbc65a9837c06e1c8e.tar.bz2 open-keychain-4284aac0aa0d0bf4ce6f0edbc65a9837c06e1c8e.zip | |
changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 8a4998b8f..19a05790f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java @@ -540,7 +540,9 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> { // adding required information to mResultType // special case,no keys requested for import - if (mBadKeys == 0 && mNewKeys == 0 && mUpdatedKeys == 0) { + if (mBadKeys == 0 && mNewKeys == 0 && mUpdatedKeys == 0 + && (mResultType & ImportKeyResult.RESULT_CANCELLED) + != ImportKeyResult.RESULT_CANCELLED) { mResultType = ImportKeyResult.RESULT_FAIL_NOTHING; } else { if (mNewKeys > 0) { |