From a5ff2f8fe3def958026df0716799f99b40900b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 15 Oct 2015 19:56:04 +0200
Subject: Mime type consistency

---
 .../sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java')

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);
-- 
cgit v1.2.3