diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 19:56:04 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 19:56:04 +0200 |
| commit | a5ff2f8fe3def958026df0716799f99b40900b3f (patch) | |
| tree | 356a5cf2bbba54c927f1bd1505475947ecd952bc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |
| parent | 81283a2967a89a86f1bdd2edc2bdc5bf43a8c6b4 (diff) | |
| download | open-keychain-a5ff2f8fe3def958026df0716799f99b40900b3f.tar.gz open-keychain-a5ff2f8fe3def958026df0716799f99b40900b3f.tar.bz2 open-keychain-a5ff2f8fe3def958026df0716799f99b40900b3f.zip | |
Mime type consistency
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index e76db157e..e59874254 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -44,13 +44,14 @@ public final class Constants { public static final String CLIPBOARD_LABEL = "Keychain"; - // as defined in http://tools.ietf.org/html/rfc3156, section 7 - public static final String NFC_MIME = "application/pgp-keys"; - // as defined in http://tools.ietf.org/html/rfc3156 - // we don't use application/pgp-encrypted as it only holds the version number - public static final String ENCRYPTED_FILES_MIME = "application/octet-stream"; - public static final String ENCRYPTED_TEXT_MIME = "text/plain"; + public static final String MIME_TYPE_KEYS = "application/pgp-keys"; + // NOTE: don't use application/pgp-encrypted It only holds the version number! + public static final String MIME_TYPE_ENCRYPTED = "application/octet-stream"; + // NOTE: Non-standard alternative, better use this, because application/octet-stream is too unspecific! + // also see https://tools.ietf.org/html/draft-bray-pgp-message-00 + public static final String MIME_TYPE_ENCRYPTED_ALTERNATE = "application/pgp-message"; + public static final String MIME_TYPE_TEXT = "text/plain"; public static final String FILE_EXTENSION_PGP_MAIN = ".pgp"; public static final String FILE_EXTENSION_PGP_ALTERNATE = ".gpg"; |