open ViewKeyActivity by subkey in NfcBaseActivity

1 files changed, 4 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
index 1d09b281f..0dad65e77 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
@@ -222,11 +222,12 @@ public abstract class BaseNfcActivity extends BaseActivity {
         final String nfcUserId = nfcGetUserId();
         final byte[] nfcAid = nfcGetAid();
 
-        final long masterKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(nfcFingerprints);
+        final long subKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(nfcFingerprints);
 
         try {
-            CachedPublicKeyRing ring = new ProviderHelper(this).getCachedPublicKeyRing(masterKeyId);
-            ring.getMasterKeyId();
+            CachedPublicKeyRing ring = new ProviderHelper(this).getCachedPublicKeyRing(
+                    KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(subKeyId));
+            long masterKeyId = ring.getMasterKeyId();
 
             Intent intent = new Intent(
                     BaseNfcActivity.this, ViewKeyActivity.class);