From 562e379c56a96bc54df7b5ee4c5843771a14461a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 21 Aug 2014 11:40:48 +0200
Subject: Fix nullpointer when revoking keys

---
 .../main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java')

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;
                             }
                         }
-- 
cgit v1.2.3