From 03e695c6509ee6ada0ad6a0a21181277ba298c34 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 23 Feb 2016 14:55:23 +0100 Subject: ditch isLikelyText flag, set mimeType to text/plain in that case --- .../keychain/operations/InputDataOperation.java | 4 ++-- .../keychain/pgp/PgpDecryptVerifyOperation.java | 18 +++++++----------- .../keychain/ui/DecryptListFragment.java | 2 +- .../keychain/util/CharsetVerifier.java | 22 +++++++++++++++++----- 4 files changed, 27 insertions(+), 19 deletions(-) (limited to 'OpenKeychain/src/main/java/org') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java index 0de878232..43fc11b84 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java @@ -355,8 +355,8 @@ public class InputDataOperation extends BaseOperation { log.add(LogType.MSG_DATA_MIME_CHARSET, 3, charsetVerifier.getCharset()); } - metadata = new OpenPgpMetadata(mFilename, mimeType, 0L, totalLength, - charsetVerifier.getCharset(), charsetVerifier.isProbablyText()); + metadata = new OpenPgpMetadata(mFilename, charsetVerifier.getGuessedMimeType(), 0L, totalLength, + charsetVerifier.getCharset()); } out.close(); 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 b0d39d88f..e15139a7f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java @@ -417,7 +417,7 @@ public class PgpDecryptVerifyOperation extends BaseOperation