From b95c885aa0da86a98b247be93580750251f26e03 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 4 Jul 2018 00:29:41 +0200
Subject: [PATCH] fix race condition crash in ViewKeyActivity

---
 .../keychain/ui/keyview/ViewKeyActivity.java                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java
index 3385c2283..156b5c3a4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java
@@ -352,6 +352,9 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
+        if (unifiedKeyInfo == null) {
+            return false;
+        }
         MenuItem backupKey = menu.findItem(R.id.menu_key_view_backup);
         backupKey.setVisible(unifiedKeyInfo.has_any_secret());
         menu.findItem(R.id.menu_key_view_skt).setVisible(unifiedKeyInfo.has_any_secret());