From c1d2beb55986138a21a40cc6ba6d64684e1798dc Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Sat, 11 Jul 2015 16:31:29 +0530 Subject: made PassphraseDialogActivity compatible with null CryptoInputParcel --- .../org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java') 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 c9f6423d6..d68b39fc1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -95,6 +95,11 @@ public class PassphraseDialogActivity extends FragmentActivity { mCryptoInputParcel = getIntent().getParcelableExtra(EXTRA_CRYPTO_INPUT); + if (mCryptoInputParcel == null) { + // not all usages of PassphraseActivity are from CryptoInputOperation + mCryptoInputParcel = new CryptoInputParcel(); + } + // this activity itself has no content view (see manifest) if (getIntent().hasExtra(EXTRA_SUBKEY_ID)) { -- cgit v1.2.3