diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 02:09:58 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 16:33:14 +0200 |
| commit | 6e3ed1d2db1f9dcf8cc90deda4370a1dc058f79b (patch) | |
| tree | 2c1e7143806ae2706733abde5181150d649c5145 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | |
| parent | 1fcd9d3fde07f0217ec16fcf64d527bbc3436cac (diff) | |
| download | open-keychain-6e3ed1d2db1f9dcf8cc90deda4370a1dc058f79b.tar.gz open-keychain-6e3ed1d2db1f9dcf8cc90deda4370a1dc058f79b.tar.bz2 open-keychain-6e3ed1d2db1f9dcf8cc90deda4370a1dc058f79b.zip | |
do nfc dispatching in MainActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | 8 |
1 files changed, 2 insertions, 6 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 0dad65e77..fb6060d58 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 @@ -229,22 +229,18 @@ public abstract class BaseNfcActivity extends BaseActivity { KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(subKeyId)); long masterKeyId = ring.getMasterKeyId(); - Intent intent = new Intent( - BaseNfcActivity.this, ViewKeyActivity.class); + Intent intent = new Intent(this, ViewKeyActivity.class); intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId)); intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, nfcAid); intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, nfcUserId); intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, nfcFingerprints); startActivity(intent); - finish(); } catch (PgpKeyNotFoundException e) { - Intent intent = new Intent( - BaseNfcActivity.this, CreateKeyActivity.class); + Intent intent = new Intent(this, CreateKeyActivity.class); intent.putExtra(CreateKeyActivity.EXTRA_NFC_AID, nfcAid); intent.putExtra(CreateKeyActivity.EXTRA_NFC_USER_ID, nfcUserId); intent.putExtra(CreateKeyActivity.EXTRA_NFC_FINGERPRINTS, nfcFingerprints); startActivity(intent); - finish(); } } |