From da131220aac727865b9e33e8d34743939e8acbf0 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 28 Jul 2014 17:04:25 +0200
Subject: watch out for nullpointers from get(Un|)HashedSubpackets

fixes #721
---
 .../java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 69244ca14..6bce07824 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -413,7 +413,8 @@ public class PgpKeyOperation {
                     }
 
                     // if this is~ the/a primary user id
-                    if (currentCert.hasSubpackets() && currentCert.getHashedSubPackets().isPrimaryUserID()) {
+                    if (currentCert.getHashedSubPackets() != null
+                            && currentCert.getHashedSubPackets().isPrimaryUserID()) {
                         // if it's the one we want, just leave it as is
                         if (userId.equals(saveParcel.mChangePrimaryUserId)) {
                             ok = true;
@@ -740,7 +741,7 @@ public class PgpKeyOperation {
         int flags = 0;
         //noinspection unchecked
         for(PGPSignature sig : new IterableIterator<PGPSignature>(key.getSignatures())) {
-            if (!sig.hasSubpackets()) {
+            if (sig.getHashedSubPackets() == null) {
                 continue;
             }
             flags |= sig.getHashedSubPackets().getKeyFlags();
-- 
cgit v1.2.3