X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-address-book.c;h=ac1996e5421042e5528eaefeadd81c5739457fa9;hp=b28a51d9b2d4790dd52c425a4a2264bc06c16b53;hb=fdf3571635d4c34c057c7734785e8e6685036567;hpb=cbecf763eb1ac1c1aa583234639c33124ef437ea;ds=sidebyside

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index b28a51d..ac1996e 100644
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -37,6 +37,7 @@
 #include <libebook/e-book-view.h>
 #include <libosso-abook/osso-abook.h>
 #include "modest-hildon-includes.h"
+#include "modest-platform.h"
 #include <string.h>
 #include <gtk/gtksizegroup.h>
 #include <gtk/gtkbox.h>
@@ -50,15 +51,25 @@ static EBook *book = NULL;
 static EBookView * book_view = NULL;
 
 static GSList *get_recipients_for_given_contact(EContact * contact);
-static void commit_contact(EContact * contact);
+static void commit_contact(EContact * contact, gboolean is_new);
 static gchar *get_email_addr_from_user(const gchar * given_name);
 static gchar *ui_get_formatted_email_id(gchar * current_given_name,
 					gchar * current_sur_name, gchar * current_email_id);
 static gchar *run_add_email_addr_to_contact_dlg(const gchar * contact_name);
 static GSList *select_email_addrs_for_contact(GList * email_addr_list);
+static gboolean resolve_address (const gchar *address, GSList **resolved_addresses, gchar **contact_id);
+static gchar *unquote_string (const gchar *str);
 
 
 static void
+unref_gobject (GObject *obj)
+{
+	if (obj)
+		g_object_unref (obj);
+}
+	
+
+static void
 get_book_view_cb (EBook *book, EBookStatus status, EBookView *bookview, gpointer data)
 {
 	if (status != E_BOOK_ERROR_OK) {
@@ -102,11 +113,24 @@ open_addressbook ()
 	return TRUE; /* FIXME */	
 }
 
+static gboolean
+open_addressbook_sync ()
+{
+	book = e_book_new_system_addressbook (NULL);
+	if (!book)
+		return FALSE;
+
+	e_book_open (book, FALSE, NULL);
+
+	return TRUE;
+}
+
 void
 modest_address_book_add_address (const gchar *address)
 {
 	OssoABookAccount *account = NULL;
 	GtkWidget *dialog = NULL;
+	gchar *email_address = NULL;
 
 	contact_model = osso_abook_contact_model_new ();
 	if (!open_addressbook ()) {
@@ -116,18 +140,24 @@ modest_address_book_add_address (const gchar *address)
 		}
 		return;
 	}
+
+	email_address = modest_text_utils_get_email_address (address);
 	
-	account = osso_abook_account_get (EVC_EMAIL, NULL, address);
-	dialog = osso_abook_add_to_contacts_dialog_new (contact_model, account);
-	g_object_unref (account);
-	gtk_dialog_run (GTK_DIALOG (dialog));
+	account = osso_abook_account_get (EVC_EMAIL, NULL, email_address);
+	g_free (email_address);
+	if (account)
+	{
+		dialog = osso_abook_add_to_contacts_dialog_new (contact_model, account);
+		g_object_unref (account);
+		gtk_dialog_run (GTK_DIALOG (dialog));
 
-	if (contact_model) {
-		g_object_unref (contact_model);
-		contact_model = NULL;
-	}
+		if (contact_model) {
+			g_object_unref (contact_model);
+			contact_model = NULL;
+		}
 
-	gtk_widget_destroy (dialog);
+		gtk_widget_destroy (dialog);
+	}
 
 }
 
@@ -139,10 +169,13 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 	GtkWidget *contact_dialog;
 	GSList *email_addrs_per_contact = NULL;
 	gchar *econtact_id;
+	gboolean focus_recpt_editor = FALSE;
+	GtkWidget *toplevel;
 
 	g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
 
-	contact_model = osso_abook_contact_model_new ();
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (recpt_editor));
+
 	if (!open_addressbook ()) {
 		if (contact_model) {
 			g_object_unref (contact_model);
@@ -150,12 +183,13 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 		}
 		return;
 	}
+	contact_model = osso_abook_contact_model_new ();
 
 	contact_view = osso_abook_contact_selector_new_basic (contact_model);
 	osso_abook_contact_selector_set_minimum_selection (OSSO_ABOOK_CONTACT_SELECTOR (contact_view), 1);
 
 	contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
