diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 18:27:03 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 18:27:03 +0200 |
| commit | d4387c01795a0fc62319cd715c72699c10d4a7cb (patch) | |
| tree | 4129c7f7f39605af4a3111e084e142472da67ddc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java | |
| parent | 1f5f937d008673bd2d57d88b2f63dc35576c29e5 (diff) | |
| download | open-keychain-d4387c01795a0fc62319cd715c72699c10d4a7cb.tar.gz open-keychain-d4387c01795a0fc62319cd715c72699c10d4a7cb.tar.bz2 open-keychain-d4387c01795a0fc62319cd715c72699c10d4a7cb.zip | |
Add null check to getSecretKeyType
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java index 1bb4537dc..bf28465f5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java @@ -117,7 +117,7 @@ public class CanonicalizedSecretKey extends CanonicalizedPublicKey { } public SecretKeyType getSecretKeyType() { - if (mSecretKey.getS2K().getType() == S2K.GNU_DUMMY_S2K) { + if (mSecretKey.getS2K() != null && mSecretKey.getS2K().getType() == S2K.GNU_DUMMY_S2K) { // divert to card is special if (mSecretKey.getS2K().getProtectionMode() == S2K.GNU_PROTECTION_MODE_DIVERT_TO_CARD) { return SecretKeyType.DIVERT_TO_CARD; |