From 4813345460fb489b42ee7c5610f9817b976544af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 14:14:54 +0200
Subject: [PATCH] Use mime type in NFC as defined in RFC3156

---
 OpenPGP-Keychain/AndroidManifest.xml                          | 4 ++--
 .../src/org/sufficientlysecure/keychain/Constants.java        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 6de9221ca..3e98c9f56 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -394,8 +394,8 @@
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
 
                 <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="application/org.sufficientlysecure.keychain" />
+                <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 -->
+                <data android:mimeType="application/pgp-keys" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.ShareActivity" >
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java
index 5939c8e03..96da4b052 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java
@@ -26,7 +26,8 @@ public final class Constants {
 
     public static final String PACKAGE_NAME = "org.sufficientlysecure.keychain";
 
-    public static final String NFC_MIME = "application/org.sufficientlysecure.keychain";
+    // as defined in http://tools.ietf.org/html/rfc3156, section 7
+    public static final String NFC_MIME = "application/pgp-keys";
 
     public static final String PERMISSION_ACCESS_KEY_DATABASE = PACKAGE_NAME
             + ".permission.ACCESS_KEY_DATABASE";