Small refactoring of MessageBuilder

This commit is contained in:
cketti 2015-03-03 00:26:43 +01:00
parent cb0a99281a
commit 2a404b30d2
1 changed files with 12 additions and 4 deletions

View File

@ -72,6 +72,14 @@ public class MessageBuilder {
//FIXME: check arguments //FIXME: check arguments
MimeMessage message = new MimeMessage(); MimeMessage message = new MimeMessage();
buildHeader(message);
buildBody(message);
return message;
}
private void buildHeader(MimeMessage message) throws MessagingException {
message.addSentDate(new Date(), K9.hideTimeZone()); message.addSentDate(new Date(), K9.hideTimeZone());
Address from = new Address(identity.getEmail(), identity.getName()); Address from = new Address(identity.getEmail(), identity.getName());
message.setFrom(from); message.setFrom(from);
@ -103,6 +111,10 @@ public class MessageBuilder {
message.setReferences(references); message.setReferences(references);
} }
message.generateMessageId();
}
private void buildBody(MimeMessage message) throws MessagingException {
// Build the body. // Build the body.
// TODO FIXME - body can be either an HTML or Text part, depending on whether we're in // TODO FIXME - body can be either an HTML or Text part, depending on whether we're in
// HTML mode or not. Should probably fix this so we don't mix up html and text parts. // HTML mode or not. Should probably fix this so we don't mix up html and text parts.
@ -160,10 +172,6 @@ public class MessageBuilder {
// Add the identity to the message. // Add the identity to the message.
message.addHeader(K9.IDENTITY_HEADER, buildIdentityHeader(body, bodyPlain)); message.addHeader(K9.IDENTITY_HEADER, buildIdentityHeader(body, bodyPlain));
} }
message.generateMessageId();
return message;
} }
public TextBody buildText() { public TextBody buildText() {