1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 46f294866..ce9a14a6f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -938,6 +938,9 @@ public class ProviderHelper {
 
         progress.setProgress(R.string.progress_con_saving, 0, 100);
 
+        // The consolidate operation can never be cancelled!
+        progress.setPreventCancel();
+
         try {
 
             log.add(LogType.MSG_CON_SAVE_SECRET, indent);