From f275daf1fbb06951f5962f6478d3f8ff97fe6bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 29 Sep 2014 22:54:17 +0200
Subject: Disable NfcIntentActivity until we implement it properly

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

(limited to 'OpenKeychain/src')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index ddec381c8..209f560c6 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -633,16 +633,16 @@
             android:taskAffinity=":Nfc"
             android:allowTaskReparenting="true" />
 
-        <activity
-            android:name=".ui.NfcIntentActivity"
-            android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:host="my.yubico.com" android:scheme="https"/>
-            </intent-filter>
-        </activity>
+        <!--<activity-->
+            <!--android:name=".ui.NfcIntentActivity"-->
+            <!--android:launchMode="singleTop">-->
+            <!--<intent-filter>-->
+                <!--<action android:name="android.nfc.action.NDEF_DISCOVERED" />-->
+
+                <!--<category android:name="android.intent.category.DEFAULT" />-->
+                <!--<data android:host="my.yubico.com" android:scheme="https"/>-->
+            <!--</intent-filter>-->
+        <!--</activity>-->
 
         <activity
             android:name=".ui.HelpActivity"
-- 
cgit v1.2.3