From 7009e504b98d32564c6a9a549d1f5c43959bb24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 29 Jun 2015 21:17:12 +0200
Subject: Connect YubiKey URL to OpenKeychain

---
 OpenKeychain/src/main/AndroidManifest.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

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"
-- 
cgit v1.2.3