fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)

1 files changed, 12 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 074e40b22..007608f80 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -97,10 +97,19 @@ public class PassphraseDialogActivity extends FragmentActivity {
             keyId = getIntent().getLongExtra(EXTRA_SUBKEY_ID, 0);
         } else {
             RequiredInputParcel requiredInput = getIntent().getParcelableExtra(EXTRA_REQUIRED_INPUT);
-            if (requiredInput.mType != RequiredInputType.PASSPHRASE) {
-                throw new AssertionError("Wrong required input type for PassphraseDialogActivity!");
+            switch (requiredInput.mType) {
+                case PASSPHRASE_SYMMETRIC: {
+                    keyId = Constants.key.symmetric;
+                    break;
+                }
+                case PASSPHRASE: {
+                    keyId = requiredInput.getSubKeyId();
+                    break;
+                }
+                default: {
+                    throw new AssertionError("Unsupported required input type for PassphraseDialogActivity!");
+                }
             }
-            keyId = requiredInput.getSubKeyId();
         }
 
         Intent serviceIntent = getIntent().getParcelableExtra(EXTRA_SERVICE_INTENT);