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

Closes #6419 Don't use ComposedEmail to open ComposerWindow

Browse source
This commit is contained in:
Robert Schroll 2013-03-08 14:54:59 -08:00 • committed by Eric Gregory
parent c054a2ffc7
commit 4c069df348
7 changed files with 224 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

232
src/engine/api/geary-composed-email.vala
View file

@ -21,20 +21,20 @@ public class Geary.ComposedEmail : BaseObject {
public RFC822.MailboxAddresses? to { get; set; default = null; }
public RFC822.MailboxAddresses? cc { get; set; default = null; }
public RFC822.MailboxAddresses? bcc { get; set; default = null; }
public RFC822.MessageID? in_reply_to { get; set; default = null; }
public string? in_reply_to { get; set; default = null; }
public Geary.Email? reply_to_email { get; set; default = null; }
public RFC822.MessageIDList? references { get; set; default = null; }
public RFC822.Subject? subject { get; set; default = null; }
public RFC822.Text? body_text { get; set; default = null; }
public RFC822.Text? body_html { get; set; default = null; }
public string? references { get; set; default = null; }
public string? subject { get; set; default = null; }
public string? body_text { get; set; default = null; }
public string? body_html { get; set; default = null; }
public string? mailer { get; set; default = null; }
public Gee.Set<File> attachment_files { get; private set;
default = new Gee.HashSet<File>(File.hash, (EqualFunc) File.equal); }
public ComposedEmail(DateTime date, RFC822.MailboxAddresses from,
RFC822.MailboxAddresses? to = null, RFC822.MailboxAddresses? cc = null,
RFC822.MailboxAddresses? bcc = null, RFC822.Subject? subject = null,
RFC822.Text? body_text = null, RFC822.Text? body_html = null) {
RFC822.MailboxAddresses? bcc = null, string? subject = null,
string? body_text = null, string? body_html = null) {
this.date = date;
this.from = from;
this.to = to;
@ -44,223 +44,5 @@ public class Geary.ComposedEmail : BaseObject {
this.body_text = body_text;
this.body_html = body_html;
}
public ComposedEmail.as_reply(DateTime date, RFC822.MailboxAddresses from, Geary.Email source) {
this (date, from);
assert(source.fields.fulfills(REQUIRED_REPLY_FIELDS));
string? sender_address = (from.size > 0 ? from.get_all().first().address : null);
to = create_to_addresses_for_reply(source, sender_address);
subject = create_subject_for_reply(source);
set_reply_references(source);
body_text = new RFC822.Text(new Geary.Memory.StringBuffer("\n\n" +
Geary.RFC822.Utils.quote_email_for_reply(source, false)));
body_html = new RFC822.Text(new Geary.Memory.StringBuffer("\n\n" +
Geary.RFC822.Utils.quote_email_for_reply(source, true)));
add_attachments_from_source(source);
}
public ComposedEmail.as_reply_all(DateTime date, RFC822.MailboxAddresses from, Geary.Email source) {
this (date, from);
assert(source.fields.fulfills(REQUIRED_REPLY_FIELDS));
string? sender_address = (from.size > 0 ? from.get_all().first().address : null);
to = create_to_addresses_for_reply(source, sender_address);
cc = create_cc_addresses_for_reply_all(source, sender_address);
subject = create_subject_for_reply(source);
set_reply_references(source);
body_text = new RFC822.Text(new Geary.Memory.StringBuffer("\n\n" +
Geary.RFC822.Utils.quote_email_for_reply(source, false)));
body_html = new RFC822.Text(new Geary.Memory.StringBuffer("\n\n" +
Geary.RFC822.Utils.quote_email_for_reply(source, true)));
add_attachments_from_source(source);
}
public ComposedEmail.as_forward(DateTime date, RFC822.MailboxAddresses from, Geary.Email source) {
this (date, from);
subject = create_subject_for_forward(source);
body_text = new RFC822.Text(new Geary.Memory.StringBuffer("\n\n" +
Geary.RFC822.Utils.quote_email_for_forward(source, false)));
body_html = new RFC822.Text(new Geary.Memory.StringBuffer("\n\n" +
Geary.RFC822.Utils.quote_email_for_forward(source, true)));
add_attachments_from_source(source);
}
private void add_attachments_from_source(Geary.Email source) {
foreach (Geary.Attachment attachment in source.attachments) {
File? attachment_file = File.new_for_path(attachment.filepath);
if (attachment_file != null)
attachment_files.add(attachment_file);
}
}
public ComposedEmail.from_mailto(string mailto, RFC822.MailboxAddresses default_from) {
DateTime date = new DateTime.now_local();
RFC822.MailboxAddresses from = default_from;
RFC822.MailboxAddresses? to = null;
RFC822.MailboxAddresses? cc = null;
RFC822.MailboxAddresses? bcc = null;
RFC822.Subject? subject = null;
RFC822.Text? body_text = null;
RFC822.Text? body_html = null;
Gee.HashMultiMap<string, string> headers = new Gee.HashMultiMap<string, string>();
if (mailto.length > MAILTO_SCHEME.length) {
// Parse the mailto link.
string[] parts = mailto.substring(MAILTO_SCHEME.length).split("?", 2);
string email = Uri.unescape_string(parts[0]);
string[] params = parts.length == 2 ? parts[1].split("&") : new string[0];
foreach (string param in params) {
string[] param_parts = param.split("=", 2);
if (param_parts.length == 2) {
headers.set(Uri.unescape_string(param_parts[0]).down(),
Uri.unescape_string(param_parts[1]));
}
}
// Assemble the headers.
if (headers.contains("from")) {
from = new RFC822.MailboxAddresses.from_rfc822_string(
Geary.Collection.get_first(headers.get("from")));
}
if (email.length > 0 && headers.contains("to")) {
to = new RFC822.MailboxAddresses.from_rfc822_string("%s,%s".printf(email,
Geary.Collection.get_first(headers.get("to"))));
} else if (email.length > 0) {
to = new RFC822.MailboxAddresses.from_rfc822_string(email);
} else if (headers.contains("to")) {
to = new RFC822.MailboxAddresses.from_rfc822_string(
Geary.Collection.get_first(headers.get("to")));
}
if (headers.contains("cc")) {
cc = new RFC822.MailboxAddresses.from_rfc822_string(
Geary.Collection.get_first(headers.get("cc")));
}
if (headers.contains("bcc")) {
bcc = new RFC822.MailboxAddresses.from_rfc822_string(
Geary.Collection.get_first(headers.get("bcc")));
}
if (headers.contains("subject")) {
subject = new RFC822.Subject(Geary.Collection.get_first(headers.get("subject")));
}
if (headers.contains("body")) {
string body = Geary.Collection.get_first(headers.get("body"));
body_text = new RFC822.Text(new Geary.Memory.StringBuffer(body));
body_html = new RFC822.Text(new Geary.Memory.StringBuffer(
Geary.HTML.preserve_whitespace(Geary.HTML.escape_markup(body))));
}
}
// And construct!
this(date, from, to, cc, bcc, subject, body_text, body_html);
// Add attachments directly to public member ... need to call base constructor before doing
// so
foreach (string attachment in headers.get("attach")) {
attachment_files.add(File.new_for_uri(attachment));
}
foreach (string attachment in headers.get("attachment")) {
attachment_files.add(File.new_for_uri(attachment));
}
}
private void set_reply_references(Geary.Email source) {
in_reply_to = source.message_id;
reply_to_email = source;
// generate list for References
Gee.ArrayList<RFC822.MessageID> list = new Gee.ArrayList<RFC822.MessageID>();
// 1. Start with the source's References list
if (source.references != null && source.references.list.size > 0)
list.add_all(source.references.list);
// 2. If there's an In-Reply-To Message-ID and it's not the last Message-ID on the
// References list, append it
if (source.in_reply_to != null && list.size > 0 && !list.last().equals(source.in_reply_to))
list.add(source.in_reply_to);
// 3. Append the source's Message-ID, if available.
if (source.message_id != null)
list.add(source.message_id);
references = (list.size > 0) ? new RFC822.MessageIDList.from_list(list) : null;
}
private Geary.RFC822.Subject create_subject_for_reply(Geary.Email email) {
return (email.subject ?? new Geary.RFC822.Subject("")).create_reply();
}
private Geary.RFC822.Subject create_subject_for_forward(Geary.Email email) {
return (email.subject ?? new Geary.RFC822.Subject("")).create_forward();
}
// Removes address from the list of addresses. If the list contains only the given address, the
// behavior depends on empty_ok: if true the list will be emptied, otherwise it will leave the
// address in the list once. Used to remove the sender's address from a list of addresses being
// created for the "reply to" recipients.
private static void remove_address(Gee.List<Geary.RFC822.MailboxAddress> addresses,
string address, bool empty_ok = false) {
for (int i = 0; i < addresses.size; ++i) {
if (addresses[i].address == address && (empty_ok || addresses.size > 1))
addresses.remove_at(i--);
}
}
private Geary.RFC822.MailboxAddresses? create_to_addresses_for_reply(Geary.Email email,
string? sender_address = null) {
Gee.List<Geary.RFC822.MailboxAddress> new_to =
new Gee.ArrayList<Geary.RFC822.MailboxAddress>();
// If we're replying to something we sent, send it to the same people we originally did.
// Otherwise, we'll send to the reply-to address or the from address.
if (email.to != null && !String.is_empty(sender_address) && email.from.contains(sender_address))
new_to.add_all(email.to.get_all());
else if (email.reply_to != null)
new_to.add_all(email.reply_to.get_all());
else if (email.from != null)
new_to.add_all(email.from.get_all());
// Exclude the current sender. No need to receive the mail they're sending.
if (!String.is_empty(sender_address))
remove_address(new_to, sender_address);
return new_to.size > 0 ? new Geary.RFC822.MailboxAddresses(new_to) : null;
}
private Geary.RFC822.MailboxAddresses? create_cc_addresses_for_reply_all(Geary.Email email,
string? sender_address = null) {
Gee.List<Geary.RFC822.MailboxAddress> new_cc = new Gee.ArrayList<Geary.RFC822.MailboxAddress>();
// If we're replying to something we received, also add other recipients. Don't do this for
// emails we sent, since everyone we sent it to is already covered in
// create_to_addresses_for_reply().
if (email.to != null && (String.is_empty(sender_address) ||
!email.from.contains(sender_address)))
new_cc.add_all(email.to.get_all());
if (email.cc != null)
new_cc.add_all(email.cc.get_all());
// Again, exclude the current sender.
if (!String.is_empty(sender_address))
remove_address(new_cc, sender_address, true);
return new_cc.size > 0 ? new Geary.RFC822.MailboxAddresses(new_cc) : null;
}
}