prevent cancel dring consolidate, move logic into progressable

2014-10-26 22:00:57 +01:00
parent b8ed54bc69
commit 082722a3cf
4 changed files with 17 additions and 2 deletions
--- 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);