@@ -11,6 +11,7 @@ import java.util.List; import com.android.email.Email; import com.android.email.Utility; import com.android.email.mail.MessagingException; +import org.apache.james.mime4j.codec.EncoderUtil; public class MimeHeader { /** @@ -97,12 +98,35 @@ public class MimeHeader { BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out), 1024); for (Field field : mFields) { if (!Utility.arrayContains(writeOmitFields, field.name)) { - writer.write(field.name + ": " + field.value + "\r\n"); + String v = field.value; + + if (hasToBeEncoded(v)) { + v = EncoderUtil.encodeEncodedWord( + field.value, + EncoderUtil.Usage.WORD_ENTITY + ); + } + + writer.write(field.name + ": " + v + "\r\n"); } } writer.flush(); } + // encode non printable characters except LF/CR codes. + public boolean hasToBeEncoded(String text) { + for (int i = 0; i < text.length(); i++) { + char c = text.charAt(i); + if (c < 0x20 || 0x7e < c) { // non printable + if (c != 0x0a && c != 0x0d) { // non LF/CR + return true; + } + } + } + + return false; + } + class Field { String name; src/com/android/email/mail/internet/MimeHeader.java c544904faf9f9120478b7bb797673957c0de1576 Daisuke Murase typester@cpan.org http://github.com/typester/android-k9mail/commit/9c37dbdf51ec8ef009b4c6564b0cddcf5f25cbc7 9c37dbdf51ec8ef009b4c6564b0cddcf5f25cbc7 2009-07-01T04:43:10-07:00 2009-07-01T04:43:10-07:00 Added adhoc header encode feature bbe21698928d2ab4c4b88229a490c4796df48255 Daisuke Murase typester@cpan.org