From fdefd30a4649b14ad9831b2a41d0b89da4de8eb6 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sat, 30 Jun 2018 12:31:42 +0200
Subject: [PATCH] fix NPE in ImportKeysAdapter

---
 .../keychain/ui/adapter/ImportKeysAdapter.java                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 94003d3eb..7356abc16 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -40,6 +40,7 @@ import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysListener;
 import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysOperationCallback;
 import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysResultListener;
+import org.sufficientlysecure.keychain.model.SubKey.UnifiedKeyInfo;
 import org.sufficientlysecure.keychain.operations.ImportOperation;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
@@ -90,7 +91,8 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
                 if (entry.isSecretKey()) {
                     verified = mKeyRepository.getCanonicalizedSecretKeyRing(keyId).getVerified();
                 } else {
-                    verified = mKeyRepository.getUnifiedKeyInfo(keyId).verified();
+                    UnifiedKeyInfo unifiedKeyInfo = mKeyRepository.getUnifiedKeyInfo(keyId);
+                    verified = unifiedKeyInfo != null ? unifiedKeyInfo.verified() : null;
                 }
                 keyState.mAlreadyPresent = true;
                 keyState.mVerified = verified != null && verified != VerificationStatus.UNVERIFIED;