diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 22:38:35 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 22:38:35 +0100 |
commit | be31815ee80dd6770bc09804216f732ef58d055b (patch) | |
tree | 424904029620191ab39c7518f584c5b601571d76 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | fa73362a9faed746a272bfe9e4329b1ee606e09e (diff) | |
parent | 84b234af3720368fcf6c61dcd61b8a7d8986a1b4 (diff) | |
download | open-keychain-be31815ee80dd6770bc09804216f732ef58d055b.tar.gz open-keychain-be31815ee80dd6770bc09804216f732ef58d055b.tar.bz2 open-keychain-be31815ee80dd6770bc09804216f732ef58d055b.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 044656a31..a2988f2b2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -472,8 +472,7 @@ public class KeychainIntentService extends IntentService implements Progressable // Special: consolidate on secret key import (cannot be cancelled!) if (result.mSecret > 0) { - // cannot cancel from here on out! - sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_PREVENT_CANCEL); + // TODO move this into the import operation providerHelper.consolidateDatabaseStep1(this); } @@ -676,6 +675,11 @@ public class KeychainIntentService extends IntentService implements Progressable setProgress(null, progress, max); } + @Override + public void setPreventCancel() { + sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_PREVENT_CANCEL); + } + private InputData createDecryptInputData(Bundle data) throws IOException, PgpGeneralException { return createCryptInputData(data, DECRYPT_CIPHERTEXT_BYTES); } |