X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=f74f11e5d18839be0dd73f43119df117922cbb4b;hp=51bbb8a42406227ba34a6af5f3bb23daa0051154;hb=8f4797391e5962158a0a085646f1d24da887ee3d;hpb=42407f6b97daaec5e3e2f9404112079bdc3425ee diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 51bbb8a..f74f11e 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -41,9 +41,11 @@ #include #include #include +#include #include #include #include +#include #include "modest-platform.h" #include "modest-account-mgr-helpers.h" #include @@ -60,6 +62,10 @@ #include #include #include "modest-utils.h" +#include "modest-debug.h" +#ifdef MODEST_USE_LIBTIME +#include +#endif #define KB 1024 @@ -94,13 +100,59 @@ static void notify_progress_of_multiple_messages (ModestMailOperation *self, gint total_bytes, gboolean increment_done); -static guint compute_message_list_size (TnyList *headers); - -static guint compute_message_array_size (GPtrArray *headers); +static guint compute_message_list_size (TnyList *headers, guint num_elements); static int compare_headers_by_date (gconstpointer a, gconstpointer b); +static void sync_folder_finish_callback (TnyFolder *self, + gboolean cancelled, + GError *err, + gpointer user_data); + +static gboolean _check_memory_low (ModestMailOperation *mail_op); + + +typedef struct { + ModestTnySendQueue *queue; + ModestMailOperation *self; + guint error_handler; + guint start_handler; + guint stop_handler; +} RunQueueHelper; + +static void run_queue_notify_and_destroy (RunQueueHelper *helper, + ModestMailOperationStatus status); + +/* Helpers for the update account operation (send & receive)*/ +typedef struct +{ + ModestMailOperation *mail_op; + gchar *account_name; + UpdateAccountCallback callback; + gpointer user_data; + TnyList *folders; + gint pending_calls; + gboolean poke_all; + TnyFolderObserver *inbox_observer; + RetrieveAllCallback retrieve_all_cb; + gboolean interactive; + gboolean msg_readed; +} UpdateAccountInfo; + +static void destroy_update_account_info (UpdateAccountInfo *info); + +static void update_account_send_mail (UpdateAccountInfo *info); + +static void update_account_get_msg_async_cb (TnyFolder *folder, + gboolean canceled, + TnyMsg *msg, + GError *err, + gpointer user_data); + +static void update_account_notify_user_and_free (UpdateAccountInfo *info, + TnyList *new_headers); + enum _ModestMailOperationSignals { PROGRESS_CHANGED_SIGNAL, @@ -182,6 +234,7 @@ static void modest_mail_operation_create_msg (ModestMailOperation *self const gchar *html_body, const GList *attachments_list, const GList *images_list, TnyHeaderFlags priority_flags, + const gchar *references, const gchar *in_reply_to, ModestMailOperationCreateMsgCallback callback, gpointer userdata); @@ -194,6 +247,8 @@ typedef struct gchar *cc; gchar *bcc; gchar *subject; + gchar *references; + gchar *in_reply_to; gchar *plain_body; gchar *html_body; GList *attachments_list; @@ -498,10 +553,12 @@ modest_mail_operation_cancel (ModestMailOperation *self) if (priv->op_type == MODEST_MAIL_OPERATION_TYPE_SEND) { ModestTnySendQueue *queue; - queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (priv->account)); + queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (priv->account), + TRUE); /* Cancel the sending of the following next messages */ - tny_send_queue_cancel (TNY_SEND_QUEUE (queue), TNY_SEND_QUEUE_CANCEL_ACTION_SUSPEND, NULL); + if (TNY_IS_SEND_QUEUE (queue)) + tny_send_queue_cancel (TNY_SEND_QUEUE (queue), TNY_SEND_QUEUE_CANCEL_ACTION_SUSPEND, NULL); } return canceled; @@ -564,11 +621,6 @@ modest_mail_operation_clone_state (ModestMailOperation *self) ModestMailOperationState *state; ModestMailOperationPrivate *priv; - /* FIXME: this should be fixed properly - * - * in some cases, priv was NULL, so checking here to - * make sure. - */ g_return_val_if_fail (self, NULL); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); g_return_val_if_fail (priv, NULL); @@ -593,46 +645,167 @@ modest_mail_operation_clone_state (ModestMailOperation *self) /* ************************** SEND ACTIONS ************************* */ /* ******************************************************************* */ -void -modest_mail_operation_send_mail (ModestMailOperation *self, - TnyTransportAccount *transport_account, - TnyMsg* msg) +typedef struct +{ + ModestMailOperation *mail_op; + gboolean notify; +} SendNewMailHelper; + +static void +send_mail_on_sync_async_cb (TnyFolder *folder, + gboolean cancelled, + GError *err, + gpointer user_data) { - TnySendQueue *send_queue = NULL; ModestMailOperationPrivate *priv; - - g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (transport_account && TNY_IS_TRANSPORT_ACCOUNT (transport_account)); - g_return_if_fail (msg && TNY_IS_MSG (msg)); - - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + ModestMailOperation *self; + SendNewMailHelper *helper; - /* Get account and set it into mail_operation */ - priv->account = g_object_ref (transport_account); - priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; - priv->done = 1; - priv->total = 1; + helper = (SendNewMailHelper *) user_data; + self = helper->mail_op; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account)); - if (!TNY_IS_SEND_QUEUE(send_queue)) { + if (cancelled) + goto end; + + if (err) { g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, - "modest: could not find send queue for account\n"); - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + MODEST_MAIL_OPERATION_ERROR_SEND_QUEUE_ADD_ERROR, + "Error adding a msg to the send queue\n"); + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } + + end: + if (helper->notify) modest_mail_operation_notify_end (self); - } else { - /* Add the msg to the queue */ - modest_mail_operation_notify_start (self); + g_object_unref (helper->mail_op); + g_slice_free (SendNewMailHelper, helper); +} + +static void +run_queue_start (TnySendQueue *self, + gpointer user_data) +{ + RunQueueHelper *helper = (RunQueueHelper *) user_data; + ModestMailOperation *mail_op; + + g_debug ("%s sending queue successfully started", __FUNCTION__); - tny_send_queue_add_async (send_queue, msg, NULL, NULL, NULL); + /* Wait for the message to be sent */ + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_run_queue (mail_op, helper->queue); + g_object_unref (mail_op); - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - modest_mail_operation_notify_end (self); + /* Free the helper and end operation */ + run_queue_notify_and_destroy (helper, MODEST_MAIL_OPERATION_STATUS_SUCCESS); +} + +static void +run_queue_error_happened (TnySendQueue *queue, + TnyHeader *header, + TnyMsg *msg, + GError *error, + gpointer user_data) +{ + RunQueueHelper *helper = (RunQueueHelper *) user_data; + ModestMailOperationPrivate *priv; + + /* If we are here this means that the send queue could not + start to send emails. Shouldn't happen as this means that + we could not create the thread */ + g_debug ("%s sending queue failed to create the thread", __FUNCTION__); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (helper->self); + priv->error = g_error_copy ((const GError *) error); + + if (error->code != TNY_SYSTEM_ERROR_UNKNOWN) { + /* This code is here for safety reasons. It should + never be called, because that would mean that we + are not controlling some error case */ + g_warning ("%s Error %s should not happen", + __FUNCTION__, error->message); } + /* Free helper and end operation */ + run_queue_notify_and_destroy (helper, MODEST_MAIL_OPERATION_STATUS_FAILED); } +static void +send_mail_on_added_to_outbox (TnySendQueue *send_queue, + gboolean cancelled, + TnyMsg *msg, + GError *err, + gpointer user_data) +{ + ModestMailOperationPrivate *priv; + ModestMailOperation *self; + SendNewMailHelper *helper; + + helper = (SendNewMailHelper *) user_data; + self = helper->mail_op; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + if (cancelled) + goto end; + + if (err) { + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_SEND_QUEUE_ADD_ERROR, + "Error adding a msg to the send queue\n"); + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } + + end: + if (helper->notify) { + TnyTransportAccount *trans_account; + ModestTnySendQueue *queue; + + trans_account = (TnyTransportAccount *) modest_mail_operation_get_account (self); + if (trans_account) { + queue = modest_runtime_get_send_queue (trans_account, TRUE); + if (queue) { + RunQueueHelper *helper; + + /* Create the helper */ + helper = g_slice_new0 (RunQueueHelper); + helper->queue = g_object_ref (queue); + helper->self = g_object_ref (self); + + /* if sending is ongoing wait for the queue to + stop. Otherwise wait for the queue-start + signal. It could happen that the queue + could not start, then check also the error + happened signal */ + if (modest_tny_send_queue_sending_in_progress (queue)) { + run_queue_start (TNY_SEND_QUEUE (queue), helper); + } else { + helper->start_handler = g_signal_connect (queue, "queue-start", + G_CALLBACK (run_queue_start), + helper); + helper->error_handler = g_signal_connect (queue, "error-happened", + G_CALLBACK (run_queue_error_happened), + helper); + } + } else { + /* Finalize this mail operation */ + modest_mail_operation_notify_end (self); + } + g_object_unref (trans_account); + } else { + g_warning ("No transport account for the operation"); + } + } + + g_object_unref (helper->mail_op); + g_slice_free (SendNewMailHelper, helper); +} static gboolean idle_create_msg_cb (gpointer idle_data) @@ -660,17 +833,24 @@ create_msg_thread (gpointer thread_data) CreateMsgInfo *info = (CreateMsgInfo *) thread_data; TnyMsg *new_msg = NULL; ModestMailOperationPrivate *priv; + gint attached = 0; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op); if (info->html_body == NULL) { new_msg = modest_tny_msg_new (info->to, info->from, info->cc, - info->bcc, info->subject, info->plain_body, - info->attachments_list); + info->bcc, info->subject, + info->references, info->in_reply_to, + info->plain_body, + info->attachments_list, &attached, + &(priv->error)); } else { new_msg = modest_tny_msg_new_html_plain (info->to, info->from, info->cc, - info->bcc, info->subject, info->html_body, + info->bcc, info->subject, + info->references, info->in_reply_to, + info->html_body, info->plain_body, info->attachments_list, - info->images_list); + info->images_list, &attached, + &(priv->error)); } if (new_msg) { @@ -681,15 +861,16 @@ create_msg_thread (gpointer thread_data) tny_header_set_flag (header, info->priority_flags); /* Set attachment flags in message */ - if (info->attachments_list != NULL) + if (info->attachments_list != NULL && attached > 0) tny_header_set_flag (header, TNY_HEADER_FLAG_ATTACHMENTS); g_object_unref (G_OBJECT(header)); } else { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED, - "modest: failed to create a new msg\n"); + if (!priv->error) + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED, + "modest: failed to create a new msg\n"); } @@ -700,6 +881,8 @@ create_msg_thread (gpointer thread_data) g_free (info->plain_body); g_free (info->html_body); g_free (info->subject); + g_free (info->references); + g_free (info->in_reply_to); g_list_foreach (info->attachments_list, (GFunc) g_object_unref, NULL); g_list_free (info->attachments_list); g_list_foreach (info->images_list, (GFunc) g_object_unref, NULL); @@ -733,6 +916,8 @@ modest_mail_operation_create_msg (ModestMailOperation *self, const GList *attachments_list, const GList *images_list, TnyHeaderFlags priority_flags, + const gchar *references, + const gchar *in_reply_to, ModestMailOperationCreateMsgCallback callback, gpointer userdata) { @@ -748,6 +933,8 @@ modest_mail_operation_create_msg (ModestMailOperation *self, info->subject = g_strdup (subject); info->plain_body = g_strdup (plain_body); info->html_body = g_strdup (html_body); + info->references = g_strdup (references); + info->in_reply_to = g_strdup (in_reply_to); info->attachments_list = g_list_copy ((GList *) attachments_list); g_list_foreach (info->attachments_list, (GFunc) g_object_ref, NULL); info->images_list = g_list_copy ((GList *) images_list); @@ -771,33 +958,60 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, TnyMsg *msg, gpointer userdata) { + TnySendQueue *send_queue = NULL; ModestMailOperationPrivate *priv = NULL; SendNewMailInfo *info = (SendNewMailInfo *) userdata; TnyFolder *draft_folder = NULL; TnyFolder *outbox_folder = NULL; TnyHeader *header = NULL; - GError *err = NULL; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); if (!msg) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + modest_mail_operation_notify_end (self); goto end; } - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - - if (priv->error) { + if (priv->error && priv->error->code != MODEST_MAIL_OPERATION_ERROR_FILE_IO) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; modest_mail_operation_notify_end (self); goto end; } - /* Call mail operation */ - modest_mail_operation_send_mail (self, info->transport_account, msg); + /* Add message to send queue */ + send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (info->transport_account, TRUE)); + if (!TNY_IS_SEND_QUEUE(send_queue)) { + if (priv->error) { + g_error_free (priv->error); + priv->error = NULL; + } + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, + "modest: could not find send queue for account\n"); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + modest_mail_operation_notify_end (self); + goto end; + } else { + SendNewMailHelper *helper = g_slice_new (SendNewMailHelper); + helper->mail_op = g_object_ref (self); + helper->notify = (info->draft_msg == NULL); + + /* Add the msg to the queue. The callback will free + the helper */ + modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue), + FALSE); + tny_send_queue_add_async (send_queue, msg, send_mail_on_added_to_outbox, + NULL, helper); + } if (info->draft_msg != NULL) { + TnyList *tmp_headers = NULL; TnyFolder *folder = NULL; TnyFolder *src_folder = NULL; TnyFolderType folder_type; TnyTransportAccount *transport_account = NULL; + SendNewMailHelper *helper = NULL; /* To remove the old mail from its source folder, we need to get the * transport account of the original draft message (the transport account @@ -816,16 +1030,21 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, if (!draft_folder) { g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL drafts folder", __FUNCTION__); + modest_mail_operation_notify_end (self); goto end; } if (!outbox_folder) { g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL outbox folder", __FUNCTION__); + modest_mail_operation_notify_end (self); goto end; } folder = tny_msg_get_folder (info->draft_msg); - if (folder == NULL) goto end; + if (folder == NULL) { + modest_mail_operation_notify_end (self); + goto end; + } folder_type = modest_tny_folder_guess_folder_type (folder); if (folder_type == TNY_FOLDER_TYPE_INVALID) @@ -837,20 +1056,23 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, src_folder = draft_folder; /* Note: This can fail (with a warning) if the message is not really already in a folder, - * because this function requires it to have a UID. */ - tny_folder_remove_msg (src_folder, header, NULL); - - tny_folder_sync (folder, TRUE, &err); /* FALSE --> don't expunge */ -/* tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL); /\* expunge *\/ */ - + * because this function requires it to have a UID. */ + helper = g_slice_new (SendNewMailHelper); + helper->mail_op = g_object_ref (self); + helper->notify = TRUE; + + tmp_headers = tny_simple_list_new (); + tny_list_append (tmp_headers, (GObject*) header); + tny_folder_remove_msgs_async (src_folder, tmp_headers, NULL, NULL, NULL); + g_object_unref (tmp_headers); + tny_folder_sync_async (src_folder, TRUE, send_mail_on_sync_async_cb, + NULL, helper); g_object_unref (folder); } end: if (header) g_object_unref (header); - if (err != NULL) - g_error_free(err); if (info->draft_msg) g_object_unref (info->draft_msg); if (draft_folder) @@ -872,6 +1094,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, const gchar *html_body, const GList *attachments_list, const GList *images_list, + const gchar *references, + const gchar *in_reply_to, TnyHeaderFlags priority_flags) { ModestMailOperationPrivate *priv = NULL; @@ -884,7 +1108,9 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; priv->account = TNY_ACCOUNT (g_object_ref (transport_account)); priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - + + modest_mail_operation_notify_start (self); + /* Check parametters */ if (to == NULL) { /* Set status failed and set an error */ @@ -892,6 +1118,7 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER, _("Error trying to send a mail. You need to set at least one recipient")); + modest_mail_operation_notify_end (self); return; } info = g_slice_new0 (SendNewMailInfo); @@ -903,9 +1130,9 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, g_object_ref (draft_msg); - modest_mail_operation_notify_start (self); modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body, attachments_list, images_list, priority_flags, + references, in_reply_to, modest_mail_operation_send_new_mail_cb, info); } @@ -929,9 +1156,14 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, { ModestMailOperationPrivate *priv = NULL; SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata; + GError *io_error = NULL; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop); + if (priv->error && priv->error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) { + io_error = priv->error; + priv->error = NULL; + } if (priv->error) { g_warning ("%s: priv->error != NULL", __FUNCTION__); g_error_free(priv->error); @@ -943,21 +1175,31 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, TnyHeader *header = tny_msg_get_header (info->draft_msg); TnyFolder *src_folder = tny_header_get_folder (header); + g_debug ("--- REMOVE AND SYNC"); /* Remove the old draft */ tny_folder_remove_msg (src_folder, header, NULL); /* Synchronize to expunge and to update the msg counts */ tny_folder_sync_async (info->drafts, TRUE, NULL, NULL, NULL); tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL); + g_debug ("--- REMOVED - SYNCED"); g_object_unref (G_OBJECT(header)); g_object_unref (G_OBJECT(src_folder)); } - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - else + if (priv->error) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (io_error) { + g_error_free (io_error); + io_error = NULL; + } + } else if (io_error) { + priv->error = io_error; + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } /* Call the user callback */ if (info->callback) @@ -1012,17 +1254,19 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, } } - if (!priv->error) { - SaveToDraftsAddMsgInfo *cb_info = g_slice_new(SaveToDraftsAddMsgInfo); - cb_info->transport_account = g_object_ref(info->transport_account); - cb_info->draft_msg = info->draft_msg ? g_object_ref(info->draft_msg) : NULL; - cb_info->callback = info->callback; - cb_info->user_data = info->user_data; - cb_info->drafts = g_object_ref(drafts); - cb_info->msg = g_object_ref(msg); - cb_info->mailop = g_object_ref(self); - tny_folder_add_msg_async(drafts, msg, modest_mail_operation_save_to_drafts_add_msg_cb, - NULL, cb_info); + if (!priv->error || priv->error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) { + if (drafts) { + SaveToDraftsAddMsgInfo *cb_info = g_slice_new(SaveToDraftsAddMsgInfo); + cb_info->transport_account = g_object_ref(info->transport_account); + cb_info->draft_msg = info->draft_msg ? g_object_ref(info->draft_msg) : NULL; + cb_info->callback = info->callback; + cb_info->user_data = info->user_data; + cb_info->drafts = g_object_ref(drafts); + cb_info->msg = g_object_ref(msg); + cb_info->mailop = g_object_ref(self); + tny_folder_add_msg_async(drafts, msg, modest_mail_operation_save_to_drafts_add_msg_cb, + NULL, cb_info); + } } else { /* Call the user callback */ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; @@ -1051,6 +1295,8 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, const GList *attachments_list, const GList *images_list, TnyHeaderFlags priority_flags, + const gchar *references, + const gchar *in_reply_to, SaveToDraftstCallback callback, gpointer user_data) { @@ -1072,9 +1318,11 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, info->callback = callback; info->user_data = user_data; + g_debug ("--- CREATE MESSAGE"); modest_mail_operation_notify_start (self); modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body, attachments_list, images_list, priority_flags, + references, in_reply_to, modest_mail_operation_save_to_drafts_cb, info); } @@ -1110,8 +1358,7 @@ G_DEFINE_TYPE_WITH_CODE (InternalFolderObserver, static void foreach_add_item (gpointer header, gpointer user_data) { - tny_list_prepend (TNY_LIST (user_data), - g_object_ref (G_OBJECT (header))); + tny_list_append (TNY_LIST (user_data), G_OBJECT (header)); } /* This is the method that looks for new messages in a folder */ @@ -1169,20 +1416,6 @@ internal_folder_observer_class_init (InternalFolderObserverClass *klass) object_class->finalize = internal_folder_observer_finalize; } -typedef struct -{ - ModestMailOperation *mail_op; - gchar *account_name; - UpdateAccountCallback callback; - gpointer user_data; - TnyList *folders; - gint pending_calls; - gboolean poke_all; - TnyFolderObserver *inbox_observer; - RetrieveAllCallback retrieve_all_cb; -} UpdateAccountInfo; - - static void destroy_update_account_info (UpdateAccountInfo *info) { @@ -1192,6 +1425,59 @@ destroy_update_account_info (UpdateAccountInfo *info) g_slice_free (UpdateAccountInfo, info); } + +static void +update_account_send_mail (UpdateAccountInfo *info) +{ + TnyTransportAccount *transport_account = NULL; + ModestTnyAccountStore *account_store; + + account_store = modest_runtime_get_account_store (); + + /* We don't try to send messages while sending mails is blocked */ + if (modest_tny_account_store_is_send_mail_blocked (account_store)) + return; + + /* Get the transport account */ + transport_account = (TnyTransportAccount *) + modest_tny_account_store_get_server_account (account_store, info->account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + + if (transport_account) { + ModestTnySendQueue *send_queue; + TnyFolder *outbox; + guint num_messages; + + send_queue = modest_runtime_get_send_queue (transport_account, TRUE); + g_object_unref (transport_account); + + if (TNY_IS_SEND_QUEUE (send_queue)) { + /* Get outbox folder */ + outbox = tny_send_queue_get_outbox (TNY_SEND_QUEUE (send_queue)); + if (outbox) { /* this could fail in some cases */ + num_messages = tny_folder_get_all_count (outbox); + g_object_unref (outbox); + } else { + g_warning ("%s: could not get outbox", __FUNCTION__); + num_messages = 0; + } + + if (num_messages != 0) { + ModestMailOperation *mail_op; + /* Reenable suspended items */ + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_queue_wakeup (mail_op, MODEST_TNY_SEND_QUEUE (send_queue)); + + /* Try to send */ + modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue), + info->interactive); + } + } + } +} + static void update_account_get_msg_async_cb (TnyFolder *folder, gboolean canceled, @@ -1200,12 +1486,76 @@ update_account_get_msg_async_cb (TnyFolder *folder, gpointer user_data) { GetMsgInfo *msg_info = (GetMsgInfo *) user_data; + ModestMailOperationPrivate *priv; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (msg_info->mail_op); + priv->done++; + + if (TNY_IS_MSG (msg)) { + TnyHeader *header = tny_msg_get_header (msg); + + if (header) { + ModestMailOperationState *state; + state = modest_mail_operation_clone_state (msg_info->mail_op); + msg_info->sum_total_bytes += tny_header_get_message_size (header); + state->bytes_done = msg_info->sum_total_bytes; + state->bytes_total = msg_info->total_bytes; + + /* Notify the status change. Only notify about changes + referred to bytes */ + g_signal_emit (G_OBJECT (msg_info->mail_op), + signals[PROGRESS_CHANGED_SIGNAL], + 0, state, NULL); + + g_object_unref (header); + g_slice_free (ModestMailOperationState, state); + } + } + + if (priv->done == priv->total) { + TnyList *new_headers; + UpdateAccountInfo *info; + + /* After getting all the messages send the ones in the + outboxes */ + info = (UpdateAccountInfo *) msg_info->user_data; + update_account_send_mail (info); + + /* Check if the operation was a success */ + if (!priv->error) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + + /* Call the user callback and free */ + new_headers = tny_iterator_get_list (msg_info->more_msgs); + update_account_notify_user_and_free (info, new_headers); + g_object_unref (new_headers); + + /* Delete the helper */ + g_object_unref (msg_info->more_msgs); + g_object_unref (msg_info->mail_op); + g_slice_free (GetMsgInfo, msg_info); + } +} + +static void +update_account_notify_user_and_free (UpdateAccountInfo *info, + TnyList *new_headers) +{ + /* Set the account back to not busy */ + modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), + info->account_name, FALSE); + + /* User callback */ + if (info->callback) + info->callback (info->mail_op, new_headers, info->user_data); + + /* Mail operation end */ + modest_mail_operation_notify_end (info->mail_op); - /* Just delete the helper. Don't do anything with the new - msg. There is also no need to check for errors */ - g_object_unref (msg_info->mail_op); - g_object_unref (msg_info->header); - g_slice_free (GetMsgInfo, msg_info); + /* Frees */ + if (new_headers) + g_object_unref (new_headers); + destroy_update_account_info (info); } static void @@ -1217,23 +1567,52 @@ inbox_refreshed_cb (TnyFolder *inbox, UpdateAccountInfo *info; ModestMailOperationPrivate *priv; TnyIterator *new_headers_iter; - GPtrArray *new_headers_array = NULL; + GPtrArray *new_headers_array = NULL; gint max_size, retrieve_limit, i; ModestAccountMgr *mgr; ModestAccountRetrieveType retrieve_type; TnyList *new_headers = NULL; - gboolean headers_only, ignore_limit, succeeded; - TnyTransportAccount *transport_account = NULL; + gboolean headers_only, ignore_limit; + time_t time_to_store; info = (UpdateAccountInfo *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); mgr = modest_runtime_get_account_mgr (); - if (canceled || err || !inbox) { + if (canceled || err) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (err) + priv->error = g_error_copy (err); + else + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, + "canceled"); + + if (inbox) + tny_folder_remove_observer (inbox, info->inbox_observer); + g_object_unref (info->inbox_observer); + info->inbox_observer = NULL; + + /* Notify the user about the error and then exit */ + update_account_notify_user_and_free (info, NULL); + return; + } + + if (!inbox) { /* Try to send anyway */ goto send_mail; } + /* Set the last updated as the current time */ +#ifdef MODEST_USE_LIBTIME + struct tm utc_tm; + time_get_utc (&utc_tm); + time_to_store = time_mktime (&utc_tm, "GMT"); +#else + time_to_store = time (NULL); +#endif + modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time_to_store); + /* Get the message max size */ max_size = modest_conf_get_int (modest_runtime_get_conf (), MODEST_CONF_MSG_SIZE_LIMIT, NULL); @@ -1245,43 +1624,43 @@ inbox_refreshed_cb (TnyFolder *inbox, /* Create the new headers array. We need it to sort the new headers by date */ new_headers_array = g_ptr_array_new (); - new_headers_iter = tny_list_create_iterator (((InternalFolderObserver *) info->inbox_observer)->new_headers); - while (!tny_iterator_is_done (new_headers_iter)) { - TnyHeader *header = NULL; - - header = TNY_HEADER (tny_iterator_get_current (new_headers_iter)); - /* Apply per-message size limits */ - if (tny_header_get_message_size (header) < max_size) - g_ptr_array_add (new_headers_array, g_object_ref (header)); - - g_object_unref (header); - tny_iterator_next (new_headers_iter); + if (info->inbox_observer) { + new_headers_iter = tny_list_create_iterator (((InternalFolderObserver *) info->inbox_observer)->new_headers); + while (!tny_iterator_is_done (new_headers_iter)) { + TnyHeader *header = NULL; + + header = TNY_HEADER (tny_iterator_get_current (new_headers_iter)); + /* Apply per-message size limits */ + if (tny_header_get_message_size (header) < max_size) + g_ptr_array_add (new_headers_array, g_object_ref (header)); + + g_object_unref (header); + tny_iterator_next (new_headers_iter); + } + g_object_unref (new_headers_iter); + + tny_folder_remove_observer (inbox, info->inbox_observer); + g_object_unref (info->inbox_observer); + info->inbox_observer = NULL; } - g_object_unref (new_headers_iter); - tny_folder_remove_observer (inbox, info->inbox_observer); - g_object_unref (info->inbox_observer); - info->inbox_observer = NULL; - /* Update the last updated key, even if we don't have to get new headers */ - modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time (NULL)); - if (!canceled && !err) - modest_account_mgr_set_server_account_username_has_succeeded (mgr, tny_account_get_id (priv->account), TRUE); - - if (new_headers_array->len == 0) + if (new_headers_array->len == 0) { + g_ptr_array_free (new_headers_array, FALSE); goto send_mail; + } /* Get per-account message amount retrieval limit */ retrieve_limit = modest_account_mgr_get_retrieve_limit (mgr, info->account_name); if (retrieve_limit == 0) retrieve_limit = G_MAXINT; - + /* Get per-account retrieval type */ - retrieve_type = modest_account_mgr_get_retrieve_type (mgr, info->account_name); + retrieve_type = modest_account_mgr_get_retrieve_type (mgr, info->account_name); headers_only = (retrieve_type == MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY); /* Order by date */ g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date); - + /* Ask the users if they want to retrieve all the messages even though the limit was exceeded */ ignore_limit = FALSE; @@ -1295,36 +1674,6 @@ inbox_refreshed_cb (TnyFolder *inbox, new_headers_array->len, retrieve_limit); } - - if (!headers_only) { - gint msg_num = 0; - const gint msg_list_size = compute_message_array_size (new_headers_array); - - priv->done = 0; - if (ignore_limit) - priv->total = new_headers_array->len; - else - priv->total = MIN (new_headers_array->len, retrieve_limit); - while (msg_num < priv->total) { - TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, msg_num)); - TnyFolder *folder = tny_header_get_folder (header); - GetMsgInfo *msg_info; - - /* Create the message info */ - msg_info = g_slice_new0 (GetMsgInfo); - msg_info->mail_op = g_object_ref (info->mail_op); - msg_info->header = g_object_ref (header); - msg_info->total_bytes = msg_list_size; - - /* Get message in an async way */ - tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb, - get_msg_status_cb, msg_info); - - g_object_unref (folder); - - msg_num++; - } - } /* Copy the headers to a list and free the array */ new_headers = tny_simple_list_new (); @@ -1335,67 +1684,91 @@ inbox_refreshed_cb (TnyFolder *inbox, g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL); g_ptr_array_free (new_headers_array, FALSE); - if (priv->error) - succeeded = FALSE; - else - succeeded = TRUE; - modest_account_mgr_set_server_account_username_has_succeeded (modest_runtime_get_account_mgr (), - tny_account_get_name (priv->account), - succeeded); - send_mail: - /* Get the transport account */ - transport_account = (TnyTransportAccount *) - modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(), - info->account_name); + if (!headers_only && (tny_list_get_length (new_headers) > 0)) { + gint msg_num = 0; + TnyIterator *iter; + GetMsgInfo *msg_info; - if (transport_account) { - ModestTnySendQueue *send_queue; - TnyFolder *outbox; - guint num_messages; + priv->done = 0; + if (ignore_limit) + priv->total = tny_list_get_length (new_headers); + else + priv->total = MIN (tny_list_get_length (new_headers), retrieve_limit); - send_queue = modest_runtime_get_send_queue (transport_account); - g_object_unref (transport_account); + iter = tny_list_create_iterator (new_headers); - /* Get outbox folder */ - outbox = tny_send_queue_get_outbox (TNY_SEND_QUEUE (send_queue)); - if (outbox) { /* this could fail in some cases */ - num_messages = tny_folder_get_all_count (outbox); - g_object_unref (outbox); - } else { - g_warning ("%s: could not get outbox", __FUNCTION__); - num_messages = 0; - } - - if (num_messages != 0) { - /* Send mails */ - g_object_unref (priv->account); + /* Create the message info */ + msg_info = g_slice_new0 (GetMsgInfo); + msg_info->mail_op = g_object_ref (info->mail_op); + msg_info->total_bytes = compute_message_list_size (new_headers, priv->total); + msg_info->more_msgs = g_object_ref (iter); + msg_info->user_data = info; - /* Reenable suspended items */ - modest_tny_send_queue_wakeup (MODEST_TNY_SEND_QUEUE (send_queue)); + while ((msg_num < priv->total ) && !tny_iterator_is_done (iter)) { + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyFolder *folder = tny_header_get_folder (header); + + /* Get message in an async way */ + tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb, + NULL, msg_info); - /* Try to send */ - tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (send_queue)); + g_object_unref (folder); + + msg_num++; + tny_iterator_next (iter); } + g_object_unref (iter); + + /* The mail operation will finish when the last + message is retrieved */ + return; } + send_mail: + /* If we don't have to retrieve the new messages then + simply send mail */ + update_account_send_mail (info); /* Check if the operation was a success */ if (!priv->error) priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - /* Set the account back to not busy */ - modest_account_mgr_set_account_busy (mgr, info->account_name, FALSE); + /* Call the user callback and free */ + update_account_notify_user_and_free (info, new_headers); +} - /* Call the user callback */ - if (info->callback) - info->callback (info->mail_op, new_headers, info->user_data); +static void +inbox_refresh_status_update (GObject *obj, + TnyStatus *status, + gpointer user_data) +{ + UpdateAccountInfo *info = NULL; + ModestMailOperation *self = NULL; + ModestMailOperationPrivate *priv = NULL; + ModestMailOperationState *state; - /* Notify about operation end */ - modest_mail_operation_notify_end (info->mail_op); + g_return_if_fail (user_data != NULL); + g_return_if_fail (status != NULL); - /* Frees */ - if (new_headers) - g_object_unref (new_headers); - destroy_update_account_info (info); + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_REFRESH) + return; + + info = (UpdateAccountInfo *) user_data; + self = info->mail_op; + g_return_if_fail (MODEST_IS_MAIL_OPERATION(self)); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + + priv->done = status->position; + priv->total = status->of_total; + + state = modest_mail_operation_clone_state (self); + + /* This is not a GDK lock because we are a Tinymail callback and + * Tinymail already acquires the Gdk lock */ + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); + + g_slice_free (ModestMailOperationState, state); } static void @@ -1412,30 +1785,42 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); if (err || canceled) { - /* Try to continue anyway */ - } else if (info->poke_all) { + /* If the error was previosly set by another callback + don't set it again */ + if (!priv->error) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (err) + priv->error = g_error_copy (err); + else + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, + "canceled"); + } + } else { /* We're not getting INBOX children if we don't want to poke all */ TnyIterator *iter = tny_list_create_iterator (list); while (!tny_iterator_is_done (iter)) { TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter); - TnyList *folders = tny_simple_list_new (); /* Add to the list of all folders */ tny_list_append (info->folders, (GObject *) folder); - /* Add pending call */ - info->pending_calls++; - - tny_folder_store_get_folders_async (folder, folders, NULL, - recurse_folders_async_cb, - NULL, info); + if (info->poke_all) { + TnyList *folders = tny_simple_list_new (); + /* Add pending call */ + info->pending_calls++; + + tny_folder_store_get_folders_async (folder, folders, NULL, FALSE, + recurse_folders_async_cb, + NULL, info); + g_object_unref (folders); + } g_object_unref (G_OBJECT (folder)); tny_iterator_next (iter); } g_object_unref (G_OBJECT (iter)); - g_object_unref (G_OBJECT (list)); } /* Remove my own pending call */ @@ -1446,6 +1831,12 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, TnyIterator *iter_all_folders; TnyFolder *inbox = NULL; + /* If there was any error do not continue */ + if (priv->error) { + update_account_notify_user_and_free (info, NULL); + return; + } + iter_all_folders = tny_list_create_iterator (info->folders); /* Do a poke status over all folders */ @@ -1480,7 +1871,7 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, tny_folder_add_observer (inbox, info->inbox_observer); /* Refresh the INBOX */ - tny_folder_refresh_async (inbox, inbox_refreshed_cb, NULL, info); + tny_folder_refresh_async (inbox, inbox_refreshed_cb, inbox_refresh_status_update, info); g_object_unref (inbox); } else { /* We could not perform the inbox refresh but @@ -1494,6 +1885,7 @@ void modest_mail_operation_update_account (ModestMailOperation *self, const gchar *account_name, gboolean poke_all, + gboolean interactive, RetrieveAllCallback retrieve_all_cb, UpdateAccountCallback callback, gpointer user_data) @@ -1535,6 +1927,11 @@ modest_mail_operation_update_account (ModestMailOperation *self, return; } + + /* We have once seen priv->account getting finalized during this code, + * therefore adding a reference (bug #82296) */ + + g_object_ref (priv->account); /* Create the helper object */ info = g_slice_new0 (UpdateAccountInfo); @@ -1542,6 +1939,7 @@ modest_mail_operation_update_account (ModestMailOperation *self, info->folders = tny_simple_list_new (); info->mail_op = g_object_ref (self); info->poke_all = poke_all; + info->interactive = interactive; info->account_name = g_strdup (account_name); info->callback = callback; info->user_data = user_data; @@ -1563,9 +1961,13 @@ modest_mail_operation_update_account (ModestMailOperation *self, /* Get all folders and continue in the callback */ folders = tny_simple_list_new (); tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account), - folders, NULL, + folders, NULL, FALSE, recurse_folders_async_cb, NULL, info); + g_object_unref (folders); + + g_object_unref (priv->account); + } /* @@ -1601,9 +2003,9 @@ compare_headers_by_date (gconstpointer a, /* We want the most recent ones (greater time_t) at the beginning */ if (sent1 < sent2) - return 1; - else return -1; + else + return 1; } @@ -1695,7 +2097,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self, } } - if (!strcmp (name, " ") || strchr (name, '/')) { + if (!priv->error && (!strcmp (name, " ") || strchr (name, '/'))) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, @@ -1798,7 +2200,10 @@ transfer_folder_status_cb (GObject *obj, XFerFolderAsyncHelper *helper; g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_COPY_FOLDER); + + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_COPY_FOLDER) + return; helper = (XFerFolderAsyncHelper *) user_data; g_return_if_fail (helper != NULL); @@ -1823,7 +2228,6 @@ transfer_folder_status_cb (GObject *obj, g_slice_free (ModestMailOperationState, state); } - static void transfer_folder_cb (TnyFolder *folder, gboolean cancelled, @@ -1837,7 +2241,7 @@ transfer_folder_cb (TnyFolder *folder, ModestMailOperationPrivate *priv = NULL; helper = (XFerFolderAsyncHelper *) user_data; - g_return_if_fail (helper != NULL); + g_return_if_fail (helper != NULL); self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); @@ -1856,7 +2260,13 @@ transfer_folder_cb (TnyFolder *folder, priv->done = 1; priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } - + + /* Update state of new folder */ + if (new_folder) { + tny_folder_refresh_async (new_folder, NULL, NULL, NULL); + tny_folder_poke_status (new_folder); + } + /* Notify about operation end */ modest_mail_operation_notify_end (self); @@ -2058,10 +2468,11 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, transfer_folder_cb, transfer_folder_status_cb, helper); + g_object_unref (into); } else { + g_object_unref (into); goto error; } - g_object_unref (into); return; } @@ -2084,8 +2495,74 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, /* ******************************************************************* */ void +modest_mail_operation_find_msg (ModestMailOperation *self, + TnyFolder *folder, + const gchar *msg_uid, + gboolean progress_feedback, + GetMsgAsyncUserCallback user_callback, + gpointer user_data) +{ + GetMsgInfo *helper = NULL; + ModestMailOperationPrivate *priv; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (msg_uid != NULL); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->total = 1; + priv->done = 0; + + /* Check memory low */ + if (_check_memory_low (self)) { + if (user_callback) + user_callback (self, NULL, FALSE, NULL, priv->error, user_data); + modest_mail_operation_notify_end (self); + return; + } + + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + + /* Check for cached messages */ + if (progress_feedback) { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; + } else { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN; + } + + /* Create the helper */ + helper = g_slice_new0 (GetMsgInfo); + helper->header = NULL; + helper->mail_op = g_object_ref (self); + helper->user_callback = user_callback; + helper->user_data = user_data; + helper->destroy_notify = NULL; + helper->last_total_bytes = 0; + helper->sum_total_bytes = 0; + helper->total_bytes = 0; + helper->more_msgs = NULL; + + modest_mail_operation_notify_start (self); + + /* notify about the start of the operation */ + ModestMailOperationState *state; + state = modest_mail_operation_clone_state (self); + state->done = 0; + state->total = 0; + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], + 0, state, NULL); + g_slice_free (ModestMailOperationState, state); + + tny_folder_find_msg_async (folder, msg_uid, get_msg_async_cb, get_msg_status_cb, helper); + + g_object_unref (G_OBJECT (folder)); +} + +void modest_mail_operation_get_msg (ModestMailOperation *self, TnyHeader *header, + gboolean progress_feedback, GetMsgAsyncUserCallback user_callback, gpointer user_data) { @@ -2097,20 +2574,31 @@ modest_mail_operation_get_msg (ModestMailOperation *self, g_return_if_fail (TNY_IS_HEADER (header)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - folder = tny_header_get_folder (header); - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; priv->total = 1; priv->done = 0; + /* Check memory low */ + if (_check_memory_low (self)) { + if (user_callback) + user_callback (self, header, FALSE, NULL, priv->error, user_data); + modest_mail_operation_notify_end (self); + return; + } + /* Get account and set it into mail_operation */ + folder = tny_header_get_folder (header); priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); /* Check for cached messages */ - if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) - priv->op_type = MODEST_MAIL_OPERATION_TYPE_OPEN; - else - priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; + if (progress_feedback) { + if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) + priv->op_type = MODEST_MAIL_OPERATION_TYPE_OPEN; + else + priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; + } else { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN; + } /* Create the helper */ helper = g_slice_new0 (GetMsgInfo); @@ -2122,6 +2610,7 @@ modest_mail_operation_get_msg (ModestMailOperation *self, helper->last_total_bytes = 0; helper->sum_total_bytes = 0; helper->total_bytes = tny_header_get_message_size (header); + helper->more_msgs = NULL; modest_mail_operation_notify_start (self); @@ -2132,6 +2621,7 @@ modest_mail_operation_get_msg (ModestMailOperation *self, state->total = 0; g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); + g_slice_free (ModestMailOperationState, state); tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, helper); @@ -2146,7 +2636,10 @@ get_msg_status_cb (GObject *obj, GetMsgInfo *helper = NULL; g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_GET_MSG); + + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_GET_MSG) + return; helper = (GetMsgInfo *) user_data; g_return_if_fail (helper != NULL); @@ -2180,16 +2673,16 @@ get_msg_async_cb (TnyFolder *folder, } /* If canceled by the user, ignore the error given by Tinymail */ - if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) { + if (canceled) { canceled = TRUE; finished = TRUE; - } else if (canceled || err) { + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; + } else if (err) { priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; - if (err) { - priv->error = g_error_copy ((const GError *) err); + priv->error = g_error_copy ((const GError *) err); + if (priv->error) { priv->error->domain = MODEST_MAIL_OPERATION_ERROR; - } - if (!priv->error) { + } else { g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, err->message); @@ -2199,6 +2692,8 @@ get_msg_async_cb (TnyFolder *folder, priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + if (info->header == NULL && msg) + info->header = tny_msg_get_header (msg); /* Call the user callback */ if (info->user_callback) @@ -2247,16 +2742,52 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, ModestMailOperationPrivate *priv = NULL; gint msg_list_size; TnyIterator *iter = NULL; + gboolean has_uncached_messages; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); /* Init mail operation */ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; priv->done = 0; priv->total = tny_list_get_length(header_list); + /* Check memory low */ + if (_check_memory_low (self)) { + if (user_callback) { + TnyHeader *header = NULL; + TnyIterator *iter; + + if (tny_list_get_length (header_list) > 0) { + iter = tny_list_create_iterator (header_list); + header = (TnyHeader *) tny_iterator_get_current (iter); + g_object_unref (iter); + } + user_callback (self, header, FALSE, NULL, priv->error, user_data); + if (header) + g_object_unref (header); + } + if (notify) + notify (user_data); + /* Notify about operation end */ + modest_mail_operation_notify_end (self); + return; + } + + /* Check uncached messages */ + for (iter = tny_list_create_iterator (header_list), has_uncached_messages = FALSE; + !has_uncached_messages && !tny_iterator_is_done (iter); + tny_iterator_next (iter)) { + TnyHeader *header; + + header = (TnyHeader *) tny_iterator_get_current (iter); + if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) + has_uncached_messages = TRUE; + g_object_unref (header); + } + g_object_unref (iter); + priv->op_type = has_uncached_messages?MODEST_MAIL_OPERATION_TYPE_RECEIVE:MODEST_MAIL_OPERATION_TYPE_OPEN; + /* Get account and set it into mail_operation */ if (tny_list_get_length (header_list) >= 1) { TnyIterator *iterator = tny_list_create_iterator (header_list); @@ -2272,7 +2803,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, g_object_unref (iterator); } - msg_list_size = compute_message_list_size (header_list); + msg_list_size = compute_message_list_size (header_list, 0); modest_mail_operation_notify_start (self); iter = tny_list_create_iterator (header_list); @@ -2313,81 +2844,63 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, } -void -modest_mail_operation_remove_msg (ModestMailOperation *self, - TnyHeader *header, - gboolean remove_to_trash /*ignored*/) -{ - TnyFolder *folder; +static void +remove_msgs_async_cb (TnyFolder *folder, + gboolean canceled, + GError *err, + gpointer user_data) +{ + gboolean expunge, leave_on_server; + const gchar *account_name; + TnyAccount *account; + ModestProtocolType account_proto = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID; + ModestMailOperation *self; ModestMailOperationPrivate *priv; + ModestProtocolRegistry *protocol_registry; - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_HEADER (header)); - - if (remove_to_trash) - g_warning ("remove to trash is not implemented"); - + self = (ModestMailOperation *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - folder = tny_header_get_folder (header); - - /* Get account and set it into mail_operation */ - priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); - priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE; - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - - /* remove message from folder */ - tny_folder_remove_msg (folder, header, &(priv->error)); - if (!priv->error) { - gboolean expunge, leave_on_server; - const gchar *account_name; - TnyAccount *account; - ModestTransportStoreProtocol account_proto; - - tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED); - tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); - - modest_mail_operation_notify_start (self); - - /* Get leave on server setting */ - account = tny_folder_get_account (folder); - account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - leave_on_server = - modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), - account_name); + protocol_registry = modest_runtime_get_protocol_registry (); - account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account)); - - if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) || - modest_tny_folder_is_remote_folder (folder) == FALSE) - expunge = TRUE; - else - expunge = FALSE; + if (canceled || err) { + /* If canceled by the user, ignore the error given by Tinymail */ + if (canceled) { + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; + } else if (err) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + priv->error = g_error_copy ((const GError *) err); + priv->error->domain = MODEST_MAIL_OPERATION_ERROR; + } + /* Exit */ + modest_mail_operation_notify_end (self); + g_object_unref (self); + return; + } - /* Sync folder */ - tny_folder_sync_async(folder, expunge, NULL, NULL, NULL); + account = modest_tny_folder_get_account (folder); + account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + leave_on_server = + modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), + account_name); + account_proto = modest_tny_account_get_protocol_type (account); + g_object_unref (account); - /* Unref */ - g_object_unref (account); - } - - - /* Set status */ - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + if ((modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_proto) && + !leave_on_server) || + !modest_tny_folder_is_remote_folder (folder)) + expunge = TRUE; else - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + expunge = FALSE; - /* Free */ - g_object_unref (G_OBJECT (folder)); - - /* Notify about operation end */ - modest_mail_operation_notify_end (self); + /* Sync folder */ + tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, + NULL, self); } void modest_mail_operation_remove_msgs (ModestMailOperation *self, TnyList *headers, - gboolean remove_to_trash /*ignored*/) + gboolean remove_to_trash /*ignored*/) { TnyFolder *folder = NULL; ModestMailOperationPrivate *priv; @@ -2395,6 +2908,7 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, TnyHeader *header = NULL; TnyList *remove_headers = NULL; TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN; + ModestTnyAccountStore *accstore = modest_runtime_get_account_store(); g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_LIST (headers)); @@ -2406,49 +2920,67 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, g_warning ("%s: list of headers is empty\n", __FUNCTION__); goto cleanup; /* nothing to do */ } - + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - remove_headers = g_object_ref(headers); /* Get folder from first header and sync it */ - iter = tny_list_create_iterator (headers); + iter = tny_list_create_iterator (headers); header = TNY_HEADER (tny_iterator_get_current (iter)); + g_object_unref (iter); - folder = tny_header_get_folder (header); + folder = tny_header_get_folder (header); if (!TNY_IS_FOLDER(folder)) { g_warning ("%s: could not get folder for header\n", __FUNCTION__); goto cleanup; } - /* Don't remove messages that are being sent */ + /* Use the merged folder if we're removing messages from outbox */ if (modest_tny_folder_is_local_folder (folder)) { + ModestTnyLocalFoldersAccount *local_account; + + local_account = (ModestTnyLocalFoldersAccount *) + modest_tny_account_store_get_local_folders_account (accstore); folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { + g_object_unref (folder); + folder = modest_tny_local_folders_account_get_merged_outbox (local_account); + } + g_object_unref (local_account); } + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { - TnyTransportAccount *traccount = NULL; - ModestTnyAccountStore *accstore = modest_runtime_get_account_store(); - traccount = modest_tny_account_store_get_transport_account_from_outbox_header(accstore, header); - if (traccount) { - ModestTnySendQueueStatus status; - ModestTnySendQueue *send_queue = modest_runtime_get_send_queue(traccount); - TnyIterator *iter = tny_list_create_iterator(headers); - g_object_unref(remove_headers); - remove_headers = TNY_LIST(tny_simple_list_new()); - while (!tny_iterator_is_done(iter)) { - char *msg_id; - TnyHeader *hdr = TNY_HEADER(tny_iterator_get_current(iter)); - msg_id = modest_tny_send_queue_get_msg_id (hdr); - status = modest_tny_send_queue_get_msg_status(send_queue, msg_id); - if (status != MODEST_TNY_SEND_QUEUE_SENDING) { - tny_list_append(remove_headers, G_OBJECT(hdr)); + TnyIterator *headers_iter = tny_list_create_iterator (headers); + + while (!tny_iterator_is_done (headers_iter)) { + TnyTransportAccount *traccount = NULL; + TnyHeader *hdr = NULL; + + hdr = TNY_HEADER (tny_iterator_get_current (headers_iter)); + traccount = modest_tny_account_store_get_transport_account_from_outbox_header (accstore, + header); + if (traccount) { + ModestTnySendQueueStatus status; + ModestTnySendQueue *send_queue; + + send_queue = modest_runtime_get_send_queue(traccount, TRUE); + if (TNY_IS_SEND_QUEUE (send_queue)) { + char *msg_id; + + msg_id = modest_tny_send_queue_get_msg_id (hdr); + status = modest_tny_send_queue_get_msg_status(send_queue, msg_id); + if (status != MODEST_TNY_SEND_QUEUE_SENDING) { + if (G_UNLIKELY (remove_headers == NULL)) + remove_headers = tny_simple_list_new (); + tny_list_append(remove_headers, G_OBJECT(hdr)); + } + g_free(msg_id); } - g_object_unref(hdr); - g_free(msg_id); - tny_iterator_next(iter); + g_object_unref(traccount); } - g_object_unref(iter); - g_object_unref(traccount); + g_object_unref(hdr); + tny_iterator_next (headers_iter); } + g_object_unref(headers_iter); } /* Get account and set it into mail_operation */ @@ -2456,60 +2988,21 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE; priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + if (!remove_headers) + remove_headers = g_object_ref (headers); + /* remove message from folder */ modest_mail_operation_notify_start (self); + tny_folder_remove_msgs_async (folder, remove_headers, remove_msgs_async_cb, + NULL, g_object_ref (self)); - tny_folder_remove_msgs (folder, remove_headers, &(priv->error)); - if (!priv->error) { - gboolean expunge, leave_on_server; - const gchar *account_name; - const gchar *proto; - TnyAccount *account; - ModestTransportStoreProtocol account_proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; - - account = tny_folder_get_account (folder); - account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - leave_on_server = - modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), - account_name); - - proto = tny_account_get_proto (account); - if (proto) { - account_proto = modest_protocol_info_get_transport_store_protocol (proto); - } - - if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) || - modest_tny_folder_is_remote_folder (folder) == FALSE) - expunge = TRUE; - else - expunge = FALSE; - - /* Sync folder */ - tny_folder_sync_async(folder, expunge, NULL, NULL, NULL); - - g_object_unref (account); - } - - - /* Set status */ - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - else - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - - /* Free */ cleanup: if (remove_headers) g_object_unref (remove_headers); if (header) g_object_unref (header); - if (iter) - g_object_unref (iter); if (folder) g_object_unref (folder); - - /* Notify about operation end */ - modest_mail_operation_notify_end (self); } static void @@ -2528,9 +3021,6 @@ notify_progress_of_multiple_messages (ModestMailOperation *self, /* We know that tinymail sends us information about * transferred bytes with this particular message - * - * (FIXME: this is very ugly, and no I (djcb) didn't write this code, - * I just added the 'if' so we don't get runtime warning) */ if (status->message) is_num_bytes = (g_ascii_strcasecmp (status->message, "Retrieving message") == 0); @@ -2572,7 +3062,10 @@ transfer_msgs_status_cb (GObject *obj, XFerMsgsAsyncHelper *helper; g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS); + + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_XFER_MSGS) + return; helper = (XFerMsgsAsyncHelper *) user_data; g_return_if_fail (helper != NULL); @@ -2582,6 +3075,35 @@ transfer_msgs_status_cb (GObject *obj, &(helper->sum_total_bytes), helper->total_bytes, TRUE); } +static void +transfer_msgs_sync_folder_cb (TnyFolder *self, + gboolean cancelled, + GError *err, + gpointer user_data) +{ + XFerMsgsAsyncHelper *helper; + /* We don't care here about the results of the + synchronization */ + helper = (XFerMsgsAsyncHelper *) user_data; + + /* Notify about operation end */ + modest_mail_operation_notify_end (helper->mail_op); + + /* If user defined callback function was defined, call it */ + if (helper->user_callback) + helper->user_callback (helper->mail_op, helper->user_data); + + /* Free */ + if (helper->more_msgs) + g_object_unref (helper->more_msgs); + if (helper->headers) + g_object_unref (helper->headers); + if (helper->dest_folder) + g_object_unref (helper->dest_folder); + if (helper->mail_op) + g_object_unref (helper->mail_op); + g_slice_free (XFerMsgsAsyncHelper, helper); +} static void transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data) @@ -2596,16 +3118,12 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (err) { + if (cancelled) { + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; + } else if (err) { priv->error = g_error_copy (err); priv->done = 0; priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - } else if (cancelled) { - priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, - _("Error trying to refresh the contents of %s"), - tny_folder_get_name (folder)); } else if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) { if (helper->more_msgs) { /* We'll transfer the next message in the list */ @@ -2620,7 +3138,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u finished = FALSE; } } - if (finished) { priv->done = 1; priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; @@ -2628,34 +3145,13 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u } if (finished) { - - /* Update folder counts */ - tny_folder_poke_status (folder); - tny_folder_poke_status (helper->dest_folder); - - /* Notify about operation end */ - modest_mail_operation_notify_end (self); - - /* If user defined callback function was defined, call it */ - if (helper->user_callback) { - /* This is not a GDK lock because we are a Tinymail callback and - * Tinymail already acquires the Gdk lock */ - - /* no gdk_threads_enter (), CHECKED */ - helper->user_callback (self, helper->user_data); - /* no gdk_threads_leave (), CHECKED */ - } - - /* Free */ - if (helper->more_msgs) - g_object_unref (helper->more_msgs); - if (helper->headers) - g_object_unref (helper->headers); - if (helper->dest_folder) - g_object_unref (helper->dest_folder); - if (helper->mail_op) - g_object_unref (helper->mail_op); - g_slice_free (XFerMsgsAsyncHelper, helper); + /* Synchronize the source folder contents. This should + be done by tinymail but the camel_folder_sync it's + actually disabled in transfer_msgs_thread_clean + because it's supposed to cause hangs */ + tny_folder_sync_async (folder, helper->delete, + transfer_msgs_sync_folder_cb, + NULL, helper); } else { /* Transfer more messages */ tny_folder_transfer_msgs_async (folder, @@ -2668,39 +3164,33 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u } } +/* Computes the size of the messages the headers in the list belongs + to. If num_elements is different from 0 then it only takes into + account the first num_elements for the calculation */ static guint -compute_message_list_size (TnyList *headers) +compute_message_list_size (TnyList *headers, + guint num_elements) { TnyIterator *iter; - guint size = 0; + guint size = 0, element = 0; + + /* If num_elements is not valid then take all into account */ + if ((num_elements <= 0) || (num_elements > tny_list_get_length (headers))) + num_elements = tny_list_get_length (headers); iter = tny_list_create_iterator (headers); - while (!tny_iterator_is_done (iter)) { + while (!tny_iterator_is_done (iter) && element < num_elements) { TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); size += tny_header_get_message_size (header); g_object_unref (header); tny_iterator_next (iter); + element++; } g_object_unref (iter); return size; } -static guint -compute_message_array_size (GPtrArray *headers) -{ - guint size = 0; - gint i; - - for (i = 0; i < headers->len; i++) { - TnyHeader *header = TNY_HEADER (g_ptr_array_index (headers, i)); - size += tny_header_get_message_size (header); - } - - return size; -} - - void modest_mail_operation_xfer_msgs (ModestMailOperation *self, TnyList *headers, @@ -2717,12 +3207,17 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, ModestTnyFolderRules rules = 0; TnyAccount *dst_account = NULL; gboolean leave_on_server; + ModestMailOperationState *state; + ModestProtocolRegistry *protocol_registry; + ModestProtocolType account_protocol; g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (headers && TNY_IS_LIST (headers)); g_return_if_fail (folder && TNY_IS_FOLDER (folder)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + protocol_registry = modest_runtime_get_protocol_registry (); + priv->total = tny_list_get_length (headers); priv->done = 0; priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; @@ -2781,10 +3276,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, helper->dest_folder = g_object_ref(folder); helper->user_callback = user_callback; helper->user_data = user_data; - helper->delete = delete_original; helper->last_total_bytes = 0; helper->sum_total_bytes = 0; - helper->total_bytes = compute_message_list_size (headers); + helper->total_bytes = compute_message_list_size (headers, 0); /* Get account and set it into mail_operation */ priv->account = modest_tny_folder_get_account (src_folder); @@ -2814,8 +3308,8 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, this could cause an error if we're offline while transferring an already downloaded message from a POP account */ - if (modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (priv->account)) == - MODEST_PROTOCOL_STORE_POP) { + account_protocol = modest_tny_account_get_protocol_type (priv->account); + if (modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_protocol)) { const gchar *account_name; account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (priv->account); @@ -2825,11 +3319,22 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, leave_on_server = FALSE; } + /* Do not delete messages if leave on server is TRUE */ + helper->delete = (leave_on_server) ? FALSE : delete_original; + modest_mail_operation_notify_start (self); + + /* Start notifying progress */ + state = modest_mail_operation_clone_state (self); + state->done = 0; + state->total = 0; + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); + g_slice_free (ModestMailOperationState, state); + tny_folder_transfer_msgs_async (src_folder, helper->headers, folder, - (leave_on_server) ? FALSE : delete_original, + helper->delete, transfer_msgs_cb, transfer_msgs_status_cb, helper); @@ -2900,7 +3405,10 @@ on_refresh_folder_status_update (GObject *obj, g_return_if_fail (user_data != NULL); g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_REFRESH); + + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_REFRESH) + return; helper = (RefreshAsyncHelper *) user_data; self = helper->mail_op; @@ -2931,9 +3439,17 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + /* Check memory low */ + if (_check_memory_low (self)) { + if (user_callback) + user_callback (self, folder, user_data); + /* Notify about operation end */ + modest_mail_operation_notify_end (self); + return; + } /* Get account and set it into mail_operation */ + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; priv->account = modest_tny_folder_get_account (folder); priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; @@ -2952,8 +3468,7 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, state->total = 0; g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); - - /* FIXME: we're leaking the state here, or? valgrind thinks so */ + g_slice_free (ModestMailOperationState, state); tny_folder_refresh_async (folder, on_refresh_folder, @@ -2962,54 +3477,181 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, } static void +run_queue_notify_and_destroy (RunQueueHelper *helper, + ModestMailOperationStatus status) +{ + ModestMailOperationPrivate *priv; + + /* Disconnect */ + if (helper->error_handler && + g_signal_handler_is_connected (helper->queue, helper->error_handler)) + g_signal_handler_disconnect (helper->queue, helper->error_handler); + if (helper->start_handler && + g_signal_handler_is_connected (helper->queue, helper->start_handler)) + g_signal_handler_disconnect (helper->queue, helper->start_handler); + if (helper->stop_handler && + g_signal_handler_is_connected (helper->queue, helper->stop_handler)) + g_signal_handler_disconnect (helper->queue, helper->stop_handler); + + /* Set status */ + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (helper->self); + priv->status = status; + + /* Notify end */ + modest_mail_operation_notify_end (helper->self); + + /* Free data */ + g_object_unref (helper->queue); + g_object_unref (helper->self); + g_slice_free (RunQueueHelper, helper); +} + +static void run_queue_stop (ModestTnySendQueue *queue, - ModestMailOperation *self) + gpointer user_data) +{ + RunQueueHelper *helper; + + g_debug ("%s sending queue stopped", __FUNCTION__); + + helper = (RunQueueHelper *) user_data; + run_queue_notify_and_destroy (helper, MODEST_MAIL_OPERATION_STATUS_SUCCESS); +} + +void +modest_mail_operation_run_queue (ModestMailOperation *self, + ModestTnySendQueue *queue) { ModestMailOperationPrivate *priv; + RunQueueHelper *helper; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->account = TNY_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (queue))); + priv->op_type = MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE; + + /* Create the helper */ + helper = g_slice_new0 (RunQueueHelper); + helper->queue = g_object_ref (queue); + helper->self = g_object_ref (self); + helper->stop_handler = g_signal_connect (queue, "queue-stop", + G_CALLBACK (run_queue_stop), + helper); + + /* Notify operation has started */ + modest_mail_operation_notify_start (self); + g_debug ("%s, run queue started", __FUNCTION__); +} + +static void +queue_wakeup_callback (ModestTnySendQueue *queue, + gboolean cancelled, + GError *error, + gpointer userdata) +{ + ModestMailOperation *mail_op; + ModestMailOperationPrivate *priv; + + mail_op = (ModestMailOperation *) userdata; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (queue)); + + /* Notify end */ + modest_mail_operation_notify_end (mail_op); + g_object_unref (mail_op); +} + +void +modest_mail_operation_queue_wakeup (ModestMailOperation *self, + ModestTnySendQueue *queue) +{ + ModestMailOperationPrivate *priv; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue)); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->account = TNY_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (queue))); + priv->op_type = MODEST_MAIL_OPERATION_TYPE_QUEUE_WAKEUP; + + g_object_ref (self); + + modest_tny_send_queue_wakeup (queue, queue_wakeup_callback, self); + modest_mail_operation_notify_start (self); +} + +static void +shutdown_callback (ModestTnyAccountStore *account_store, gpointer userdata) +{ + ModestMailOperation *self = (ModestMailOperation *) userdata; + ModestMailOperationPrivate *priv; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (account_store)); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; modest_mail_operation_notify_end (self); - g_signal_handlers_disconnect_by_func (queue, run_queue_stop, self); g_object_unref (self); } + void -modest_mail_operation_run_queue (ModestMailOperation *self, - ModestTnySendQueue *queue) +modest_mail_operation_shutdown (ModestMailOperation *self, ModestTnyAccountStore *account_store) { ModestMailOperationPrivate *priv; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue)); + g_return_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (account_store)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + modest_mail_operation_queue_set_running_shutdown (modest_runtime_get_mail_operation_queue ()); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - priv->account = TNY_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (queue))); - priv->op_type = MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE; + priv->account = NULL; + priv->op_type = MODEST_MAIL_OPERATION_TYPE_SHUTDOWN; modest_mail_operation_notify_start (self); g_object_ref (self); - g_signal_connect ((gpointer) queue, "queue-stop", G_CALLBACK (run_queue_stop), (gpointer) self); + modest_tny_account_store_shutdown (account_store, shutdown_callback, self); } static void -sync_folder_finish_callback (TnyFolder *self, gboolean cancelled, GError *err, ModestMailOperation *mail_op) +sync_folder_finish_callback (TnyFolder *self, + gboolean cancelled, + GError *err, + gpointer user_data) + { + ModestMailOperation *mail_op; ModestMailOperationPrivate *priv; + mail_op = (ModestMailOperation *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); - if (err != NULL) { - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, - err->message); - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + + /* If canceled by the user, ignore the error given by Tinymail */ + if (cancelled) { + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; + } else if (err) { + /* If the operation was a sync then the status is + failed, but if it's part of another operation then + just set it as finished with errors */ + if (priv->op_type == MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER) + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + else + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + priv->error = g_error_copy ((const GError *) err); + priv->error->domain = MODEST_MAIL_OPERATION_ERROR; } else { priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + modest_mail_operation_notify_end (mail_op); g_object_unref (mail_op); } @@ -3025,12 +3667,14 @@ modest_mail_operation_sync_folder (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - priv->account = TNY_ACCOUNT (tny_folder_get_account (folder)); + priv->account = modest_tny_folder_get_account (folder); priv->op_type = MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER; modest_mail_operation_notify_start (self); g_object_ref (self); - tny_folder_sync_async (folder, expunge, (TnyFolderCallback) sync_folder_finish_callback, NULL, self); + tny_folder_sync_async (folder, expunge, + (TnyFolderCallback) sync_folder_finish_callback, + NULL, self); } static void @@ -3151,3 +3795,25 @@ modest_mail_operation_to_string (ModestMailOperation *self) priv->done, priv->total, priv->error && priv->error->message ? priv->error->message : ""); } + +/* + * Once the mail operations were objects this will be no longer + * needed. I don't like it, but we need it for the moment + */ +static gboolean +_check_memory_low (ModestMailOperation *mail_op) +{ + if (modest_platform_check_memory_low (NULL, FALSE)) { + ModestMailOperationPrivate *priv; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + g_set_error (&(priv->error), + MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_LOW_MEMORY, + "Not enough memory to complete the operation"); + return TRUE; + } else { + return FALSE; + } +}