Revert "Fixed nested IMAP message encoding"

This reverts commit 61d078f929.
pull/209/head
M66B 3 years ago
parent 11dcb0c7fd
commit d059c5f6d2

@ -294,8 +294,7 @@ public class IMAPBodyPart extends MimeBodyPart implements ReadableMime {
); );
else if (bs.isNested() && message.isREV1() && bs.envelope != null) else if (bs.isNested() && message.isREV1() && bs.envelope != null)
dh = new DataHandler( dh = new DataHandler(
new IMAPNestedMessage(message, new IMAPNestedMessage(message,
bs.encoding,
bs.bodies[0], bs.bodies[0],
bs.envelope, bs.envelope,
sectionId), sectionId),

@ -830,8 +830,7 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
* FETCH the components of nested messages * FETCH the components of nested messages
*/ */
dh = new DataHandler( dh = new DataHandler(
new IMAPNestedMessage(this, new IMAPNestedMessage(this,
bs.encoding,
bs.bodies[0], bs.bodies[0],
bs.envelope, bs.envelope,
sectionId == null ? "1" : sectionId + ".1"), sectionId == null ? "1" : sectionId + ".1"),
@ -913,11 +912,6 @@ public class IMAPMessage extends MimeMessage implements ReadableMime {
return; return;
} }
InputStream is = getMimeStream(); InputStream is = getMimeStream();
if (this instanceof IMAPNestedMessage) {
String encoding = getEncoding();
if (encoding != null)
is = MimeUtility.decode(is, encoding);
}
try { try {
// write out the bytes // write out the bytes
byte[] bytes = new byte[16*1024]; byte[] bytes = new byte[16*1024];

@ -29,7 +29,6 @@ import com.sun.mail.iap.ProtocolException;
public class IMAPNestedMessage extends IMAPMessage { public class IMAPNestedMessage extends IMAPMessage {
private IMAPMessage msg; // the enclosure of this nested message private IMAPMessage msg; // the enclosure of this nested message
private String encoding;
/** /**
* Package private constructor. <p> * Package private constructor. <p>
@ -37,10 +36,9 @@ public class IMAPNestedMessage extends IMAPMessage {
* Note that nested messages have no containing folder, nor * Note that nested messages have no containing folder, nor
* a message number. * a message number.
*/ */
IMAPNestedMessage(IMAPMessage m, String enc, BODYSTRUCTURE b, ENVELOPE e, String sid) { IMAPNestedMessage(IMAPMessage m, BODYSTRUCTURE b, ENVELOPE e, String sid) {
super(m._getSession()); super(m._getSession());
msg = m; msg = m;
encoding = enc;
bs = b; bs = b;
envelope = e; envelope = e;
sectionId = sid; sectionId = sid;
@ -126,11 +124,6 @@ public class IMAPNestedMessage extends IMAPMessage {
return bs.size; return bs.size;
} }
@Override
public String getEncoding() {
return encoding;
}
/* /*
* Disallow setting flags on nested messages * Disallow setting flags on nested messages
*/ */

Loading…
Cancel
Save