From e93510b4b33b2bf4f4adda36fad1c03ab86f9a87 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 6 Nov 2011 18:14:35 -0800 Subject: [PATCH] Avoid string concatenation in Writer.write --- src/com/fsck/k9/mail/internet/MimeHeader.java | 5 ++++- src/com/fsck/k9/mail/internet/MimeMultipart.java | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java index 35594cdac..20002feb3 100644 --- a/src/com/fsck/k9/mail/internet/MimeHeader.java +++ b/src/com/fsck/k9/mail/internet/MimeHeader.java @@ -109,7 +109,10 @@ public class MimeHeader { v = EncoderUtil.encodeEncodedWord(field.value, charset); } - writer.write(field.name + ": " + v + "\r\n"); + writer.write(field.name); + writer.write(": "); + writer.write(v); + writer.write("\r\n"); } } writer.flush(); diff --git a/src/com/fsck/k9/mail/internet/MimeMultipart.java b/src/com/fsck/k9/mail/internet/MimeMultipart.java index abcd6b510..dec82461b 100644 --- a/src/com/fsck/k9/mail/internet/MimeMultipart.java +++ b/src/com/fsck/k9/mail/internet/MimeMultipart.java @@ -70,22 +70,29 @@ public class MimeMultipart extends Multipart { BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out), 1024); if (mPreamble != null) { - writer.write(mPreamble + "\r\n"); + writer.write(mPreamble); + writer.write("\r\n"); } if (mParts.isEmpty()) { - writer.write("--" + mBoundary + "\r\n"); + writer.write("--"); + writer.write(mBoundary); + writer.write("\r\n"); } for (int i = 0, count = mParts.size(); i < count; i++) { BodyPart bodyPart = mParts.get(i); - writer.write("--" + mBoundary + "\r\n"); + writer.write("--"); + writer.write(mBoundary); + writer.write("\r\n"); writer.flush(); bodyPart.writeTo(out); writer.write("\r\n"); } - writer.write("--" + mBoundary + "--\r\n"); + writer.write("--"); + writer.write(mBoundary); + writer.write("--\r\n"); writer.flush(); }