diff options
| author | Petter Arvidsson <petter.arvidsson@fidesmo.com> | 2015-11-27 13:20:18 +0100 |
|---|---|---|
| committer | Petter Arvidsson <petter.arvidsson@fidesmo.com> | 2016-01-12 18:17:34 +0100 |
| commit | dd85bbb4b5c0ee8d7356bbac766ab5e17de20b3e (patch) | |
| tree | 0a153c418ee7a4ef0c65964ccee4e8f1a7f926b3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | |
| parent | 808a9e4f54aeacec3296a6898974906eebb3803b (diff) | |
| download | open-keychain-dd85bbb4b5c0ee8d7356bbac766ab5e17de20b3e.tar.gz open-keychain-dd85bbb4b5c0ee8d7356bbac766ab5e17de20b3e.tar.bz2 open-keychain-dd85bbb4b5c0ee8d7356bbac766ab5e17de20b3e.zip | |
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
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); |