X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=f216937887c4cef12ec339224dcac2dbb4553858;hp=ec3dc0471d29d696a85c4a949cf7ad907293ccd6;hb=967eb8e0d5a8246994967b628cb43da3ced86d89;hpb=5c10a6a7b752651d4700639f7ee3139a2476dbe0 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index ec3dc04..f216937 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -53,7 +53,7 @@ #include #include #include - +#include "modest-utils.h" #include #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" @@ -150,6 +150,13 @@ struct _ModestTnyAccountStorePrivate { MODEST_TYPE_TNY_ACCOUNT_STORE, \ ModestTnyAccountStorePrivate)) +#define RETRY_ATTEMPTS 3 + +typedef struct _PwdAttempt { + gint count; + gchar *pwd; +} PwdAttempt; + /* globals */ static GObjectClass *parent_class = NULL; @@ -251,7 +258,21 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestTnyAccountStorePrivate)); } - + +static void +free_pwd_attempt (gpointer data) +{ + PwdAttempt *attempt = (PwdAttempt *) data; + + /* Note that we sometimes insert NULL */ + if (!attempt) + return; + + if (attempt->pwd) + g_free (attempt->pwd); + g_slice_free (PwdAttempt, attempt); +} + static void modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) { @@ -265,7 +286,7 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) priv->device = NULL; priv->sighandlers = NULL; priv->send_mail_blocked = FALSE; - + priv->outbox_of_transport = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, @@ -276,7 +297,7 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) * so they need to be asked for from the user once in each session: */ priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, g_free); + g_free, free_pwd_attempt); } /* disconnect the list of TnyAccounts */ @@ -407,8 +428,8 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, g_object_unref (mmc_account); } else { - g_warning ("%s: there was no store account for the unmounted MMC", - __FUNCTION__); + g_debug ("%s: there was no store account for the unmounted MMC", + __FUNCTION__); } } g_free (volume_path_uri); @@ -469,14 +490,6 @@ on_account_changed (ModestAccountMgr *acc_mgr, } static void -show_password_warning_only (const gchar *msg) -{ - /* Show an explanatory temporary banner: */ - if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ())) - modest_platform_information_banner (NULL, NULL, msg); -} - -static void show_wrong_password_dialog (TnyAccount *account, gboolean show_banner) { @@ -520,16 +533,17 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc ModestTnyAccountStorePrivate *priv; gchar *username = NULL; gchar *pwd = NULL; - gpointer pwd_ptr = NULL; gboolean already_asked = FALSE; const gchar *server_account_name; gchar *url_string; + PwdAttempt *attempt = NULL; + gpointer attempt_ptr = NULL; g_return_val_if_fail (account, NULL); - + MODEST_DEBUG_BLOCK( g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); - ); + ); /* Get a reference to myself */ self = MODEST_TNY_ACCOUNT_STORE (g_object_get_data (G_OBJECT(account), "account_store")); @@ -557,7 +571,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc server_account_name = tny_account_get_id (account); if (!server_account_name || !self) { - g_warning ("modest: %s: could not retrieve account_store for account %s", + g_warning ("%s: could not retrieve account_store for account %s", __FUNCTION__, server_account_name ? server_account_name : ""); if (cancel) *cancel = TRUE; @@ -565,24 +579,51 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc return NULL; } + /* We need to do this to avoid "dereferencing type-punned pointer will break strict-aliasing rules" */ + attempt_ptr = (gpointer) &attempt; + /* This hash map stores passwords, including passwords that are not stored in gconf. */ /* Is it in the hash? if it's already there, it must be wrong... */ - pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about - * type-punned ptrs...*/ - already_asked = priv->password_hash && - g_hash_table_lookup_extended (priv->password_hash, - server_account_name, - NULL, - (gpointer*)&pwd_ptr); - MODEST_DEBUG_BLOCK( - g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked); - ); + already_asked = priv->password_hash && g_hash_table_lookup_extended (priv->password_hash, + server_account_name, + NULL, + &attempt_ptr); /* If the password is not already there, try ModestConf */ if (!already_asked) { pwd = modest_account_mgr_get_server_account_password (priv->account_mgr, server_account_name); - g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup (pwd)); + PwdAttempt *new_attempt = g_slice_new0 (PwdAttempt); + new_attempt->count = RETRY_ATTEMPTS; + new_attempt->pwd = g_strdup (pwd); + g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), new_attempt); + } else if (attempt) { + pwd = g_strdup (attempt->pwd); + } + + /* This is horrible but we need it until we don't get a proper + fix into tinymail. Thing is that tinymail incorrectly asks + for password when the connection to the server failed due a + timeout (slow network connection, firewalls...). In those + cases it makes no sense to ask the user. It's better just + to cancel cleanly */ + if (g_strstr_len (prompt_not_used, -1, "Connection timed out")) { + g_debug ("%s, Incorrect get_password with connection issue %s", + __FUNCTION__, (attempt && (attempt->count > 0)) ? "retrying" : "canceling"); + if (attempt) { + if (attempt->count == 0) { + modest_tny_account_store_reset_attempt_count (self, account); + if (cancel) + *cancel = TRUE; + return NULL; + } else { + return pwd; + } + } else { + if (cancel) + *cancel = TRUE; + return NULL; + } } /* If it was already asked, it must have been wrong, so ask again */ @@ -590,11 +631,11 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc gboolean settings_have_password; ModestProtocolType protocol_type; - /* As per the UI spec, if no password was set in the account settings, - * ask for it now. But if the password is wrong in the account settings, + /* As per the UI spec, if no password was set in the account settings, + * ask for it now. But if the password is wrong in the account settings, * then show a banner and the account settings dialog so it can be corrected: */ - settings_have_password = + settings_have_password = modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name); protocol_type = modest_tny_account_get_protocol_type (account); @@ -614,15 +655,14 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc password = modest_account_mgr_get_server_account_password (priv->account_mgr, server_account_name); - if (already_asked) - msg = g_strdup (_("mcen_ib_username_pw_incorrect")); - else if (!password || strlen(password) == 0) + if (!password || strlen(password) == 0) { msg = g_strdup_printf (_("emev_ni_ui_smtp_passwd_invalid"), tny_account_get_name (account), tny_account_get_hostname (account)); - else + } else { msg = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), tny_account_get_hostname (account)); + } if (password) g_free (password); } @@ -632,6 +672,20 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc } if (username) g_free (username); + } else { + if (already_asked) { + const gchar *msg; + gboolean username_known = + modest_account_mgr_get_server_account_username_has_succeeded(priv->account_mgr, + server_account_name); + /* If the login has ever succeeded then show a specific message */ + if (username_known) + msg = _CS ("ecdg_ib_set_password_incorrect"); + else + msg = _("mcen_ib_username_pw_incorrect"); + if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ())) + modest_platform_information_banner (NULL, NULL, msg); + } } if (settings_have_password) { @@ -645,61 +699,25 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc } /* we don't have it yet. Get the password from the user */ + pwd = NULL; const gchar* account_id = tny_account_get_id (account); gboolean remember = FALSE; - pwd = NULL; - - if (already_asked) { - const gchar *msg; - gboolean username_known = - modest_account_mgr_get_server_account_username_has_succeeded(priv->account_mgr, - server_account_name); - /* If the login has ever succeeded then show a specific message */ - if (username_known) - msg = _CS ("ecdg_ib_set_password_incorrect"); - else - msg = _("mcen_ib_username_pw_incorrect"); - show_password_warning_only (msg); - } - - /* Request password */ g_signal_emit (G_OBJECT (self), signals[PASSWORD_REQUESTED_SIGNAL], 0, account_id, /* server_account_name */ &username, &pwd, cancel, &remember); - - if (!*cancel) { - /* The password will be returned as the result, - * but we need to tell tinymail about the username too: */ - - /* WARNING: I disabled setting username as this can cause locks. Anyway, - * as now we have the password dialog username entry always dimmed - * this shouldn't be a problem */ - - /* if (username) */ - /* tny_account_set_user (account, username); */ - - /* Do not save the password in gconf, because - * the UI spec says "The password will never - * be saved in the account": */ - - /* We need to dup the string even knowing that - it's already a dup of the contents of an - entry, because it if it's wrong, then camel - will free it */ - g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup(pwd)); - } else { + if (*cancel) { g_hash_table_remove (priv->password_hash, server_account_name); - g_free (pwd); pwd = NULL; } g_free (username); username = NULL; - } else + } else { if (cancel) - *cancel = FALSE; + *cancel = FALSE; + } return pwd; } @@ -727,7 +745,7 @@ modest_tny_account_store_forget_already_asked (ModestTnyAccountStore *self, TnyA (gpointer*)&pwd_ptr); if (already_asked) { - g_hash_table_remove (priv->password_hash, server_account_name); + g_hash_table_remove (priv->password_hash, server_account_name); g_free (pwd); pwd = NULL; } @@ -743,9 +761,9 @@ forget_password (TnyAccount *account) ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; const TnyAccountStore *account_store; - gchar *pwd; const gchar *key; - + PwdAttempt *attempt; + account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), "account_store")); self = MODEST_TNY_ACCOUNT_STORE (account_store); @@ -754,17 +772,16 @@ forget_password (TnyAccount *account) /* Do not remove the key, this will allow us to detect that we have already asked for it at least once */ - pwd = g_hash_table_lookup (priv->password_hash, key); - if (pwd) { - memset (pwd, 0, strlen (pwd)); - g_hash_table_insert (priv->password_hash, g_strdup (key), NULL); + attempt = g_hash_table_lookup (priv->password_hash, key); + if (attempt) { + attempt->count--; + g_debug ("%s, remaining %d for account %s", __FUNCTION__, attempt->count, key); + if (attempt->count == 0) { + if (attempt->pwd) + memset (attempt->pwd, 0, strlen (attempt->pwd)); + g_hash_table_insert (priv->password_hash, g_strdup (key), NULL); + } } - - /* Remove from configuration system */ - /* - modest_account_mgr_unset (priv->account_mgr, - key, MODEST_ACCOUNT_PASSWORD, TRUE); - */ } static void @@ -775,7 +792,7 @@ modest_tny_account_store_finalize (GObject *obj) g_free (priv->cache_dir); priv->cache_dir = NULL; - + if (priv->password_hash) { g_hash_table_destroy (priv->password_hash); priv->password_hash = NULL; @@ -888,6 +905,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyAccount *local_account = NULL; TnyLockable *lockable; GnomeVFSVolumeMonitor* monitor = NULL; + gboolean auto_update; g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (device, NULL); @@ -898,6 +916,13 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, priv->account_mgr = g_object_ref (G_OBJECT(account_mgr)); priv->device = g_object_ref (device); + /* If autoupdate is off then we don't try to connect to the + accounts when they're added to the account store*/ + auto_update = modest_conf_get_bool (modest_runtime_get_conf (), + MODEST_CONF_AUTO_UPDATE, NULL); + if (!auto_update) + tny_device_force_offline (priv->device); + priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj)); if (!priv->session) { g_warning ("failed to get TnySessionCamel"); @@ -940,7 +965,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, priv->store_accounts_outboxes = tny_simple_list_new (); /* Create the local folders account */ - local_account = + local_account = modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session, NULL); tny_list_append (priv->store_accounts, G_OBJECT(local_account)); g_object_unref (local_account); @@ -961,6 +986,9 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */); } + /* Initialize session */ + tny_session_camel_set_initialized (priv->session); + return MODEST_TNY_ACCOUNT_STORE(obj); } @@ -990,9 +1018,6 @@ modest_tny_account_store_get_accounts (TnyAccountStore *self, default: g_return_if_reached (); } - - /* Initialize session. Why do we need this ??? */ - tny_session_camel_set_initialized (priv->session); } @@ -1053,13 +1078,13 @@ modest_tny_account_store_alert (TnyAccountStore *self, /* NOTE: account may be NULL in some cases */ g_return_val_if_fail (error, FALSE); - + /* Get the server name: */ if (account) { server_name = tny_account_get_hostname (account); protocol_type = modest_tny_account_get_protocol_type (account); if (protocol_type == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID){ - g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__, + g_warning("%s: account with id=%s has no proto.\n", __FUNCTION__, tny_account_get_id (account)); return FALSE; } @@ -1087,7 +1112,6 @@ modest_tny_account_store_alert (TnyAccountStore *self, g_return_val_if_reached (FALSE); } break; - case TNY_SERVICE_ERROR_AUTHENTICATE: /* It seems that there's no better error to show with * POP and IMAP because TNY_SERVICE_ERROR_AUTHENTICATE @@ -1099,19 +1123,23 @@ modest_tny_account_store_alert (TnyAccountStore *self, g_return_val_if_reached (FALSE); } break; - case TNY_SERVICE_ERROR_CERTIFICATE: /* We'll show the proper dialog later */ break; case TNY_SYSTEM_ERROR_MEMORY: /* Can't allocate memory for this operation */ - - case TNY_SERVICE_ERROR_UNKNOWN: + if (modest_tny_account_store_check_disk_full_error ((ModestTnyAccountStore*)self, + NULL, error, account, NULL)) + retval = FALSE; + break; + case TNY_SERVICE_ERROR_UNKNOWN: return FALSE; default: - g_debug ("Unexpected error %d", error->code); - g_return_val_if_reached (FALSE); + /* We don't treat this as an error, but as a not handled message. Then, + * debug message, and return false */ + g_debug ("Unexpected error %d (%s)", error->code, error->message); + return FALSE; } @@ -1122,6 +1150,14 @@ modest_tny_account_store_alert (TnyAccountStore *self, error->code == TNY_SERVICE_ERROR_CONNECT) { TnyDevice *device = modest_runtime_get_device (); + if (error->code == TNY_SERVICE_ERROR_CONNECT) { + gboolean success; + success = modest_account_mgr_get_server_account_username_has_succeeded (modest_runtime_get_account_mgr (), + tny_account_get_id (account)); + if (success) + goto end; + } + modest_platform_run_information_dialog (NULL, prompt, TRUE); /* Show the account dialog. Checking the online status @@ -1133,7 +1169,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, retval = TRUE; } - + end: g_debug ("%s: error code %d (%s", __FUNCTION__, error->code, error->message); if (prompt) @@ -2184,6 +2220,51 @@ modest_tny_account_store_shutdown (ModestTnyAccountStore *self, } gboolean +modest_tny_account_store_is_shutdown (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + TnyIterator *iter; + gboolean found; + + found = FALSE; + + for (iter = tny_list_create_iterator (priv->store_accounts); + !found && !tny_iterator_is_done (iter); + tny_iterator_next (iter)) { + TnyAccount *account; + + account = (TnyAccount *) tny_iterator_get_current (iter); + if (TNY_IS_ACCOUNT (account)) { + found = (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED) || + (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_RECONNECTING); + } + g_object_unref (account); + } + g_object_unref (iter); + + if (found) + return !found; + + for (iter = tny_list_create_iterator (priv->transport_accounts); + !found && !tny_iterator_is_done (iter); + tny_iterator_next (iter)) { + TnyAccount *account; + + account = (TnyAccount *) tny_iterator_get_current (iter); + if (TNY_IS_ACCOUNT (account)) { + found = (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED) || + (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_RECONNECTING); + } + g_object_unref (account); + } + g_object_unref (iter); + + return !found; + +} + + +gboolean modest_tny_account_store_is_send_mail_blocked (ModestTnyAccountStore *self) { ModestTnyAccountStorePrivate *priv; @@ -2256,3 +2337,94 @@ modest_tny_account_store_start_send_queues (ModestTnyAccountStore *self) tny_list_foreach (tmp, (GFunc) init_send_queue, NULL); g_object_unref (tmp); } + + +gboolean +modest_tny_account_store_check_disk_full_error (ModestTnyAccountStore *self, + GtkWidget *parent_window, + GError *err, + TnyAccount *account, + const gchar *alternate) +{ + if (err == NULL) + return FALSE; + + if (modest_tny_account_store_is_disk_full_error (self, err, account)) { + gboolean is_mcc = modest_tny_account_is_memory_card_account (account); + if (is_mcc && alternate) { + modest_platform_information_banner (parent_window, NULL, alternate); + } else { + gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), ""); + modest_platform_information_banner (parent_window, NULL, msg); + g_free (msg); + } + } else if (err->code == TNY_SYSTEM_ERROR_MEMORY) + /* If the account was created in memory full + conditions then tinymail won't be able to + connect so it'll return this error code */ + modest_platform_information_banner (parent_window, + NULL, _("emev_ui_imap_inbox_select_error")); + else + return FALSE; + + return TRUE; +} + +gboolean +modest_tny_account_store_is_disk_full_error (ModestTnyAccountStore *self, + GError *error, + TnyAccount *account) +{ + gboolean enough_free_space = TRUE; + GnomeVFSURI *cache_dir_uri; + const gchar *cache_dir = NULL; + GnomeVFSFileSize free_space; + + /* Cache dir is different in case we're using an external storage (like MMC account) */ + if (account && modest_tny_account_is_memory_card_account (account)) + cache_dir = g_getenv (MODEST_MMC1_VOLUMEPATH_ENV); + + /* Get the default local cache dir */ + if (!cache_dir) + cache_dir = tny_account_store_get_cache_dir ((TnyAccountStore *) self); + + cache_dir_uri = gnome_vfs_uri_new (cache_dir); + if (cache_dir_uri) { + if (gnome_vfs_get_volume_free_space (cache_dir_uri, &free_space) == GNOME_VFS_OK) { + if (free_space < MODEST_TNY_ACCOUNT_STORE_MIN_FREE_SPACE) + enough_free_space = FALSE; + } + gnome_vfs_uri_unref (cache_dir_uri); + } + + if ((error->code == TNY_SYSTEM_ERROR_MEMORY || + /* When asking for a mail and no space left on device + tinymail returns this error */ + error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE || + /* When the folder summary could not be read or + written */ + error->code == TNY_IO_ERROR_WRITE || + error->code == TNY_IO_ERROR_READ) && + !enough_free_space) { + return TRUE; + } else { + return FALSE; + } +} + +void +modest_tny_account_store_reset_attempt_count (ModestTnyAccountStore *self, + TnyAccount *account) +{ + ModestTnyAccountStorePrivate *priv; + PwdAttempt *attempt; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* Reset the count */ + attempt = g_hash_table_lookup (priv->password_hash, tny_account_get_id (account)); + if (attempt) { + attempt->count = RETRY_ATTEMPTS; + g_debug ("%s, reseting the attempt count for account %s", __FUNCTION__, tny_account_get_id (account)); + } +}