nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mjog/758-missing-message-id' into 'mainline'

Browse source 
Geary.RFC822.Message: Fix Message-Id header not being set

Closes #758

See merge request GNOME/geary!456
This commit is contained in:
Michael Gratton 2020-03-25 03:26:41 +00:00
commit 8dfa262481
2 changed files with 61 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/engine/rfc822/rfc822-message.vala
View file

@ -130,19 +130,22 @@ public class Geary.RFC822.Message : BaseObject, EmailHeaderSet {
this.message = new GMime.Message(true);
// Required headers
assert(email.from.size > 0);
this.sender = email.sender;
this.from = email.from;
this.date = email.date;
this.message.set_date(this.date.value);
if (email.from != null) {
foreach (RFC822.MailboxAddress mailbox in email.from)
this.message.add_mailbox(FROM, mailbox.name, mailbox.address);
this.from = email.from;
foreach (RFC822.MailboxAddress mailbox in email.from) {
this.message.add_mailbox(FROM, mailbox.name, mailbox.address);
}
this.date = email.date;
this.message.set_date(this.date.value);
// Not actually required, but effectively required since
// otherwise mail servers will treat email as spam
this.message_id = new MessageID(message_id);
this.message.set_message_id(message_id);
// Optional headers
if (email.to != null) {
this.to = email.to;
foreach (RFC822.MailboxAddress mailbox in email.to)
@ -162,6 +165,7 @@ public class Geary.RFC822.Message : BaseObject, EmailHeaderSet {
}
if (email.sender != null) {
this.sender = email.sender;
this.message.add_mailbox(SENDER, this.sender.name, this.sender.address);
}

48
test/engine/rfc822-message-test.vala
View file

@ -58,6 +58,7 @@ This is the second line.
add_test("get_searchable_body", get_searchable_body);
add_test("get_searchable_recipients", get_searchable_recipients);
add_test("get_network_buffer", get_network_buffer);
add_test("from_composed_email", from_composed_email);
add_test("from_composed_email_inline_attachments", from_composed_email_inline_attachments);
}
@ -213,6 +214,53 @@ This is the second line.
assert_true(buffer.to_string() == NETWORK_BUFFER_EXPECTED, "Network buffer differs");
}
public void from_composed_email() throws GLib.Error {
RFC822.MailboxAddress to = new RFC822.MailboxAddress(
"Test", "test@example.com"
);
RFC822.MailboxAddress from = new RFC822.MailboxAddress(
"Sender", "sender@example.com"
);
Geary.ComposedEmail composed = new Geary.ComposedEmail(
new GLib.DateTime.now_local(),
new Geary.RFC822.MailboxAddresses.single(from)
).set_to(new Geary.RFC822.MailboxAddresses.single(to));
composed.body_text = "hello";
this.message_from_composed_email.begin(
composed,
async_complete_full
);
Geary.RFC822.Message message = message_from_composed_email.end(async_result());
assert_non_null(message.to, "to");
assert_non_null(message.from, "from");
assert_non_null(message.date, "date");
assert_non_null(message.message_id, "message_id");
string message_data = message.to_string();
assert_true(
message_data.contains("To: Test <test@example.com>\n"),
"to data"
);
assert_true(
message_data.contains("From: Sender <sender@example.com>\n"),
"from data"
);
assert_true(
message_data.contains("Message-Id: "),
"message-id data"
);
assert_true(
message_data.contains("Date: "),
"date data"
);
assert_true(
message_data.contains("hello\n"),
"body data"
);
}
public void from_composed_email_inline_attachments() throws Error {
RFC822.MailboxAddress to = new RFC822.MailboxAddress(
"Test", "test@example.com"