diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-06 14:14:54 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-06 14:14:54 +0200 |
| commit | 4813345460fb489b42ee7c5610f9817b976544af (patch) | |
| tree | 20fa3c09b4289c84cf5dc57f5d7ccfafcb260f3c /OpenPGP-Keychain | |
| parent | a18668610940555e96c920684065ec8dca17dbe8 (diff) | |
| download | open-keychain-4813345460fb489b42ee7c5610f9817b976544af.tar.gz open-keychain-4813345460fb489b42ee7c5610f9817b976544af.tar.bz2 open-keychain-4813345460fb489b42ee7c5610f9817b976544af.zip | |
Use mime type in NFC as defined in RFC3156
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | OpenPGP-Keychain/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"; |