X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=0c8b199dafd0d06cd3b500777240113c93dba845;hp=72c918aeae0ae398530389d3eae6282c2a4306b9;hb=89c621790370dcbaddb8ff9b9dd233a7211e8d61;hpb=0344beb7b1e6a60f4b6605c7c6d49fedfdd02676

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index 72c918a..0c8b199 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -33,7 +33,12 @@
 #include <tny-iterator.h>
 #include <tny-folder.h>
 #include <tny-camel-msg.h>
+#include <tny-folder-change.h>
+#include <tny-folder-observer.h>
 #include <modest-tny-account.h>
+#include <modest-runtime.h>
+#include <modest-platform.h>
+#include <widgets/modest-window-mgr.h>
 #include <modest-marshal.h>
 #include <string.h> /* strcmp */
 
@@ -43,10 +48,28 @@ static void modest_tny_send_queue_finalize   (GObject *obj);
 static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class);
 
 /* Signal handlers */ 
-static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, gpointer user_data);
-static void _on_msg_has_been_sent (TnySendQueue *self, TnyMsg *msg, gpointer user_data);
-static void _on_msg_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data);
-
+static void _on_msg_start_sending (TnySendQueue *self, 
+				   TnyHeader *header, 
+				   TnyMsg *msg, 
+				   int done, 
+				   int total, 
+				   gpointer user_data);
+
+static void _on_msg_has_been_sent (TnySendQueue *self, 
+				   TnyHeader *header, 
+				   TnyMsg *msg, 
+				   int done, 
+				   int total, 
+				   gpointer user_data);
+
+static void _on_msg_error_happened (TnySendQueue *self, 
+				    TnyHeader *header, 
+				    TnyMsg *msg, 
+				    GError *err, 
+				    gpointer user_data);
+
+static TnyFolder* modest_tny_send_queue_get_outbox  (TnySendQueue *self);
+static TnyFolder* modest_tny_send_queue_get_sentbox (TnySendQueue *self);
 
 /* list my signals  */
 enum {
@@ -89,6 +112,8 @@ static guint signals[LAST_SIGNAL] = {0};
 static int
 on_modest_tny_send_queue_compare_id(gconstpointer info, gconstpointer msg_id)
 {
+	g_return_val_if_fail (info && ((SendInfo*)info)->msg_id && msg_id, -1);
+	
 	return strcmp( ((SendInfo*)info)->msg_id, msg_id);
 }
 
@@ -113,6 +138,10 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err)
 {
 	ModestTnySendQueuePrivate *priv;
 	SendInfo *info;
+	TnyIterator *iter = NULL;
+	TnyFolder *outbox = NULL;
+	TnyList *headers = tny_simple_list_new ();
+	TnyHeader *header = NULL;
 
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 	if(priv->current != NULL)
@@ -127,38 +156,63 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err)
 		g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
 	}
 
+	/* Set flags to supend sending operaiton (if removed, this is not necessary) */
+	if (!remove) {		
+		outbox = modest_tny_send_queue_get_outbox (TNY_SEND_QUEUE(self));
+		if (!outbox) {
+			g_warning ("%s: modest_tny_send_queue_get_outbox(..) returned NULL\n", __FUNCTION__);
+			goto frees;
+		}
+		tny_folder_get_headers (outbox, headers, TRUE, err);
+		if (err != NULL) goto frees;
+		iter = tny_list_create_iterator (headers);
+		while (!tny_iterator_is_done (iter)) {
+			header = TNY_HEADER (tny_iterator_get_current (iter));
+			if (header) {
+				tny_header_set_flag (header, TNY_HEADER_FLAG_SUSPENDED);
+				tny_iterator_next (iter);
+				g_object_unref (header);
+			}
+		}
+		
+		g_queue_foreach (priv->queue, (GFunc)modest_tny_send_queue_info_free, NULL);
+		g_queue_free (priv->queue);
+		priv->queue = g_queue_new();
+	}
+		
+	/* Dont call super class implementaiton, becasue camel removes messages from outbox */
 	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->cancel_func (self, remove, err); /* FIXME */
