diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-11 16:31:29 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-13 23:34:06 +0530 |
| commit | c1d2beb55986138a21a40cc6ba6d64684e1798dc (patch) | |
| tree | 8f71e42c7432f1b767596f423a6ca74fc82e6cb7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | |
| parent | c59196a6f1e5dd4e3b2ac864067cc7f469de01ac (diff) | |
| download | open-keychain-c1d2beb55986138a21a40cc6ba6d64684e1798dc.tar.gz open-keychain-c1d2beb55986138a21a40cc6ba6d64684e1798dc.tar.bz2 open-keychain-c1d2beb55986138a21a40cc6ba6d64684e1798dc.zip | |
made PassphraseDialogActivity compatible with null CryptoInputParcel
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | 5 |
1 files changed, 5 insertions, 0 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 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)) { |