handle multiple input URIs and Intent.SEND_MULTIPLE

1 files changed, 13 insertions, 7 deletions

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 5f1097588..764602735 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
@@ -123,6 +123,14 @@ public abstract class CryptoOperationFragment <T extends Parcelable, S extends O
     protected abstract T createOperationInput();
 
     protected void cryptoOperation(CryptoInputParcel cryptoInput) {
+        cryptoOperation(cryptoInput, true);
+    }
+
+    protected void cryptoOperation() {
+        cryptoOperation(new CryptoInputParcel());
+    }
+
+    protected void cryptoOperation(CryptoInputParcel cryptoInput, boolean showProgress) {
 
         T operationInput = createOperationInput();
         if (operationInput == null) {
@@ -169,18 +177,16 @@ public abstract class CryptoOperationFragment <T extends Parcelable, S extends O
         Messenger messenger = new Messenger(saveHandler);
         intent.putExtra(KeychainService.EXTRA_MESSENGER, messenger);
 
-        saveHandler.showProgressDialog(
-                getString(R.string.progress_building_key),
-                ProgressDialog.STYLE_HORIZONTAL, false);
+        if (showProgress) {
+            saveHandler.showProgressDialog(
+                    getString(R.string.progress_building_key),
+                    ProgressDialog.STYLE_HORIZONTAL, false);
+        }
 
         getActivity().startService(intent);
 
     }
 
-    protected void cryptoOperation() {
-        cryptoOperation(new CryptoInputParcel());
-    }
-
     protected void onCryptoOperationResult(S result) {
         if (result.success()) {
             onCryptoOperationSuccess(result);