+
+ frees:
+	if (headers != NULL)
+		g_object_unref (G_OBJECT (headers));
+	if (outbox != NULL) 
+		g_object_unref (G_OBJECT (outbox));
+	if (iter != NULL) 
+		g_object_unref (iter);
 }
 
 static void
-modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
+_on_added_to_outbox (TnySendQueue *self, gboolean cancelled, TnyMsg *msg, GError *err, gpointer user_data) 
 {
-	ModestTnySendQueuePrivate *priv;
-	TnyHeader *header;
-	SendInfo *info;
-	GList* existing;
-	const gchar* msg_id;
+	ModestTnySendQueuePrivate *priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE(self);
+	TnyHeader *header = NULL;
+	SendInfo *info = NULL;
+	GList* existing = NULL;
+	const gchar* msg_id = NULL;
 
 	g_return_if_fail (TNY_IS_SEND_QUEUE(self));
 	g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
 
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 	header = tny_msg_get_header (msg);
+	msg_id = modest_tny_send_queue_get_msg_id (header);
+/* 	msg_id = tny_header_get_message_id (header); */
+	g_return_if_fail(msg_id != NULL);
 
-	/* FIXME: do something smart here... */
-
-	/* Note that this call actually sets the message id to something
-	 * sensible. */	
-	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_func (self, msg, err); /* FIXME */
-
-	/* Check whether the mail is already in the queue */
-	msg_id = tny_header_get_message_id (header);
+	/* Put newly added message in WAITING state */
 	existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_id);
 	if(existing != NULL)
 	{
-		g_assert(info->status == MODEST_TNY_SEND_QUEUE_SUSPENDED ||
-		         info->status == MODEST_TNY_SEND_QUEUE_FAILED);
-
 		info = existing->data;
 		info->status = MODEST_TNY_SEND_QUEUE_WAITING;
 	}
@@ -173,6 +227,70 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
 	}
 
 	g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+
+	g_object_unref(G_OBJECT(header));
+}
+
+void
+modest_tny_send_queue_add (ModestTnySendQueue *self, TnyMsg *msg, GError **err)
+{
+	g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE(self));
+	g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
+
+	tny_camel_send_queue_add_async (TNY_CAMEL_SEND_QUEUE(self), 
+					msg, 
+					_on_added_to_outbox, 
+					NULL, 
+					NULL);
+}
+
+
+static void
+_add_message (ModestTnySendQueue *self, TnyHeader *header)
+{
+	ModestWindowMgr *mgr = NULL;
+	ModestTnySendQueuePrivate *priv;
+	SendInfo *info = NULL;
+	GList* existing = NULL;
+	gchar* msg_uid = NULL;
+	ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
+	gboolean editing = FALSE;
+
+	g_return_if_fail (TNY_IS_SEND_QUEUE(self));
+	g_return_if_fail (TNY_IS_HEADER(header));
+	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+	
+	/* Check whether the mail is already in the queue */
+	msg_uid = modest_tny_send_queue_get_msg_id (header);
+	status = modest_tny_send_queue_get_msg_status (self, msg_uid);
+	switch (status) {
+	case MODEST_TNY_SEND_QUEUE_UNKNOWN:
+	case MODEST_TNY_SEND_QUEUE_SUSPENDED:
+	case MODEST_TNY_SEND_QUEUE_FAILED:
+
+		/* Check if it already exists on queue */
+		existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_uid);
+		if(existing != NULL)
+			break;
+		
+		/* Check if its being edited */
+		mgr = modest_runtime_get_window_mgr ();
+		editing = modest_window_mgr_find_registered_header (mgr, header, NULL);
+		if (editing)
+			break;
+		
+		/* Add new meesage info */
+		info = g_slice_new (SendInfo);
+		info->msg_id = strdup(msg_uid);
+		info->status = MODEST_TNY_SEND_QUEUE_WAITING;
+		g_queue_push_tail (priv->queue, info);
+		break;
+	default:
+		break;
+	}
+
+	/* Free */
+	g_free(msg_uid);
 }
 
 static TnyFolder*
