aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
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/AndroidManifest.xml
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/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index a8c553add..5b95423ac 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -95,15 +95,15 @@
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
- <!-- Connect with YubiKeys. This Activity will automatically show/import/create key -->
- <!--<intent-filter>-->
- <!--<action android:name="android.nfc.action.NDEF_DISCOVERED"/>-->
- <!--<category android:name="android.intent.category.DEFAULT"/>-->
- <!--<data-->
- <!--android:scheme="https"-->
- <!--android:host="my.yubico.com"-->
- <!--android:pathPrefix="/neo"/>-->
- <!--</intent-filter>-->
+ <!-- Connect with YubiKeys. This Activity will automatically show/import/create YubiKeys -->
+ <intent-filter android:label="@string/app_name">
+ <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data
+ android:scheme="https"
+ android:host="my.yubico.com"
+ android:pathPrefix="/neo"/>
+ </intent-filter>
</activity>
<activity
android:name=".ui.EditKeyActivity"