fix race condition crash in ViewKeyActivity

2018-07-04 00:29:41 +02:00
parent 126224e751
commit b95c885aa0
1 changed files with 3 additions and 0 deletions
--- 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());