wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1568 from k9mail/TextBody_fix

Browse source 
Fix for TextBody.getSize()
This commit is contained in:
Vincent Breitmoser 2016-08-21 11:21:45 +02:00 committed by GitHub
commit 0180faeee6
2 changed files with 51 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
k9mail-library/src/main/java/com/fsck/k9/mail/internet/TextBody.java
View file

@ -1,9 +1,6 @@
package com.fsck.k9.mail.internet;
import com.fsck.k9.mail.Body;
import com.fsck.k9.mail.K9MailLib;
import com.fsck.k9.mail.MessagingException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@ -14,9 +11,11 @@ import java.io.UnsupportedEncodingException;
import android.support.annotation.Nullable;
import android.util.Log;
import com.fsck.k9.mail.Body;
import com.fsck.k9.mail.K9MailLib;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.filter.CountingOutputStream;
import com.fsck.k9.mail.filter.SignSafeOutputStream;
import org.apache.james.mime4j.codec.QuotedPrintableOutputStream;
import org.apache.james.mime4j.util.MimeUtil;
@ -44,12 +43,7 @@ public class TextBody implements Body, SizeAware {
if (text != null) {
byte[] bytes = text.getBytes(charset);
if (MimeUtil.ENC_QUOTED_PRINTABLE.equalsIgnoreCase(encoding)) {
SignSafeOutputStream signSafeOutputStream = new SignSafeOutputStream(out);
QuotedPrintableOutputStream signSafeQuotedPrintableOutputStream =
new QuotedPrintableOutputStream(signSafeOutputStream, false);
signSafeQuotedPrintableOutputStream.write(bytes);
signSafeQuotedPrintableOutputStream.flush();
signSafeOutputStream.flush();
writeSignSafeQuotedPrintable(out, bytes);
} else if (MimeUtil.ENC_8BIT.equalsIgnoreCase(encoding)) {
out.write(bytes);
} else {
@ -130,18 +124,25 @@ public class TextBody implements Body, SizeAware {
private long getLengthWhenQuotedPrintableEncoded(byte[] bytes) throws IOException {
CountingOutputStream countingOutputStream = new CountingOutputStream();
OutputStream quotedPrintableOutputStream = new QuotedPrintableOutputStream(countingOutputStream, false);
try {
quotedPrintableOutputStream.write(bytes);
} finally {
try {
quotedPrintableOutputStream.close();
} catch (IOException e) { /* ignore */ }
}
writeSignSafeQuotedPrintable(countingOutputStream, bytes);
return countingOutputStream.getCount();
}
private void writeSignSafeQuotedPrintable(OutputStream out, byte[] bytes) throws IOException {
SignSafeOutputStream signSafeOutputStream = new SignSafeOutputStream(out);
try {
QuotedPrintableOutputStream signSafeQuotedPrintableOutputStream =
new QuotedPrintableOutputStream(signSafeOutputStream, false);
try {
signSafeQuotedPrintableOutputStream.write(bytes);
} finally {
signSafeQuotedPrintableOutputStream.close();
}
} finally {
signSafeOutputStream.close();
}
}
public String getEncoding() {
return encoding;
}

31
k9mail-library/src/test/java/com/fsck/k9/mail/internet/TextBodyTest.java Normal file
View file

@ -0,0 +1,31 @@
package com.fsck.k9.mail.internet;
import java.io.IOException;
import com.fsck.k9.mail.MessagingException;
import okio.Buffer;
import org.apache.james.mime4j.util.MimeUtil;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class TextBodyTest {
@Test
public void getSize_withSignUnsafeData_shouldReturnCorrectValue() throws Exception {
TextBody textBody = new TextBody("From Bernd");
textBody.setEncoding(MimeUtil.ENC_QUOTED_PRINTABLE);
long result = textBody.getSize();
int outputSize = getSizeOfSerializedBody(textBody);
assertEquals(outputSize, result);
}
private int getSizeOfSerializedBody(TextBody textBody) throws IOException, MessagingException {
Buffer buffer = new Buffer();
textBody.writeTo(buffer.outputStream());
return buffer.readByteString().size();
}
}