diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-04 20:24:11 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-04 20:24:11 +0100 |
| commit | 3ca8af060b2f6452df794a8770714d1f02b36734 (patch) | |
| tree | 438d92f9107bd76e10c5f72f41c4d7bc12e44ced /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations | |
| parent | a4518c43c2fdff3852668242978a8b9739447d0b (diff) | |
| parent | 31a45759ccfbca76f89e6e51bf94c4a3af3a874f (diff) | |
| download | open-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.tar.gz open-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.tar.bz2 open-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
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) { |