diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-16 19:54:57 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-16 19:54:57 +0200 |
commit | 6624d1f8304a07ac43e7f22a138262bba9782758 (patch) | |
tree | 6e37299002a48c0264cfd6b19a19249b2790dfd8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java | |
parent | ece06b1933c26688d2eb6b7fa8657acbb8833728 (diff) | |
download | open-keychain-6624d1f8304a07ac43e7f22a138262bba9782758.tar.gz open-keychain-6624d1f8304a07ac43e7f22a138262bba9782758.tar.bz2 open-keychain-6624d1f8304a07ac43e7f22a138262bba9782758.zip |
mime: respect charset header (default to utf-8)
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 | 7 |
1 files changed, 3 insertions, 4 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 dda15f382..007f686e8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java @@ -556,12 +556,12 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp originalFilename, mimeType, literalData.getModificationTime().getTime(), - originalSize == null ? 0 : originalSize); + originalSize == null ? 0 : originalSize, + charset); log.add(LogType.MSG_DC_OK_META_ONLY, indent); DecryptVerifyResult result = new DecryptVerifyResult(DecryptVerifyResult.RESULT_OK, log); - result.setCharset(charset); result.setDecryptionMetadata(metadata); return result; } @@ -607,7 +607,7 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp } metadata = new OpenPgpMetadata( - originalFilename, mimeType, literalData.getModificationTime().getTime(), alreadyWritten); + originalFilename, mimeType, literalData.getModificationTime().getTime(), alreadyWritten, charset); if (signature != null) { updateProgress(R.string.progress_verifying_signature, 90, 100); @@ -663,7 +663,6 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp result.setCachedCryptoInputParcel(cryptoInput); result.setSignatureResult(signatureResultBuilder.build()); - result.setCharset(charset); result.setDecryptionResult(decryptionResultBuilder.build()); result.setDecryptionMetadata(metadata); |