diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-13 14:38:40 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-13 14:38:40 +0100 |
| commit | 8cd28036ef6b833b1dc58b54a9797403957e5394 (patch) | |
| tree | 4c3e4d322223b148f4eb8b65341f44f7ad830d0e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | |
| parent | d030f4f203fd4ba928d729e25460ae07aeba112b (diff) | |
| parent | 02854a617b62728184a95f1a172a1a5d27f73f22 (diff) | |
| download | open-keychain-8cd28036ef6b833b1dc58b54a9797403957e5394.tar.gz open-keychain-8cd28036ef6b833b1dc58b54a9797403957e5394.tar.bz2 open-keychain-8cd28036ef6b833b1dc58b54a9797403957e5394.zip | |
Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpol
Use Nordpol for BaseNfcActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java index 925888813..b1fec3aae 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java @@ -77,7 +77,7 @@ public class CreateKeyActivity extends BaseSecurityTokenNfcActivity { // NOTE: ACTION_NDEF_DISCOVERED and not ACTION_TAG_DISCOVERED like in BaseNfcActivity if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction())) { - handleIntentInBackground(getIntent()); + mTagDispatcher.interceptIntent(getIntent()); setTitle(R.string.title_manage_my_keys); |