-	osso_abook_select_dialog_set_new_contact (OSSO_ABOOK_SELECT_DIALOG (contact_dialog), TRUE);
+	gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients"));
 
 	gtk_widget_show (contact_dialog);
 
@@ -179,16 +213,12 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 				g_slist_foreach (email_addrs_per_contact, (GFunc) g_free, NULL);
 				g_slist_free (email_addrs_per_contact);
 				email_addrs_per_contact = NULL;
+				focus_recpt_editor = TRUE;
 			}
 		}
 		g_list_free (contacts_list);
 	}
 
-	if (contact_view) {
-		g_object_unref (contact_view);
-		contact_view = NULL;
-	}
-
 	if (contact_model) {
 		g_object_unref (contact_model);
 		contact_model = NULL;
@@ -196,6 +226,9 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 
 	gtk_widget_destroy (contact_dialog);
 
+	if (focus_recpt_editor)
+		modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (recpt_editor));
+
 }
 
 /**
@@ -254,7 +287,7 @@ static GSList *get_recipients_for_given_contact(EContact * contact)
 
 		if (emailid) {
 			e_contact_set(contact, E_CONTACT_EMAIL_1, emailid);
-			commit_contact(contact);
+			commit_contact(contact, FALSE);
 		}
 	}
 
@@ -300,15 +333,18 @@ static GSList *get_recipients_for_given_contact(EContact * contact)
  * @return void
  */
 static void 
-commit_contact(EContact * contact)
+commit_contact(EContact * contact, gboolean is_new)
 {
+	g_return_if_fail (contact);
+	g_return_if_fail (book);
+	
 	if (!contact || !book)
 		return;
-
-#ifdef MODEST_HILDON_VERSION_0	
-	osso_abook_contact_commit(contact, FALSE, book);
+	
+#ifdef MODEST_HAVE_OLD_ABOOK	
+	osso_abook_contact_commit(contact, is_new, book);
 #else
-	osso_abook_contact_commit(contact, FALSE, book, NULL);
+	osso_abook_contact_commit(contact, is_new, book, NULL);
 #endif /* MODEST_HILDON_VERSION_0 */
 }
 
@@ -357,27 +393,23 @@ ui_get_formatted_email_id(gchar * current_given_name,
 			  gchar * current_sur_name, gchar * current_email_id)
 {
 	GString *email_id_str = NULL;
-	gchar *email_id = NULL;
 
 	email_id_str = g_string_new(NULL);
 
 	if ((current_given_name != NULL) && ((strlen(current_given_name) != 0))
 	    && (current_sur_name != NULL) && ((strlen(current_sur_name) != 0))) {
-		g_string_printf(email_id_str, "%s %s %c%s%c", current_given_name,
-				current_sur_name, '<', current_email_id, '>');
-		email_id = g_strdup(email_id_str->str);
+		g_string_append_printf(email_id_str, "%s %s", current_given_name, current_sur_name);
 	} else if ((current_given_name != NULL) && (strlen(current_given_name) != 0)) {
-		g_string_printf(email_id_str, "%s %c%s%c", current_given_name, '<',
-				current_email_id, '>');
-		email_id = g_strdup(email_id_str->str);
+		g_string_append_printf(email_id_str, "%s", current_given_name);
 	} else if ((current_sur_name != NULL) && (strlen(current_sur_name) != 0)) {
-		g_string_printf(email_id_str, "%s %c%s%c", current_sur_name, '<',
-				current_email_id, '>');
-		email_id = g_strdup(email_id_str->str);
+		g_string_append_printf(email_id_str, "%s", current_sur_name);
 	}
-	g_string_free(email_id_str, TRUE);
-	email_id_str = NULL;
-	return (email_id);
+	if (g_utf8_strchr (email_id_str->str, -1, ' ')) {
+		g_string_prepend_c (email_id_str, '\"');
+		g_string_append_c (email_id_str, '\"');
+	}
+	g_string_append_printf (email_id_str, " %c%s%c", '<', current_email_id, '>');
+	return g_string_free (email_id_str, FALSE);
 }
 
 /**
@@ -433,13 +465,24 @@ run_add_email_addr_to_contact_dlg(const gchar * contact_name)
 		result = gtk_dialog_run(GTK_DIALOG(add_email_addr_to_contact_dlg));
 
 		if (result == GTK_RESPONSE_ACCEPT) {
+			const gchar *invalid_char_offset = NULL;
 			new_email_addr = g_strdup(gtk_entry_get_text(GTK_ENTRY(email_entry)));
 			new_email_addr = g_strstrip(new_email_addr);
-			if (!modest_text_utils_validate_email_address (new_email_addr)) {
+			if (!modest_text_utils_validate_email_address (new_email_addr, &invalid_char_offset)) {
 				gtk_widget_grab_focus(email_entry);
+				if ((invalid_char_offset != NULL)&&(*invalid_char_offset != '\0')) {
+					gchar *char_in_string = g_strdup_printf ("%c", *invalid_char_offset);
+					gchar *message = g_strdup_printf(
+						dgettext("hildon-common-strings", "ckdg_ib_illegal_characters_entered"), 
+						char_in_string);
+					hildon_banner_show_information (
+						add_email_addr_to_contact_dlg, NULL, message );
+					g_free (message);
+				} else {
+					hildon_banner_show_information (add_email_addr_to_contact_dlg, NULL, _("mcen_ib_invalid_email"));
+					run_dialog = TRUE;
+				}
 				gtk_editable_select_region((GtkEditable *) email_entry, 0, -1);
-				hildon_banner_show_information (add_email_addr_to_contact_dlg, NULL, _("mcen_ib_invalid_email"));
-				run_dialog = TRUE;
 				g_free(new_email_addr);
 				new_email_addr = NULL;
 			}
@@ -486,6 +529,10 @@ select_email_addrs_for_contact(GList * email_addr_list)
 					_("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL);
 	gtk_dialog_set_has_separator(GTK_DIALOG(select_email_addr_dlg), FALSE);
 
+	/* Make the window approximately big enough, because it doesn't resize to be big enough 
+	 * for the window title text: */
+	gtk_window_set_default_size (GTK_WINDOW (select_email_addr_dlg), 400, -1);
+
 	scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(select_email_addr_dlg)->vbox), scrolledwindow, TRUE,
 			   TRUE, 0);