@@ -211,6 +329,12 @@ modest_tny_send_queue_get_outbox (TnySendQueue *self)
 	}
 	folder  = modest_tny_account_get_special_folder (TNY_ACCOUNT(account),
 							 TNY_FOLDER_TYPE_OUTBOX);
+
+	/* This vfunc's tinymail contract does not allow it to return NULL. */
+	if (!folder) {
+		g_warning("%s: Returning NULL.\n", __FUNCTION__);
+	}
+
 	g_object_unref (G_OBJECT(account));
 
 	return folder;
@@ -234,6 +358,7 @@ modest_tny_send_queue_get_type (void)
 			(GInstanceInitFunc) modest_tny_send_queue_instance_init,
 			NULL
 		};
+		
 		my_type = g_type_register_static (TNY_TYPE_CAMEL_SEND_QUEUE,
 						  "ModestTnySendQueue",
 						  &my_info, 0);
@@ -252,7 +377,6 @@ modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass)
 	parent_class            = g_type_class_peek_parent (klass);
 	gobject_class->finalize = modest_tny_send_queue_finalize;
 
-	TNY_CAMEL_SEND_QUEUE_CLASS(klass)->add_func         = modest_tny_send_queue_add;
 	TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_outbox_func  = modest_tny_send_queue_get_outbox;
         TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_sentbox_func = modest_tny_send_queue_get_sentbox;
         TNY_CAMEL_SEND_QUEUE_CLASS(klass)->cancel_func      = modest_tny_send_queue_cancel;
@@ -306,14 +430,9 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account)
 						    account); 
 
 	/* Connect signals to control when a msg is being or has been sent */
-	/* TODO: this signal was implemented in tinymail camel send queue, but im
-	   waiting for implement some unit tests nbefore commited changes */
-	if (FALSE) {
-		g_signal_connect (G_OBJECT(self), "msg-sending",
-				  G_CALLBACK(_on_msg_start_sending), 
-				  NULL);
-	}
-			  
+	g_signal_connect (G_OBJECT(self), "msg-sending",
+			  G_CALLBACK(_on_msg_start_sending),
+			  NULL);			  
 	g_signal_connect (G_OBJECT(self), "msg-sent",
 			  G_CALLBACK(_on_msg_has_been_sent), 
 			  NULL);
@@ -328,27 +447,54 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account)
 void
 modest_tny_send_queue_try_to_send (ModestTnySendQueue* self)
 {
-	/* TODO: Rename this to tny_camel_send_queue_try_to_send() in tinymail 
-	and check that it works, without creating a second worker. */
-/* 	tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self)); */
+	TnyIterator *iter = NULL;
+	TnyFolder *outbox = NULL;
+	TnyList *headers = tny_simple_list_new ();
+	TnyHeader *header = NULL;
+	GError *err = NULL;
+
+	outbox = modest_tny_send_queue_get_outbox (TNY_SEND_QUEUE(self));
+	if (!outbox)
+		return;
+
+	tny_folder_get_headers (outbox, headers, TRUE, &err);
+	if (err != NULL) 
+		goto frees;
+
+	iter = tny_list_create_iterator (headers);
+	while (!tny_iterator_is_done (iter)) {
+		header = TNY_HEADER (tny_iterator_get_current (iter));
+		if (header) {	
+			_add_message (self, header); 
+			g_object_unref (header);
+		}
+
+		tny_iterator_next (iter);
+	}
+	
+	/* Flush send queue */
+	tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self));
+
+ frees:
+	if (headers != NULL)
+		g_object_unref (G_OBJECT (headers));
+	if (outbox != NULL) 
+		g_object_unref (G_OBJECT (outbox));
+	if (iter != NULL) 
+		g_object_unref (iter);
 }
 
-#if 0
 gboolean
 modest_tny_send_queue_msg_is_being_sent (ModestTnySendQueue* self,
 					 const gchar *msg_id)
 {	
-	ModestTnySendQueuePrivate *priv;
+	ModestTnySendQueueStatus status;
 	
 	g_return_val_if_fail (msg_id != NULL, FALSE); 
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 	
-	if (modest_tny_send_queue_sending_in_progress(self))
-		return g_ascii_strcasecmp(priv->current_msg_id, msg_id);
-	else 
-		return FALSE;
+	status = modest_tny_send_queue_get_msg_status (self, msg_id);
+	return status == MODEST_TNY_SEND_QUEUE_SENDING;
 }
