From 33a749a1158d8587494b5e5c3ad5a21beb03398f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 12 Jul 2018 12:32:47 +0200
Subject: [PATCH] load data from correct masterKeyId in ViewKeyActivity

Fixes showing key info from linked contacts
---
 .../sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 156b5c3a4..443f220e4 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
@@ -267,7 +267,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
         qrCodeLayout.setOnClickListener(v -> showQrCodeDialog());
 
         UnifiedKeyInfoViewModel viewModel = ViewModelProviders.of(this).get(UnifiedKeyInfoViewModel.class);
-        viewModel.setMasterKeyId(getIntent().getLongExtra(EXTRA_MASTER_KEY_ID, 0L));
+        viewModel.setMasterKeyId(masterKeyId);
         viewModel.getUnifiedKeyInfoLiveData(getApplicationContext()).observe(this, this::onLoadUnifiedKeyInfo);
 
         if (savedInstanceState == null && intent.hasExtra(EXTRA_DISPLAY_RESULT)) {