From 082722a3cfbae408ae3df1f27b191c62a212ff2b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 26 Oct 2014 22:00:57 +0100
Subject: prevent cancel dring consolidate, move logic into progressable

---
 .../java/org/sufficientlysecure/keychain/util/ProgressScaler.java   | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
index 5256f5212..6bec9ccab 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
@@ -60,4 +60,10 @@ public class ProgressScaler implements Progressable {
         }
     }
 
+    @Override
+    public void setPreventCancel() {
+        if (mWrapped != null) {
+            mWrapped.setPreventCancel();
+        }
+    }
 }
-- 
cgit v1.2.3