-#endif
 
 gboolean
 modest_tny_send_queue_sending_in_progress (ModestTnySendQueue* self)
@@ -364,93 +510,198 @@ modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg
 {
   GList *item;
   item = modest_tny_send_queue_lookup_info (self, msg_id);
-  if(item == NULL) return MODEST_TNY_SEND_QUEUE_SUSPENDED;
+  if(item == NULL) return MODEST_TNY_SEND_QUEUE_UNKNOWN;
   return ((SendInfo*)item->data)->status;
 }
 
-static void 
+gchar *
+modest_tny_send_queue_get_msg_id (TnyHeader *header)
+{
+	gchar* msg_uid = NULL;
+	const gchar *subject;
+	time_t date_received;
+		
+	/* Get message uid */
+	subject = tny_header_get_subject (header);
+	date_received = tny_header_get_date_received (header);
+
+	msg_uid = g_strdup_printf ("%s %d", subject, (int) date_received);
+
+	return msg_uid;
+}
+
+
+static void
 _on_msg_start_sending (TnySendQueue *self,
+		       TnyHeader *header,
 		       TnyMsg *msg,
+		       int done, 
+		       int total,
 		       gpointer user_data)
 {
-	ModestTnySendQueuePrivate *priv;
-	TnyHeader *header;
-	GList *item;
-	SendInfo *info;
+	ModestTnySendQueuePrivate *priv = NULL;
+	GList *item = NULL;
+	SendInfo *info = NULL;
+	gchar *msg_id = NULL;
 
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
-
-	header = tny_msg_get_header(msg);
-	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header));
-
-	if (item != NULL)
-	{
+	
+	/* Get message uid */
+	msg_id = modest_tny_send_queue_get_msg_id (header);
+
+	/* Get status info */
+	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
+	if (!item) 
+		g_warning  ("%s: item should not be NULL", __FUNCTION__);
+	else {
 		info = item->data;
 		info->status = MODEST_TNY_SEND_QUEUE_SENDING;
-
+		
+		/* Set current status item */
 		g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+		priv->current = item;
 	}
 
-	priv->current = item;
+	/* free */
+	g_free (msg_id);
 }
 
 static void 
 _on_msg_has_been_sent (TnySendQueue *self,
+		       TnyHeader *header,
 		       TnyMsg *msg, 
+		       int done, 
+		       int total,
 		       gpointer user_data)
 {
 	ModestTnySendQueuePrivate *priv;
-	TnyHeader *header;
+	gchar *msg_id = NULL;
 	GList *item;
-
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 
-	header = tny_msg_get_header (msg);
+	/* Get message uid */
+	msg_id = modest_tny_send_queue_get_msg_id (header);
 
-	/* TODO: Use this version as soon as the msg-sending
-	 *  notification works */
-#if 0
-	item = priv->current;
-	g_assert(item != NULL);
-#else
-	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id(header));
-	g_assert(item != NULL);
-#endif
-
-	modest_tny_send_queue_info_free (item->data);
-	g_queue_delete_link (priv->queue, item);
-	priv->current = NULL;
+	tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
+
+	/* Get status info */
+	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
+	if (item) {
+		
+		/* Remove status info */
+		modest_tny_send_queue_info_free (item->data);
+		g_queue_delete_link (priv->queue, item);
+		priv->current = NULL;
+		
+		modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_sent"));
+	}
+
+	/* free */
+	g_free(msg_id);
 }
 
