aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-06 11:27:45 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-06 11:27:45 +0200
commitbaf059843ef51c57e47cd74fa695485b93482669 (patch)
tree46f94d97239385f14d6f5364663812bafb828519 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
parente4bd25613ccac4fd426630f8ed1c50016bbd6ec5 (diff)
downloadopen-keychain-baf059843ef51c57e47cd74fa695485b93482669.tar.gz
open-keychain-baf059843ef51c57e47cd74fa695485b93482669.tar.bz2
open-keychain-baf059843ef51c57e47cd74fa695485b93482669.zip
In NfcOperationsActivity, show NFC errors inline, in others show as Notify
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.java7
1 files changed, 2 insertions, 5 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 c6f02edb3..9326ff129 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -75,11 +75,8 @@ public class CreateKeyActivity extends BaseNfcActivity {
// React on NDEF_DISCOVERED from Manifest
// NOTE: ACTION_NDEF_DISCOVERED and not ACTION_TAG_DISCOVERED like in BaseNfcActivity
if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction())) {
- try {
- handleTagDiscoveredIntent(getIntent());
- } catch (IOException e) {
- handleNfcError(e);
- }
+
+ handleIntentInBackground(getIntent());
setTitle(R.string.title_manage_my_keys);