diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-21 11:40:48 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-21 11:40:48 +0200 |
| commit | 562e379c56a96bc54df7b5ee4c5843771a14461a (patch) | |
| tree | 843e7d5c3bbbbc484c6e603a9325b693a572cc7e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | |
| parent | 3c46c3c2dfd4ec6ec8b91eb43246c7d579f9b95d (diff) | |
| download | open-keychain-562e379c56a96bc54df7b5ee4c5843771a14461a.tar.gz open-keychain-562e379c56a96bc54df7b5ee4c5843771a14461a.tar.bz2 open-keychain-562e379c56a96bc54df7b5ee4c5843771a14461a.zip | |
Fix nullpointer when revoking keys
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java index f2d6d4c13..28692f638 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -339,7 +339,8 @@ public class EditKeyFragment extends LoaderFragment implements } else { mSaveKeyringParcel.mRevokeUserIds.add(userId); // not possible to revoke and change to primary user id - if (mSaveKeyringParcel.mChangePrimaryUserId.equals(userId)) { + if (mSaveKeyringParcel.mChangePrimaryUserId != null + && mSaveKeyringParcel.mChangePrimaryUserId.equals(userId)) { mSaveKeyringParcel.mChangePrimaryUserId = null; } } |