-static void _on_msg_error_happened (TnySendQueue *self,
-                                    TnyHeader *header,
-				    TnyMsg *msg,
-				    GError *err,
-				    gpointer user_data)
+static void 
+_on_msg_error_happened (TnySendQueue *self,
+			TnyHeader *header,
+			TnyMsg *msg,
+			GError *err,
+			gpointer user_data)
 {
-	ModestTnySendQueuePrivate *priv;
-	SendInfo *info;
-	GList *item;
-
+	ModestTnySendQueuePrivate *priv = NULL;
+	SendInfo *info = NULL;
+	GList *item = NULL;
+	gchar* msg_uid = NULL;
+	
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+	
+	/* Get sending info (create new if it doesn not exist) */
+	msg_uid = modest_tny_send_queue_get_msg_id (header);
+	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), 
+						  msg_uid);	
+	if (item == NULL) {
+		info = g_slice_new (SendInfo);
+		info->msg_id = (msg_uid != NULL)? strdup(msg_uid) : NULL;
+		g_queue_push_tail (priv->queue, info);
+	} else
+		info = item->data;
 
-	/* TODO: Use this version as soon as the msg-sending
-	 *  notification works */
-#if 0
-	item = priv->current;
-	g_assert(item != NULL);
-	info = priv->current->data;
-#else
-	/* TODO: Why do we get the msg and its header separately? The docs
-	 * don't really tell. */
-	g_assert(header == tny_msg_get_header (msg)); // ????
-	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header));
-	g_assert(item != NULL);
-	info = item->data;
-#endif
-
-	/* Keep in queue so that we remember that the opertion has failed
-	 * and was not just cancelled */
+	/* Keep in queue so that we remember that the opertion has failed */
+	/* and was not just cancelled */
 	info->status = MODEST_TNY_SEND_QUEUE_FAILED;
+	priv->current = NULL;
+	
+	/* Notify status has changed */
 	g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+
+	/* free */
+	g_free(msg_uid);
+}
+
+static void 
+fill_list_of_caches (gpointer key, gpointer value, gpointer userdata)
+{
+	GSList **send_queues = (GSList **) userdata;
+	*send_queues = g_slist_prepend (*send_queues, value);
+}
+
+ModestTnySendQueueStatus
+modest_tny_all_send_queues_get_msg_status (TnyHeader *header)
+{
+	ModestCacheMgr *cache_mgr = NULL;
+	GHashTable     *send_queue_cache = NULL;
+	ModestTnyAccountStore *accounts_store = NULL;
+	TnyList *accounts = NULL;
+	TnyIterator *iter = NULL;
+	TnyTransportAccount *account = NULL;
+	GSList *send_queues = NULL, *node;
+	/* get_msg_status returns suspended by default, so we want to detect changes */
+	ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
+	ModestTnySendQueueStatus queue_status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
+	gchar *msg_uid = NULL;
+	ModestTnySendQueue *send_queue = NULL;
+	
+	msg_uid = modest_tny_send_queue_get_msg_id (header);
+	cache_mgr = modest_runtime_get_cache_mgr ();
+	send_queue_cache = modest_cache_mgr_get_cache (cache_mgr,
+						       MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE);
+	
+	g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues);
+	if (send_queues == NULL) {
+		accounts = tny_simple_list_new (); 
+		accounts_store = modest_runtime_get_account_store ();
+		tny_account_store_get_accounts (TNY_ACCOUNT_STORE(accounts_store), 
+						accounts, 
+						TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
+		
+		iter = tny_list_create_iterator (accounts);
+		while (!tny_iterator_is_done (iter)) {			
+			account = TNY_TRANSPORT_ACCOUNT(tny_iterator_get_current (iter));
+			send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account));
+			g_object_unref(account);
+
+			queue_status = modest_tny_send_queue_get_msg_status (send_queue, msg_uid);
+			if (queue_status != MODEST_TNY_SEND_QUEUE_UNKNOWN) {
+				status = queue_status;
+				break;
+			}
+			tny_iterator_next (iter);
+		}
+		g_object_unref (iter);
+		g_object_unref (accounts);
+	}
+	else {
+		for (node = send_queues; node != NULL; node = g_slist_next (node)) {
+			send_queue = MODEST_TNY_SEND_QUEUE (node->data);
+			
+			queue_status = modest_tny_send_queue_get_msg_status (send_queue, msg_uid);
+			if (queue_status != MODEST_TNY_SEND_QUEUE_UNKNOWN) {
+				status = queue_status;
+				break;
+			}
+		}
+	}
+
+	g_free(msg_uid);
+	g_slist_free (send_queues);
+	return status;
 }