diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 22:00:57 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 22:00:57 +0100 |
| commit | 082722a3cfbae408ae3df1f27b191c62a212ff2b (patch) | |
| tree | 147261c28d52c2477b0df036e9bedf62c52bd209 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
| parent | b8ed54bc699978355ffb5e9802902c6bc19a2e7a (diff) | |
| download | open-keychain-082722a3cfbae408ae3df1f27b191c62a212ff2b.tar.gz open-keychain-082722a3cfbae408ae3df1f27b191c62a212ff2b.tar.bz2 open-keychain-082722a3cfbae408ae3df1f27b191c62a212ff2b.zip | |
prevent cancel dring consolidate, move logic into progressable
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 3 |
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); |