prevent cancel dring consolidate, move logic into progressable

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);
     }