mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-15 14:05:05 -05:00
45e3d8459e
The preceding commit resulted in attachments of type message/rfc822 being
sent with 8bit encoding even when the SMTP server did not support
8BITMIME. This commit assures that messages will be converted to 7bit
when necessary.
A new interface CompositeBody was created that extends Body, and classes
Message and Multipart were changed from implementing Body to
CompositeBody. Additional classes BinaryTempFileMessageBody and
LocalAttachmentMessageBody were created (by extending BinaryTempFileBody
and LocalAttachmentBody, respectively), and they too implement
CompositeBody.
A CompositeBody is a Body containing a composite-type that can contain
subparts that may require recursive processing when converting from 8bit
to 7bit. The Part to which a CompositeBody belongs is only permitted to
use 8bit or 7bit encoding for the CompositeBody.
Previously, a Message was created so that it was 7bit clean by default
(even though that meant base64 encoding all attachments, including
messages). Then, if the SMTP server supported 8BITMIME,
Message.setEncoding("8bit") was called so that bodies of type TextBody
would been transmitted using 8bit encoding rather than quoted-printable.
Now, messages are created with 8bit encoding by default. Then, if the
SMTP server does not support 8BITMIME, Message.setUsing7bitTransport is
called to recursively convert the message and its subparts to 7bit. The
method setUsing7bitTransport was added to the interfaces Part and
CompositeBody.
setEncoding no longer iterates over parts in Multipart. That task belongs
to setUsing7bitTransport, which may in turn call setEncoding on the parts.
MimeUtility.getEncodingforType was created as a helper function for
choosing a default encoding that should be used for a given MIME type when
an attachment is added to a message (either while composing or when
retrieving from LocalStore).
setEncoding was implemented in MimeBodyPart to assure that the encoding
set in the Part's headers was the same as set for the Part's Body. (The
method already existed in MimeMessage, which has similarities with
MimeBodyPart.)
MimeMessage.parse(InputStream in, boolean recurse) was implemented so that
the parser could be told to recursively process nested messages read from
the InputStream, thus giving access to all subparts at any level that may
need to be converted from 8bit to 7bit.
62 lines
2.1 KiB
Java
62 lines
2.1 KiB
Java
package com.fsck.k9.mail.internet;
|
|
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.james.mime4j.util.MimeUtil;
|
|
|
|
import com.fsck.k9.mail.CompositeBody;
|
|
import com.fsck.k9.mail.MessagingException;
|
|
|
|
/**
|
|
* A {@link BinaryTempFileBody} extension containing a body of type
|
|
* message/rfc822. This relates to a BinaryTempFileBody the same way that a
|
|
* {@link LocalAttachmentMessageBody} relates to a {@link LocalAttachmentBody}.
|
|
*
|
|
*/
|
|
public class BinaryTempFileMessageBody extends BinaryTempFileBody implements CompositeBody {
|
|
|
|
@Override
|
|
public void setEncoding(String encoding) throws MessagingException {
|
|
if (!MimeUtil.ENC_7BIT.equalsIgnoreCase(encoding)
|
|
&& !MimeUtil.ENC_8BIT.equalsIgnoreCase(encoding)) {
|
|
throw new MessagingException(
|
|
"Incompatible content-transfer-encoding applied to a CompositeBody");
|
|
}
|
|
mEncoding = encoding;
|
|
}
|
|
|
|
@Override
|
|
public void writeTo(OutputStream out) throws IOException, MessagingException {
|
|
InputStream in = getInputStream();
|
|
try {
|
|
if (MimeUtil.ENC_7BIT.equalsIgnoreCase(mEncoding)) {
|
|
/*
|
|
* If we knew the message was already 7bit clean, then it
|
|
* could be sent along without processing. But since we
|
|
* don't know, we recursively parse it.
|
|
*/
|
|
MimeMessage message = new MimeMessage(in, true);
|
|
message.setUsing7bitTransport();
|
|
message.writeTo(out);
|
|
} else {
|
|
IOUtils.copy(in, out);
|
|
}
|
|
} finally {
|
|
in.close();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void setUsing7bitTransport() throws MessagingException {
|
|
/*
|
|
* There's nothing to recurse into here, so there's nothing to do.
|
|
* The enclosing BodyPart already called setEncoding(MimeUtil.ENC_7BIT). Once
|
|
* writeTo() is called, the file with the rfc822 body will be opened
|
|
* for reading and will then be recursed.
|
|
*/
|
|
|
|
}
|
|
} |