Merge "Prepare for a forthcoming change in AutoValue."

This commit is contained in:
Dave Borowitz
2017-02-21 14:13:40 +00:00
committed by Gerrit Code Review

View File

@@ -61,8 +61,12 @@ public class RawMailParser {
throw new MailParsingException("Can't parse email", e); throw new MailParsingException("Can't parse email", e);
} }
// Add general headers // Add general headers
messageBuilder.id(mimeMessage.getMessageId()); if (mimeMessage.getMessageId() != null) {
messageBuilder.subject(mimeMessage.getSubject()); messageBuilder.id(mimeMessage.getMessageId());
}
if (mimeMessage.getSubject() != null) {
messageBuilder.subject(mimeMessage.getSubject());
}
messageBuilder.dateReceived(new DateTime(mimeMessage.getDate())); messageBuilder.dateReceived(new DateTime(mimeMessage.getDate()));
// Add From, To and Cc // Add From, To and Cc