diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 01:57:26 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 01:57:26 +0200 |
commit | bd8e45b55680d71190c5c565dc144dc5d940ea89 (patch) | |
tree | 5e52e52a08f3e99af3e05f6bb39dbe04c76da096 | |
parent | cd0d84d10d4287f038a05cb7f4afeb8de087e3f4 (diff) | |
download | open-keychain-bd8e45b55680d71190c5c565dc144dc5d940ea89.tar.gz open-keychain-bd8e45b55680d71190c5c565dc144dc5d940ea89.tar.bz2 open-keychain-bd8e45b55680d71190c5c565dc144dc5d940ea89.zip |
open ViewKeyActivity by subkey in NfcBaseActivity
-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 686c86b3a..d1101f35c 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 @@ -234,11 +234,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); |