diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 01:57:26 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 02:14:27 +0200 |
| commit | fb96b6dfa9bcfd704e1237de5721583f50631b33 (patch) | |
| tree | 5b5d5ac1487defc8bcb42c1ef7fa2b4e0c92afa6 /OpenKeychain/src | |
| parent | a79d7bd1c280fda732a9550e88554fd9bb84bb1f (diff) | |
| download | open-keychain-fb96b6dfa9bcfd704e1237de5721583f50631b33.tar.gz open-keychain-fb96b6dfa9bcfd704e1237de5721583f50631b33.tar.bz2 open-keychain-fb96b6dfa9bcfd704e1237de5721583f50631b33.zip | |
open ViewKeyActivity by subkey in NfcBaseActivity
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | 7 |
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); |