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 c00ebd915..53ab33dc5 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 @@ -63,6 +63,11 @@ public abstract class CryptoOperationFragment(this, callback); } + public void setProgressMessageResource(int id) { + mOperationHelper.setProgressMessageResource(id); + } + + @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { mOperationHelper.handleActivityResult(requestCode, resultCode, data); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java index ffbda330e..43106820f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java @@ -67,7 +67,7 @@ public class CryptoOperationHelper callback, int progressMessageString) { mFragment = fragment; mUseFragment = true; - mProgressMessageString = progressMessageString; + mProgressMessageResource = progressMessageString; mCallback = callback; } @@ -107,10 +107,14 @@ public class CryptoOperationHelper callback) { mFragment = fragment; mUseFragment = true; - mProgressMessageString = R.string.progress_building_key; + mProgressMessageResource = R.string.progress_building_key; mCallback = callback; } + public void setProgressMessageResource(int id) { + mProgressMessageResource = id; + } + private void initiateInputActivity(RequiredInputParcel requiredInput) { Activity activity = mUseFragment ? mFragment.getActivity() : mActivity; @@ -254,7 +258,7 @@ public class CryptoOperationHelper