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/pgp/PgpDecryptVerifyOperation.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/pgp/PgpDecryptVerifyOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java index 2d28f70e0..4a08ab9c1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java @@ -417,10 +417,10 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp // special treatment to detect pgp mime types if (matchesPrefix(firstBytes, "-----BEGIN PGP PUBLIC KEY BLOCK-----") || matchesPrefix(firstBytes, "-----BEGIN PGP PRIVATE KEY BLOCK-----")) { - mimeType = "application/pgp-keys"; + mimeType = Constants.MIME_TYPE_KEYS; } else if (matchesPrefix(firstBytes, "-----BEGIN PGP MESSAGE-----")) { - // this is NOT pgp/encrypted, see RFC 3156! - mimeType = "application/pgp-message"; + // this is NOT application/pgp-encrypted, see RFC 3156! + mimeType = Constants.MIME_TYPE_ENCRYPTED_ALTERNATE; } log.add(LogType.MSG_DC_CLEAR_META_MIME, indent + 1, mimeType); |