From 082722a3cfbae408ae3df1f27b191c62a212ff2b Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 26 Oct 2014 22:00:57 +0100 Subject: prevent cancel dring consolidate, move logic into progressable --- .../java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java') 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); -- cgit v1.2.3