From dd85bbb4b5c0ee8d7356bbac766ab5e17de20b3e Mon Sep 17 00:00:00 2001 From: Petter Arvidsson Date: Fri, 27 Nov 2015 13:20:18 +0100 Subject: Use Nordpol for BaseNfcActivity - Replace handling of intents with Nordpol tag dispatcher - Update CreateKeyActivity to pass it's intent to the tag dispatcher when invoked by the system (onCreate) - Add Fidesmo marmeladburk repository - Add dependency on nordpol-android and nordpol-core --- .../main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java') 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); -- cgit v1.2.3