@@ -512,6 +559,8 @@ select_email_addrs_for_contact(GList * email_addr_list)
 		gtk_list_store_set(list_store, &iter, 0, email_addr, -1);
 		g_free(email_addr);
 	}
+	gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
+	gtk_tree_selection_select_iter (selection, &iter);
 
 	gtk_widget_show_all(select_email_addr_dlg);
 	result = gtk_dialog_run(GTK_DIALOG(select_email_addr_dlg));
@@ -532,3 +581,321 @@ select_email_addrs_for_contact(GList * email_addr_list)
 	gtk_widget_destroy(select_email_addr_dlg);
 	return selected_email_addr_list;
 }
+
+
+static gboolean /* make this public? */
+add_to_address_book (const gchar* address)
+{
+	EBookQuery *query;
+	GList *contacts = NULL;
+	GError *err = NULL;
+	
+	g_return_val_if_fail (address, FALSE);
+	
+	if (!book)
+		open_addressbook ();
+	
+	g_return_val_if_fail (book, FALSE);
+	
+	query = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, address);
+	if (!e_book_get_contacts (book, query, &contacts, &err)) {
+		g_printerr ("modest: failed to get contacts: %s",
+			    err ? err->message : "<unknown>");
+		if (err)
+			g_error_free (err);
+		return FALSE;
+	}
+	e_book_query_unref (query);
+	
+	/*  we need to 'commit' it, even if we already found the email
+	 * address in the addressbook; thus, it will show up in the 'recent list' */
+	if (contacts)  {		
+		g_debug ("%s already in the address book", address);
+		commit_contact ((EContact*)contacts->data, FALSE);
+		
+		g_list_foreach (contacts, (GFunc)unref_gobject, NULL);
+		g_list_free (contacts);
+
+	} else {
+		/* it's not yet in the addressbook, add it now! */
+		EContact *new_contact = e_contact_new ();
+		e_contact_set (new_contact, E_CONTACT_EMAIL_1, (const gpointer)address);
+		commit_contact (new_contact, TRUE);
+		g_debug ("%s added to address book", address);
+		g_object_unref (new_contact);
+	}
+
+	return TRUE;
+}
+
+static gboolean
+show_check_names_banner (gpointer data)
+{
+	GtkWidget **banner = (GtkWidget **) data;
+
+	*banner = hildon_banner_show_animation (NULL, NULL, _("mail_ib_checking_names"));
+	g_object_ref (G_OBJECT (*banner));
+
+	return FALSE;
+}
+
+gboolean
+modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook)
+{
+	const gchar *recipients = NULL;
+	GSList *start_indexes = NULL, *end_indexes = NULL;
+	GSList *current_start, *current_end;
+	gboolean result = TRUE;
+	GtkTextBuffer *buffer;
+	gint offset_delta = 0;
+	gint last_length;
+	GtkTextIter start_iter, end_iter;
+	GtkWidget *banner = NULL;
+	guint show_banner_timeout;
+
+	g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
+
+	show_banner_timeout = g_timeout_add (2000, show_check_names_banner, &banner);
+	recipients = modest_recpt_editor_get_recipients (recpt_editor);
+	last_length = g_utf8_strlen (recipients, -1);
+	modest_text_utils_get_addresses_indexes (recipients, &start_indexes, &end_indexes);
+
+	if (start_indexes == NULL) {
+		g_source_remove (show_banner_timeout);
+		if (banner != NULL) {
+			gtk_widget_destroy (banner);
+			g_object_unref (G_OBJECT(banner));
+		}
+		return TRUE;
+	}
+
+	current_start = start_indexes;
+	current_end = end_indexes;
+	buffer = modest_recpt_editor_get_buffer (recpt_editor);
+
+	while (current_start != NULL) {
+		gchar *address;
+		gchar *start_ptr, *end_ptr;
+		gint start_pos, end_pos;
+		const gchar *invalid_char_position = NULL;
+
+		start_pos = (*((gint*) current_start->data)) + offset_delta;
+		end_pos = (*((gint*) current_end->data)) + offset_delta;
+	       
+		start_ptr = g_utf8_offset_to_pointer (recipients, start_pos);
+		end_ptr = g_utf8_offset_to_pointer (recipients, end_pos);
+
+		address = g_strndup (start_ptr, end_ptr - start_ptr);
+		gtk_text_buffer_get_iter_at_offset (buffer, &start_iter, start_pos);
+		gtk_text_buffer_get_iter_at_offset (buffer, &end_iter, end_pos);
+		gtk_text_buffer_select_range (buffer, &start_iter, &end_iter);
+
+		if (!modest_text_utils_validate_recipient (address, &invalid_char_position)) {
+			if ((invalid_char_position != NULL) && (*invalid_char_position != '\0')) {
+				gchar *char_in_string = g_strdup_printf("%c", *invalid_char_position);
+				gchar *message = g_strdup_printf(
+					dgettext("hildon-common-strings", "ckdg_ib_illegal_characters_entered"), 
+					char_in_string);
+				g_free (char_in_string);
+				hildon_banner_show_information (NULL, NULL, message );
+				g_free (message);				
+				result = FALSE;
+			} else if (strstr (address, "@") == NULL) {
+				/* here goes searching in addressbook */
+				gchar *contact_id = NULL;
+				GSList *resolved_addresses = NULL;
+				result = resolve_address (address, &resolved_addresses, &contact_id);
+
+				if (result) {
+					gint new_length;
+					/* replace string */
+					modest_recpt_editor_replace_with_resolved_recipient (recpt_editor,
+											     &start_iter, &end_iter,
+											     resolved_addresses, 
+											     contact_id);
+					g_free (contact_id);
+					g_slist_foreach (resolved_addresses, (GFunc) g_free, NULL);
+					g_slist_free (resolved_addresses);
+
+					/* update offset delta */
+					recipients = modest_recpt_editor_get_recipients (recpt_editor);
+					new_length = g_utf8_strlen (recipients, -1);
+					offset_delta = offset_delta + new_length - last_length;
+					last_length = new_length;					
+				}
+			} else {
+				/* this address is not valid, select it and return control to user showing banner */
+				hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email"));
+				result = FALSE;
+			}
+		} 
+
+		/* so, it seems a valid address */
+		/* note: adding it the to the addressbook if it did not exist yet,
+		 * and adding it to the recent_list */
+		if (result && update_addressbook)
+			add_to_address_book (address);
+
+		g_free (address);
+		if (result == FALSE)
+			break;
+
+		current_start = g_slist_next (current_start);
+		current_end = g_slist_next (current_end);
+	}
+
+	if (current_start == NULL) {
+		gtk_text_buffer_get_end_iter (buffer, &end_iter);
+		gtk_text_buffer_place_cursor (buffer, &end_iter);
+	}
+
+	g_source_remove (show_banner_timeout);
+	if (banner != NULL) {
+		gtk_widget_destroy (banner);
+		g_object_unref (G_OBJECT (banner));
+	}
+	modest_recpt_editor_grab_focus (recpt_editor);
+
+	g_slist_foreach (start_indexes, (GFunc) g_free, NULL);
+	g_slist_foreach (end_indexes, (GFunc) g_free, NULL);
+	g_slist_free (start_indexes);
+	g_slist_free (end_indexes);
+
+	return result;
+
+}
+
+static GList *
+get_contacts_for_name (const gchar *name)
+{
+	EBookQuery *full_name_book_query = NULL;
+	GList *result;
+	gchar *unquoted;
+
+	if (name == NULL)
+		return NULL;
+
+	unquoted = unquote_string (name);
+	full_name_book_query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_CONTAINS, unquoted);
+	g_free (unquoted);
+
+	e_book_get_contacts (book, full_name_book_query, &result, NULL);
+	e_book_query_unref (full_name_book_query);
+
+	return result;
+}
+
+static GList *
+select_contacts_for_name_dialog (const gchar *name)
+{
+	EBookQuery *full_name_book_query = NULL;
+	EBookView *book_view = NULL;
+	GList *result = NULL;
+	gchar *unquoted;
+
+	unquoted = unquote_string (name);
+	full_name_book_query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_CONTAINS, unquoted);
+	g_free (unquoted);
+	e_book_get_book_view (book, full_name_book_query, NULL, -1, &book_view, NULL);
+	e_book_query_unref (full_name_book_query);
+
+	if (book_view) {
+		GtkWidget *contact_view = NULL;
+		GtkWidget *contact_dialog = NULL;
+		osso_abook_tree_model_set_book_view (OSSO_ABOOK_TREE_MODEL (contact_model), book_view);
+		e_book_view_start (book_view);
+		
+		contact_view = osso_abook_contact_view_new_basic (contact_model);
+		contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
+
+		if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK) {
+			result = osso_abook_contact_view_get_selection (OSSO_ABOOK_CONTACT_VIEW (contact_view));
+		}
+		e_book_view_stop (book_view);
+		g_object_unref (book_view);
+		gtk_widget_destroy (contact_dialog);
+	}
+
+	return result;
+}
+
+static gboolean
+resolve_address (const gchar *address, GSList **resolved_addresses, gchar **contact_id)
+{
+	GList *resolved_contacts;
+
+	contact_model = osso_abook_contact_model_new ();
+	if (!open_addressbook_sync ()) {
+		if (contact_model) {
+			g_object_unref (contact_model);
+			contact_model = NULL;
+		}
+		return FALSE;
+	}
+
+	resolved_contacts = get_contacts_for_name (address);
+
+	if (resolved_contacts == NULL) {
+		/* no matching contacts for the search string */
+		modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts"));
+		return FALSE;
+	}
+
+	if (g_list_length (resolved_contacts) > 1) {
+		/* show a dialog to select the contact from the resolved ones */
+		g_list_free (resolved_contacts);
+
+		resolved_contacts = select_contacts_for_name_dialog (address);
+	}
+	
+	/* get the resolved contacts (can be no contact) */
+	if (resolved_contacts) {
+		EContact *contact = (EContact *) resolved_contacts->data;
+
+		*resolved_addresses = get_recipients_for_given_contact (contact);
+		if (*resolved_addresses) {
+			*contact_id = g_strdup (e_contact_get_const (contact, E_CONTACT_UID));
+		}
+
+		g_list_foreach (resolved_contacts, (GFunc)unref_gobject, NULL);
+		g_list_free (resolved_contacts);
+
+		return TRUE;
+	} else {
+		/* cancelled dialog to select more than one contact or
+		 * selected no contact */
+		return FALSE;
+	}
+
+}
+
+static gchar *
+unquote_string (const gchar *str)
+{
+	GString *buffer;
+	gchar *p;
+
+	if (str == NULL)
+		return NULL;
+
+	buffer = g_string_new_len (NULL, strlen (str));
+	for (p = (gchar *) str; *p != '\0'; p = g_utf8_next_char (p)) {
+		if (*p == '"') {
+			p = g_utf8_next_char (p);
+			while ((*p != '\0')&&(*p != '"')) {
+				if (*p == '\\') {
+					g_string_append_unichar (buffer, g_utf8_get_char (p));
+					p = g_utf8_next_char (p);
+					
+				}
+				g_string_append_unichar (buffer, g_utf8_get_char (p));
+				p = g_utf8_next_char (p);
+			}
+		} else {
+			g_string_append_unichar (buffer, g_utf8_get_char (p));
+		}
+	}
+
+	return g_string_free (buffer, FALSE);
+
+}