From 64cec07b163f3673423b12c8cdf600300086fe08 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 7 Jul 2015 17:16:07 +0200
Subject: fix handling of progress dialog creation in CryptoOperationFragment
 (fixes #1407)

---
 .../keychain/ui/base/CryptoOperationFragment.java            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
index 2ab0d5fac..bb0af5830 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
@@ -23,6 +23,7 @@ import android.os.Parcelable;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
 import org.sufficientlysecure.keychain.service.KeychainService;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
@@ -50,9 +51,12 @@ public abstract class CryptoOperationFragment<T extends Parcelable, S extends Op
 
     final private CryptoOperationHelper<T, S> mOperationHelper;
 
-    public CryptoOperationFragment() {
+    public CryptoOperationFragment(Integer initialProgressMsg) {
+        mOperationHelper = new CryptoOperationHelper<>(this, this, initialProgressMsg);
+    }
 
-        mOperationHelper = new CryptoOperationHelper<>(this, this);
+    public CryptoOperationFragment() {
+        mOperationHelper = new CryptoOperationHelper<>(this, this, R.string.progress_processing);
     }
 
     @Override
@@ -76,10 +80,6 @@ public abstract class CryptoOperationFragment<T extends Parcelable, S extends Op
         mOperationHelper.cryptoOperation(cryptoInput);
     }
 
-    protected void cryptoOperation(CryptoInputParcel cryptoInput, boolean showProgress) {
-        mOperationHelper.cryptoOperation(cryptoInput, showProgress);
-    }
-
     @Override @Nullable
     /** Creates input for the crypto operation. Called internally after the
      * crypto operation is started by a call to cryptoOperation(). Silently
-- 
cgit v1.2.3