aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-06-29 21:17:12 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-06-29 21:17:12 +0200
commit7009e504b98d32564c6a9a549d1f5c43959bb24e (patch)
treeb1cba66c58879f7b6700d9a3e0e2b83db59253b0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base
parenta9c606d49bf7d4e7a30b7265cd1fb04ff1c3c01c (diff)
downloadopen-keychain-7009e504b98d32564c6a9a549d1f5c43959bb24e.tar.gz
open-keychain-7009e504b98d32564c6a9a549d1f5c43959bb24e.tar.bz2
open-keychain-7009e504b98d32564c6a9a549d1f5c43959bb24e.zip
Connect YubiKey URL to OpenKeychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java4
1 files changed, 2 insertions, 2 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 cb250d28c..bede16b2a 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
@@ -94,7 +94,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
public void onNewIntent(Intent intent) {
if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
try {
- handleNdefDiscoveredIntent(intent);
+ handleTagDiscoveredIntent(intent);
} catch (CardException e) {
handleNfcError(e);
} catch (IOException e) {
@@ -278,7 +278,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
* on ISO SmartCard Systems specification.
*
*/
- protected void handleNdefDiscoveredIntent(Intent intent) throws IOException {
+ protected void handleTagDiscoveredIntent(Intent intent) throws IOException {
Tag detectedTag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);