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

make send date and timezone hiding build parameters in MessageBuilder

Browse source
This commit is contained in:
Vincent Breitmoser 2016-08-08 21:52:12 +02:00
parent 874b981ba6
commit cd011349fe
4 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
View file

@ -1,6 +1,7 @@
package com.fsck.k9.activity;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@ -728,6 +729,8 @@ public class MessageCompose extends K9Activity implements OnClickListener,
}
builder.setSubject(mSubjectView.getText().toString())
.setSentDate(new Date())
.setHideTimeZone(K9.hideTimeZone())
.setTo(recipientPresenter.getToAddresses())
.setCc(recipientPresenter.getCcAddresses())
.setBcc(recipientPresenter.getBccAddresses())

14
k9mail/src/main/java/com/fsck/k9/message/MessageBuilder.java
View file

@ -45,6 +45,8 @@ public abstract class MessageBuilder {
private String subject;
private Date sentDate;
private boolean hideTimeZone;
private Address[] to;
private Address[] cc;
private Address[] bcc;
@ -91,7 +93,7 @@ public abstract class MessageBuilder {
}
private void buildHeader(MimeMessage message) throws MessagingException {
message.addSentDate(new Date(), K9.hideTimeZone());
message.addSentDate(sentDate, hideTimeZone);
Address from = new Address(identity.getEmail(), identity.getName());
message.setFrom(from);
message.setRecipients(RecipientType.TO, to);
@ -338,6 +340,16 @@ public abstract class MessageBuilder {
return this;
}
public MessageBuilder setSentDate(Date sentDate) {
this.sentDate = sentDate;
return this;
}
public MessageBuilder setHideTimeZone(boolean hideTimeZone) {
this.hideTimeZone = hideTimeZone;
return this;
}
public MessageBuilder setTo(List<Address> to) {
this.to = to.toArray(new Address[to.size()]);
return this;

28
k9mail/src/test/java/com/fsck/k9/message/MessageBuilderTest.java
View file

@ -5,6 +5,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.Locale;
import java.util.UUID;
import android.app.Application;
@ -58,6 +60,26 @@ public class MessageBuilderTest {
public static final String BOUNDARY_2 = "----boundary2";
public static final String BOUNDARY_3 = "----boundary3";
public static final Date SENT_DATE = new Date(10000000000L);
public static final String MESSAGE_HEADERS =
"Date: Sun, 26 Apr 1970 18:46:40 +0100\r\n" +
"From: tester <test@example.org>\r\n" +
"To: recip 1 <to1@example.org>,recip 2 <to2@example.org>\r\n" +
"CC: cc recip <cc@example.org>\r\n" +
"BCC: bcc recip <bcc@example.org>\r\n" +
"Subject: test_subject\r\n" +
"User-Agent: K-9 Mail for Android\r\n" +
"In-Reply-To: inreplyto\r\n" +
"References: references\r\n" +
"Message-ID: <" + TEST_UUID.toString().toUpperCase(Locale.ENGLISH) + "@example.org>\r\n" +
"MIME-Version: 1.0\r\n";
public static final String MESSAGE_CONTENT =
"Content-Type: text/plain;\r\n" +
" charset=utf-8\r\n" +
"Content-Transfer-Encoding: 8bit\r\n" +
"\r\n" + TEST_MESSAGE_TEXT;
private Application context;
private UUIDGenerator uuidGenerator;
private BoundaryGenerator boundaryGenerator;
@ -94,6 +116,10 @@ public class MessageBuilderTest {
assertArrayEquals(TEST_TO, mimeMessage.getRecipients(RecipientType.TO));
assertArrayEquals(TEST_CC, mimeMessage.getRecipients(RecipientType.CC));
assertArrayEquals(TEST_BCC, mimeMessage.getRecipients(RecipientType.BCC));
ByteArrayOutputStream bos = new ByteArrayOutputStream();
mimeMessage.writeTo(bos);
assertEquals(MESSAGE_HEADERS + MESSAGE_CONTENT, bos.toString());
}
@Test
@ -169,6 +195,8 @@ public class MessageBuilderTest {
identity.setSignatureUse(false);
b.setSubject(TEST_SUBJECT)
.setSentDate(SENT_DATE)
.setHideTimeZone(false)
.setTo(Arrays.asList(TEST_TO))
.setCc(Arrays.asList(TEST_CC))
.setBcc(Arrays.asList(TEST_BCC))

3
k9mail/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.java
View file

@ -8,6 +8,7 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import android.app.Activity;
import android.app.PendingIntent;
@ -426,6 +427,8 @@ public class PgpMessageBuilderTest {
identity.setSignatureUse(false);
b.setSubject("subject")
.setSentDate(new Date())
.setHideTimeZone(false)
.setTo(new ArrayList<Address>())
.setCc(new ArrayList<Address>())
.setBcc(new ArrayList<Address>())