[geary/wip/714922-multiple-addresses] Calculate and preselect preferred From address

[Charles Lindsay <clindsay src gnome org>]

commit b2992c9b22b81b7c9eccadb97e612997f5a5b1de
Author: Charles Lindsay <chaz yorba org>
Date:   Fri Mar 21 14:51:41 2014 -0700

    Calculate and preselect preferred From address

 src/client/composer/composer-window.vala |   48 ++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 6 deletions(-)
---
diff --git a/src/client/composer/composer-window.vala b/src/client/composer/composer-window.vala
index 636be6d..af3ac14 100644
--- a/src/client/composer/composer-window.vala
+++ b/src/client/composer/composer-window.vala
@@ -187,6 +187,7 @@ public class ComposerWindow : Gtk.Window {
     private bool action_flag = false;
     private bool is_attachment_overlay_visible = false;
     private Gee.List<Geary.Attachment>? pending_attachments = null;
+    private string? preferred_from_address = null;
     
     private Geary.FolderSupport.Create? drafts_folder = null;
     private Geary.EmailIdentifier? draft_id = null;
@@ -336,7 +337,9 @@ public class ComposerWindow : Gtk.Window {
         from_multiple.changed.connect(on_from_changed);
         
         if (referred != null) {
-           switch (compose_type) {
+            set_preferred_from_address(referred, compose_type);
+            
+            switch (compose_type) {
                 case ComposeType.NEW_MESSAGE:
                     if (referred.to != null)
                         to = referred.to.to_rfc822_string();
@@ -518,6 +521,32 @@ public class ComposerWindow : Gtk.Window {
         }
     }
     
+    private bool check_preferred_from_address(Gee.List<string> account_addresses,
+        Geary.RFC822.MailboxAddresses? referred_addresses) {
+        if (referred_addresses != null) {
+            foreach (string address in account_addresses) {
+                if (referred_addresses.contains(address)) {
+                    preferred_from_address = address;
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
+    private void set_preferred_from_address(Geary.Email referred, ComposeType compose_type) {
+        if (compose_type == ComposeType.NEW_MESSAGE) {
+            if (referred.from != null)
+                preferred_from_address = referred.from.to_rfc822_string();
+        } else {
+            Gee.List<string> account_addresses = account.information.get_all_email_addresses();
+            if (!check_preferred_from_address(account_addresses, referred.to)) {
+                if (!check_preferred_from_address(account_addresses, referred.cc))
+                    check_preferred_from_address(account_addresses, referred.bcc);
+            }
+        }
+    }
+    
     private void on_load_finished(WebKit.WebFrame frame) {
         WebKit.DOM.HTMLElement? body = editor.get_dom_document().get_element_by_id(
             BODY_ID) as WebKit.DOM.HTMLElement;
@@ -1648,6 +1677,8 @@ public class ComposerWindow : Gtk.Window {
         from_multiple.append_text(account.information.get_primary_mailbox_address().to_rfc822_string());
         from_list.add(new FromAddressMap(account, account.information.email));
         
+        bool set_active = false;
+        int index = 1; // We already inserted the main address.
         if (account.information.alternate_emails != null) {
             foreach (string alternate_email in account.information.alternate_emails) {
                 string rfc822_address = new Geary.RFC822.MailboxAddress(
@@ -1658,8 +1689,18 @@ public class ComposerWindow : Gtk.Window {
                 string display = _("%1$s via %2$s").printf(rfc822_address, account.information.email);
                 from_multiple.append_text(display);
                 from_list.add(new FromAddressMap(account, alternate_email));
+                
+                if (!set_active && preferred_from_address == alternate_email) {
+                    from_multiple.set_active(index);
+                    set_active = true;
+                }
+                
+                index++;
             }
         }
+        
+        if (!set_active)
+            from_multiple.set_active(0);
     }
     
     private void update_from_field() {
@@ -1701,13 +1742,8 @@ public class ComposerWindow : Gtk.Window {
                     debug("Error getting account in composer: %s", e.message);
                 }
             }
-            
-            from_multiple.set_active(0);
         } else {
             add_account_emails_to_from_list(account);
-            
-            // TODO: select address the original message was to, if available.
-            from_multiple.set_active(0);
         }
     }