moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 19:22:22 -05:00
Code Issues Releases Wiki Activity

IMAP: fix from kolos_dm: In-Reply-To is not email header and unfold header to remove CRLF in ENVELOPE response

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1503 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-10-14 20:36:48 +00:00
parent c22b26b41e
commit 5f2dd31203
1 changed files with 1678 additions and 1677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/java/davmail/imap/ImapConnection.java
View File

@ -876,13 +876,13 @@ public class ImapConnection extends AbstractConnection {
// Envelope for date, subject, from, sender, reply-to, to, cc, bcc,in-reply-to, message-id // Envelope for date, subject, from, sender, reply-to, to, cc, bcc,in-reply-to, message-id
appendEnvelopeHeader(buffer, mimeMessage.getHeader("Date")); appendEnvelopeHeader(buffer, mimeMessage.getHeader("Date"));
appendEnvelopeHeader(buffer, mimeMessage.getHeader("Subject")); appendEnvelopeHeader(buffer, mimeMessage.getHeader("Subject"));
appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("From", ",")); appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("From"));
appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("Sender", ",")); appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("Sender"));
appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("Reply-To", ",")); appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("Reply-To"));
appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("To", ",")); appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("To"));
appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("CC", ",")); appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("CC"));
appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("BCC", ",")); appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("BCC"));
appendMailEnvelopeHeader(buffer, mimeMessage.getHeader("In-Reply-To", ",")); appendEnvelopeHeader(buffer, mimeMessage.getHeader("In-Reply-To"));
appendEnvelopeHeader(buffer, mimeMessage.getHeader("Message-Id")); appendEnvelopeHeader(buffer, mimeMessage.getHeader("Message-Id"));
} catch (MessagingException me) { } catch (MessagingException me) {
@ -912,11 +912,12 @@ public class ImapConnection extends AbstractConnection {
} }
} }
protected void appendMailEnvelopeHeader(StringBuilder buffer, String value) { protected void appendMailEnvelopeHeader(StringBuilder buffer, String[] value) {
buffer.append(' '); buffer.append(' ');
if (value != null) { if (value != null && value.length > 0) {
try { try {
InternetAddress[] addresses = InternetAddress.parseHeader(value, false); String unfoldedValue = MimeUtility.unfold(value[0]);
InternetAddress[] addresses = InternetAddress.parseHeader(unfoldedValue, false);
buffer.append('('); buffer.append('(');
for (InternetAddress address : addresses) { for (InternetAddress address : addresses) {
buffer.append('('); buffer.append('(');
@ -1008,28 +1009,28 @@ public class ImapConnection extends AbstractConnection {
buffer.append("(\"").append(contentType.substring(0, slashIndex).toUpperCase()).append("\" \""); buffer.append("(\"").append(contentType.substring(0, slashIndex).toUpperCase()).append("\" \"");
int semiColonIndex = contentType.indexOf(';'); int semiColonIndex = contentType.indexOf(';');
if (semiColonIndex < 0) { if (semiColonIndex < 0) {
buffer.append(contentType.substring(slashIndex + 1).toUpperCase()).append("\" ()"); buffer.append(contentType.substring(slashIndex + 1).toUpperCase()).append("\" NIL");
} else { } else {
// extended content type // extended content type
buffer.append(contentType.substring(slashIndex + 1, semiColonIndex).trim().toUpperCase()).append('\"'); buffer.append(contentType.substring(slashIndex + 1, semiColonIndex).trim().toUpperCase()).append('\"');
int charsetindex = contentType.indexOf("charset="); int charsetindex = contentType.indexOf("charset=");
if (charsetindex >= 0) { if (charsetindex >=0) {
buffer.append(" (\"CHARSET\" "); buffer.append(" (\"CHARSET\" ");
int charsetSemiColonIndex = contentType.indexOf(';', charsetindex); int charsetSemiColonIndex = contentType.indexOf(';', charsetindex);
int charsetEndIndex; int charsetEndIndex;
if (charsetSemiColonIndex > 0) { if (charsetSemiColonIndex > 0) {
charsetEndIndex = charsetSemiColonIndex; charsetEndIndex = charsetSemiColonIndex;
} else { } else {
charsetEndIndex = contentType.length(); charsetEndIndex = contentType.length();
} }
String charSet = contentType.substring(charsetindex + "charset=".length(), charsetEndIndex); String charSet = contentType.substring(charsetindex + "charset=".length(), charsetEndIndex);
if (!charSet.startsWith("\"")) { if (!charSet.startsWith("\"")) {
buffer.append('"'); buffer.append('"');
} }
buffer.append(charSet.trim().toUpperCase()); buffer.append(charSet.trim().toUpperCase());
if (!charSet.endsWith("\"")) { if (!charSet.endsWith("\"")) {
buffer.append('"'); buffer.append('"');
} }
buffer.append(')'); buffer.append(')');
} else { } else {
buffer.append(" NIL"); buffer.append(" NIL");