diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-22 21:12:36 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-22 21:58:31 +0100 |
commit | daf243082c6cd7fb7f518bfbf0acf9acafaa27d1 (patch) | |
tree | 44b4f3ba716e943d72f51f24504355b1b7e383a2 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | bdae99c0847556dd8103f172fc1836eb83ae4c4a (diff) | |
download | open-keychain-daf243082c6cd7fb7f518bfbf0acf9acafaa27d1.tar.gz open-keychain-daf243082c6cd7fb7f518bfbf0acf9acafaa27d1.tar.bz2 open-keychain-daf243082c6cd7fb7f518bfbf0acf9acafaa27d1.zip |
externalize CharsetVerifier, add looksLikeText to OpenPgpMetadata object
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java | 19 |
1 files changed, 8 insertions, 11 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 c4755c7c5..59ba8df5f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java @@ -377,9 +377,11 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp originalFilename = ""; } String mimeType = null; + boolean looksLikeText; if (literalData.getFormat() == PGPLiteralData.TEXT || literalData.getFormat() == PGPLiteralData.UTF8) { mimeType = "text/plain"; + looksLikeText = true; } else { // try to guess from file ending String extension = MimeTypeMap.getFileExtensionFromUrl(originalFilename); @@ -390,6 +392,7 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp if (mimeType == null) { mimeType = "application/octet-stream"; } + looksLikeText = false; } if (!"".equals(originalFilename)) { @@ -414,11 +417,9 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp } metadata = new OpenPgpMetadata( - originalFilename, - mimeType, + originalFilename, mimeType, literalData.getModificationTime().getTime(), - originalSize == null ? 0 : originalSize, - charset); + originalSize == null ? 0 : originalSize, charset, false); log.add(LogType.MSG_DC_OK_META_ONLY, indent); DecryptVerifyResult result = @@ -490,8 +491,8 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp log.add(LogType.MSG_DC_CLEAR_META_MIME, indent + 1, mimeType); - metadata = new OpenPgpMetadata( - originalFilename, mimeType, literalData.getModificationTime().getTime(), alreadyWritten, charset); + metadata = new OpenPgpMetadata(originalFilename, mimeType, literalData.getModificationTime().getTime(), + alreadyWritten, charset, looksLikeText); indent -= 1; @@ -873,11 +874,7 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp log.add(LogType.MSG_DC_OK, indent); - OpenPgpMetadata metadata = new OpenPgpMetadata( - "", - "text/plain", - -1, - clearText.length); + OpenPgpMetadata metadata = new OpenPgpMetadata("", "text/plain", -1, clearText.length, "utf-8", true); DecryptVerifyResult result = new DecryptVerifyResult(DecryptVerifyResult.RESULT_OK, log); result.setSignatureResult(signatureChecker.getSignatureResult()); |