X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=cfa79f4b38623bdcf4ba831a81e814181daae3b3;hp=ca2e6c86c9b85c3b7ae13c5e4321eb326d154bf8;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=65aed723f936a94579a16855f66d58f87e74eeec diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index ca2e6c8..cfa79f4 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -27,43 +27,53 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include +#include #include #include -#include #include #include #include +#include #include #include #include #include #include +#include #include +#include +#include #include -#ifdef MODEST_HAVE_HILDON0_WIDGETS +#ifndef MODEST_TOOLKIT_GTK +#if MODEST_HILDON_API == 0 #include #else #include #endif +#endif + +/* we need these dummy functions, or tinymail will complain */ +static gchar * get_pass_dummy (TnyAccount *account, const gchar *prompt, gboolean *cancel); +static void forget_pass_dummy (TnyAccount *account); TnyFolder * modest_tny_account_get_special_folder (TnyAccount *account, TnyFolderType special_type) { - TnyList *folders; - TnyIterator *iter; + TnyList *folders = NULL; + TnyIterator *iter = NULL; TnyFolder *special_folder = NULL; - + TnyAccount *local_account = NULL; + GError *error = NULL; g_return_val_if_fail (account, NULL); g_return_val_if_fail (0 <= special_type && special_type < TNY_FOLDER_TYPE_NUM, NULL); - TnyAccount *local_account = NULL; - /* The accounts have already been instantiated by * modest_tny_account_store_get_accounts(), which is the * TnyAccountStore::get_accounts_func() implementation, @@ -71,380 +81,321 @@ modest_tny_account_get_special_folder (TnyAccount *account, */ /* Per-account outbox folders are each in their own on-disk directory: */ - if (special_type == TNY_FOLDER_TYPE_OUTBOX) { - const gchar *modest_account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); - g_assert (modest_account_name); + if ((special_type == TNY_FOLDER_TYPE_OUTBOX) && + (!modest_tny_account_is_virtual_local_folders (account))) { + + gchar *account_id; + const gchar *modest_account_name; - gchar *account_id = g_strdup_printf ( + modest_account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + if (!modest_account_name) { + g_warning ("%s: could not get modest account name", __FUNCTION__); + return NULL; + } + + account_id = g_strdup_printf ( MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", modest_account_name); local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(), MODEST_TNY_ACCOUNT_STORE_QUERY_ID, account_id); - g_free (account_id); - } else { + g_free (account_id); + } else /* Other local folders are all in one on-disk directory: */ local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(), MODEST_TNY_ACCOUNT_STORE_QUERY_ID, MODEST_LOCAL_FOLDERS_ACCOUNT_ID); - } - if (!local_account) { g_printerr ("modest: cannot get local account\n"); - return NULL; + goto cleanup; } folders = TNY_LIST (tny_simple_list_new ()); - + /* There is no need to do this _async, as these are local folders. */ /* TODO: However, this seems to fail sometimes when the network is busy, - * returning an empty list. murrayc. */ - tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), - folders, NULL, NULL); + * returning an empty list. murrayc. */ + tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), folders, NULL, FALSE, &error); + if (error) { + g_warning ("%s: tny_folder_store_get_folders() failed:%s\n", __FUNCTION__, error->message); + g_error_free (error); + goto cleanup; + } + + if (tny_list_get_length (folders) == 0) { + gchar* url_string = tny_account_get_url_string (local_account); + g_printerr ("modest: %s: tny_folder_store_get_folders(%s) returned an empty list\n", + __FUNCTION__, url_string); + g_free (url_string); + goto cleanup; + } + iter = tny_list_create_iterator (folders); while (!tny_iterator_is_done (iter)) { - TnyFolder *folder = - TNY_FOLDER (tny_iterator_get_current (iter)); - if (modest_tny_folder_get_local_folder_type (folder) == special_type) { - special_folder = folder; - break; + TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter)); + if (folder) { + if (modest_tny_folder_get_local_or_mmc_folder_type (folder) == special_type) { + special_folder = folder; + break; /* Leaving a ref for the special_folder return value. */ + } + g_object_unref (folder); } - - g_object_unref (G_OBJECT(folder)); tny_iterator_next (iter); } - g_object_unref (G_OBJECT (folders)); - g_object_unref (G_OBJECT (iter)); - g_object_unref (G_OBJECT (local_account)); - +cleanup: + if (folders) + g_object_unref (folders); + if (iter) + g_object_unref (iter); + if (local_account) + g_object_unref (local_account); + return special_folder; } -typedef struct -{ - GSourceFunc func; - GMainLoop* loop; -} UtilIdleData; - -static gboolean util_on_idle(gpointer user_data) +/** + * create_tny_account: + * @session: A valid TnySessionCamel instance. + * @account_data: the server account for which to create a corresponding tny account + * + * get a tnyaccount corresponding to the server_accounts (store or transport) for this account. + * NOTE: this function does not set the camel session or the get/forget password functions + * + * Returns: a new TnyAccount or NULL in case of error. + */ +static TnyAccount* +create_tny_account (TnySessionCamel *session, + ModestServerAccountSettings *server_settings) { - /* We are now in the main thread, - * so we can call the function: - */ - UtilIdleData *idle_data = (UtilIdleData*)user_data; - if (idle_data && idle_data->func) - (*(idle_data->func))(NULL); - - /* Stop the main loop so that the caller can continue: */ - if (idle_data->loop) - g_main_loop_quit (idle_data->loop); + TnyAccount *tny_account = NULL; + ModestProtocolType protocol_type; + ModestProtocolRegistry *protocol_registry; + ModestProtocol *protocol; + + g_return_val_if_fail (session, NULL); + g_return_val_if_fail (server_settings, NULL); + protocol_type = modest_server_account_settings_get_protocol (server_settings); + g_return_val_if_fail (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID, NULL); + + protocol_registry = modest_runtime_get_protocol_registry (); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type); - return FALSE; /* Stop calling this callback. */ -} + if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) { + ModestAccountProtocol *acocunt_proto = MODEST_ACCOUNT_PROTOCOL (protocol); + tny_account = modest_account_protocol_create_account (acocunt_proto); + } -static void -util_run_in_main_thread_and_wait(GSourceFunc function) -{ - UtilIdleData *data = g_slice_new0 (UtilIdleData); - data->func = function; - data->loop = g_main_loop_new (NULL, FALSE /* not running */); - - /* Cause the function to be run in an idle-handler, which is always - * in the main thread: - */ - g_idle_add (util_on_idle, &data); + if (!tny_account) { + g_printerr ("modest: %s: could not create tny account for '%s'\n", + __FUNCTION__, modest_server_account_settings_get_account_name (server_settings)); + return NULL; + } + tny_account_set_id (tny_account, modest_server_account_settings_get_account_name (server_settings)); - /* This main loop will run until the idle handler has stopped it: */ - g_main_loop_run (data->loop); - g_main_loop_unref (data->loop); + /* This must be set quite early, or other set() functions will fail. */ + tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session); + + /* Proto */ + tny_account_set_proto (tny_account, modest_protocol_get_name (protocol)); - g_slice_free (UtilIdleData, data); + return tny_account; } -static gboolean -connect_and_wait(gpointer user_data) -{ - modest_platform_connect_and_wait(NULL); - return TRUE; /* Ignored */ -} -static void -on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, gpointer user_data) -{ - printf ("DEBUG: %s: status=%d\n", __FUNCTION__, status); - - if (status == TNY_CONNECTION_STATUS_DISCONNECTED) { - /* We are trying to use the network with an account, - * but the accounts are set as offline, because our TnyDevice is offline, - * because libconic says we are offline. - * So ask the user to go online: - * - * We make sure that this UI is shown in the main thread, to avoid races, - * because tinymail does not guarantee that this signal handler will be called - * in the main thread. - */ - util_run_in_main_thread_and_wait (&connect_and_wait); - } else if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) { - printf ("DEBUG: %s: Connection broken. Forcing TnyDevice offline.\n", - __FUNCTION__); - - /* Something went wrong during some network operation. - * Stop trying to use the network now, - * by forcing accounts into offline mode: - * - * When libconic reconnects, it will set the device back online again, - * regardless of it being forced offline before. - */ - TnyDevice *device = modest_runtime_get_device (); - tny_device_force_offline (device); - } -} /* Camel options: */ -/* These seem to be listed in - * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c - */ #define MODEST_ACCOUNT_OPTION_SSL "use_ssl" -#define MODEST_ACCOUNT_OPTION_SSL_NEVER "never" -/* This is a tinymail camel-lite specific option, - * roughly equivalent to "always" in regular camel, - * which is appropriate for a generic "SSL" connection option: */ -#define MODEST_ACCOUNT_OPTION_SSL_WRAPPED "wrapped" -/* Not used in our UI so far: */ -#define MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE "when-possible" -/* This is a tinymailcamel-lite specific option that is not in regular camel. */ -#define MODEST_ACCOUNT_OPTION_SSL_TLS "tls" - -/* These seem to be listed in - * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-provider.c - */ -#define MODEST_ACCOUNT_OPTION_USE_LSUB "use_lsub" /* Show only subscribed folders */ -#define MODEST_ACCOUNT_OPTION_CHECK_ALL "check_all" /* Check for new messages in all folders */ - - -/* Posssible values for tny_account_set_secure_auth_mech(). - * These might be camel-specific. - * Really, tinymail should use an enum. - * camel_sasl_authtype() seems to list some possible values. - */ - -/* Note that evolution does not offer these for IMAP: */ -#define MODEST_ACCOUNT_AUTH_PLAIN "PLAIN" -#define MODEST_ACCOUNT_AUTH_ANONYMOUS "ANONYMOUS" - -/* Caeml's IMAP uses NULL instead for "Password". - * Also, not that Evolution offers "Password" for IMAP, but "Login" for SMTP.*/ -#define MODEST_ACCOUNT_AUTH_PASSWORD "LOGIN" -#define MODEST_ACCOUNT_AUTH_CRAMMD5 "CRAM-MD5" /** - * modest_tny_account_new_from_server_account: + * update_tny_account: * @account_mgr: a valid account mgr instance - * @session: A valid TnySessionCamel instance. * @account_data: the server account for which to create a corresponding tny account - * @type: the type of account to create (TNY_ACCOUNT_TYPE_STORE or TNY_ACCOUNT_TYPE_TRANSPORT) * * get a tnyaccount corresponding to the server_accounts (store or transport) for this account. * NOTE: this function does not set the camel session or the get/forget password functions * * Returns: a new TnyAccount or NULL in case of error. */ -static TnyAccount* -modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, - TnySessionCamel *session, - ModestServerAccountData *account_data) +static gboolean +update_tny_account (TnyAccount *tny_account, + ModestServerAccountSettings *server_settings) { - gchar *url = NULL; - - g_return_val_if_fail (account_mgr, NULL); - g_return_val_if_fail (session, NULL); - g_return_val_if_fail (account_data, NULL); - - /* sanity checks */ - if (account_data->proto == MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN) { - g_printerr ("modest: '%s' does not provide a protocol\n", - account_data->account_name); - return NULL; - } - - TnyAccount *tny_account = NULL; + const gchar *account_name; + const gchar *uri; + g_return_val_if_fail (server_settings, FALSE); + account_name = modest_server_account_settings_get_account_name (server_settings); + g_return_val_if_fail (account_name, FALSE); + g_return_val_if_fail (tny_account, FALSE); + + /* Do not change the id if it's not needed */ + if (tny_account_get_id (tny_account) && + strcmp (tny_account_get_id (tny_account), account_name)) + tny_account_set_id (tny_account, account_name); - switch (account_data->proto) { - case MODEST_PROTOCOL_TRANSPORT_SENDMAIL: - case MODEST_PROTOCOL_TRANSPORT_SMTP: - tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ()); break; - case MODEST_PROTOCOL_STORE_POP: - tny_account = TNY_ACCOUNT(tny_camel_pop_store_account_new ()); break; - case MODEST_PROTOCOL_STORE_IMAP: - tny_account = TNY_ACCOUNT(tny_camel_imap_store_account_new ()); break; - case MODEST_PROTOCOL_STORE_MAILDIR: - case MODEST_PROTOCOL_STORE_MBOX: - /* Note that this is not where we create the special local folders account. - * That happens in modest_tny_account_new_for_local_folders() instead. - */ - tny_account = TNY_ACCOUNT(tny_camel_store_account_new()); break; - default: - g_return_val_if_reached (NULL); - } - if (!tny_account) { - g_printerr ("modest: could not create tny account for '%s'\n", - account_data->account_name); - return NULL; - } - tny_account_set_id (tny_account, account_data->account_name); - - /* This must be set quite early, or other set() functions will fail. */ - tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session); - - /* Handle connection requests: - * This (badly-named) signal will be called when we try to use an offline account. */ - g_signal_connect (G_OBJECT (tny_account), "connection-status-changed", - G_CALLBACK (on_connection_status_changed), NULL); - - /* Proto */ - const gchar* proto_name = - modest_protocol_info_get_transport_store_protocol_name(account_data->proto); - tny_account_set_proto (tny_account, proto_name); - - /* mbox and maildir accounts use a URI instead of the rest: * Note that this is not where we create the special local folders account. * We do that in modest_tny_account_new_for_local_folders() instead. */ - if (account_data->uri) { - tny_account_set_url_string (TNY_ACCOUNT(tny_account), account_data->uri); -/* g_message ("DEBUG: %s: local account-url:\n %s", __FUNCTION__, account_data->uri); */ - } + uri = modest_server_account_settings_get_uri (server_settings); + if (uri) + tny_account_set_url_string (TNY_ACCOUNT(tny_account), uri); else { - /* Set camel-specific options: */ - + /* Set camel-specific options: */ /* Enable secure connection settings: */ - /* printf("DEBUG: %s: security=%d\n", __FUNCTION__, account_data->security); */ - const gchar* option_security = NULL; - switch (account_data->security) { - case MODEST_PROTOCOL_CONNECTION_NORMAL: - option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_NEVER; - break; - case MODEST_PROTOCOL_CONNECTION_SSL: - /* Apparently, use of "IMAPS" (specified in our UI spec), implies - * use of the "wrapped" option: */ - option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_WRAPPED; - break; - case MODEST_PROTOCOL_CONNECTION_TLS: - option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_TLS; - break; - case MODEST_PROTOCOL_CONNECTION_TLS_OP: - /* This is not actually in our UI: */ - option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE; - break; - default: - break; + TnyPair *option_security = NULL; + const gchar* auth_mech_name = NULL; + ModestProtocolType protocol_type; + ModestProtocol *protocol; + ModestProtocolType security_type; + ModestProtocol *security; + ModestProtocolType auth_protocol_type; + ModestProtocol *auth_protocol; + ModestProtocolRegistry *protocol_registry; + const gchar *security_option_string; + const gchar *username; + const gchar *hostname; + guint port; + + /* First of all delete old options */ + tny_camel_account_clear_options (TNY_CAMEL_ACCOUNT (tny_account)); + + protocol_type = modest_server_account_settings_get_protocol (server_settings); + security_type = modest_server_account_settings_get_security_protocol (server_settings); + auth_protocol_type = modest_server_account_settings_get_auth_protocol (server_settings); + protocol_registry = modest_runtime_get_protocol_registry (); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type); + security = modest_protocol_registry_get_protocol_by_type (protocol_registry, security_type); + auth_protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, auth_protocol_type); + + security_option_string = modest_protocol_get (security, MODEST_PROTOCOL_SECURITY_ACCOUNT_OPTION); + if (security_option_string) { + option_security = tny_pair_new (MODEST_ACCOUNT_OPTION_SSL, security_option_string); + tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), option_security); + g_object_unref (option_security); } - - if(option_security) - tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), - option_security); - + /* Secure authentication: */ - /* printf("DEBUG: %s: secure-auth=%d\n", __FUNCTION__, account_data->secure_auth); */ - const gchar* auth_mech_name = NULL; - switch (account_data->secure_auth) { - case MODEST_PROTOCOL_AUTH_NONE: - /* IMAP and POP need at least a password, - * which camel uses if we specify NULL. - * This setting should never happen anyway. */ - if (account_data->proto == MODEST_PROTOCOL_STORE_IMAP || - account_data->proto == MODEST_PROTOCOL_STORE_POP) - auth_mech_name = NULL; - else if (account_data->proto == MODEST_PROTOCOL_TRANSPORT_SMTP) - auth_mech_name = MODEST_ACCOUNT_AUTH_ANONYMOUS; - else - auth_mech_name = MODEST_ACCOUNT_AUTH_PLAIN; - break; - - case MODEST_PROTOCOL_AUTH_PASSWORD: - /* Camel use a password for IMAP or POP if we specify NULL, - * For IMAP, at least it will report an error if we use "Password", "Login" or "Plain". - * (POP is know to report an error for Login too. Probably Password and Plain too.) */ - if (account_data->proto == MODEST_PROTOCOL_STORE_IMAP) - auth_mech_name = NULL; - else if (account_data->proto == MODEST_PROTOCOL_STORE_POP) - auth_mech_name = NULL; - else - auth_mech_name = MODEST_ACCOUNT_AUTH_PASSWORD; - break; - - case MODEST_PROTOCOL_AUTH_CRAMMD5: - auth_mech_name = MODEST_ACCOUNT_AUTH_CRAMMD5; - break; - - default: - g_warning ("%s: Unhandled secure authentication setting %d for " - "account=%s (%s)", __FUNCTION__, account_data->secure_auth, - account_data->account_name, account_data->hostname); - break; + if (MODEST_IS_ACCOUNT_PROTOCOL (protocol) && + modest_account_protocol_has_custom_secure_auth_mech (MODEST_ACCOUNT_PROTOCOL (protocol), auth_protocol_type)) { + auth_mech_name = modest_account_protocol_get_custom_secure_auth_mech (MODEST_ACCOUNT_PROTOCOL (protocol), auth_protocol_type); + } else { + auth_mech_name = modest_protocol_get (auth_protocol, MODEST_PROTOCOL_AUTH_ACCOUNT_OPTION); } - if(auth_mech_name) + if (auth_mech_name) tny_account_set_secure_auth_mech (tny_account, auth_mech_name); - if (modest_protocol_info_protocol_is_store(account_data->proto) && - (account_data->proto == MODEST_PROTOCOL_STORE_IMAP) ) { - /* Other connection options, needed for IMAP. */ - tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), - MODEST_ACCOUNT_OPTION_USE_LSUB); - tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), - MODEST_ACCOUNT_OPTION_CHECK_ALL); + if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) { + TnyList *account_options; + TnyIterator *iterator; + + account_options = modest_account_protocol_get_account_options (MODEST_ACCOUNT_PROTOCOL (protocol)); + for (iterator = tny_list_create_iterator (account_options); !tny_iterator_is_done (iterator); tny_iterator_next (iterator)) { + TnyPair *current; + + current = TNY_PAIR (tny_iterator_get_current (iterator)); + tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), + current); + g_object_unref (current); + } + g_object_unref (iterator); + g_object_unref (account_options); + } - - if (account_data->username) - tny_account_set_user (tny_account, account_data->username); - if (account_data->hostname) - tny_account_set_hostname (tny_account, account_data->hostname); - - /* Set the port: */ - if (account_data->port) - tny_account_set_port (tny_account, account_data->port); - } - - /* FIXME: for debugging. - * Let's keep this because it is very useful for debugging. */ - url = tny_account_get_url_string (TNY_ACCOUNT(tny_account)); - printf ("DEBUG %s:\n account-url: %s\n", __FUNCTION__, url); - - g_free (url); - /***********************/ + if (modest_server_account_settings_get_uri (server_settings) == NULL) { + username = modest_server_account_settings_get_username (server_settings); + if (username && strlen (username) > 0) + tny_account_set_user (tny_account, username); + hostname = modest_server_account_settings_get_hostname (server_settings); + if (hostname && hostname[0] != '\0') + tny_account_set_hostname (tny_account, hostname); + + /* Set the port: */ + port = modest_server_account_settings_get_port (server_settings); + if (port) + tny_account_set_port (tny_account, port); + } else { + tny_account_set_url_string (TNY_ACCOUNT (tny_account), modest_server_account_settings_get_uri (server_settings)); + } + } - return tny_account; + MODEST_DEBUG_BLOCK ( + gchar *url = tny_account_get_url_string (TNY_ACCOUNT(tny_account)); + g_debug ("%s:\n account-url: %s\n", __FUNCTION__, url); + g_free (url); + ); + + return TRUE; } TnyAccount* modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr, - TnySessionCamel *session, - const gchar *server_account_name) + TnySessionCamel *session, + const gchar *server_account_name, + TnyGetPassFunc get_pass_func, + TnyForgetPassFunc forget_pass_func) { - ModestServerAccountData *account_data = - modest_account_mgr_get_server_account_data (account_mgr, - server_account_name); - if (!account_data) + ModestServerAccountSettings *server_settings; + TnyAccount *tny_account; + ModestProtocolRegistry *protocol_registry; + + g_return_val_if_fail (session, NULL); + g_return_val_if_fail (server_account_name, NULL); + + protocol_registry = modest_runtime_get_protocol_registry (); + + server_settings = modest_account_mgr_load_server_settings (account_mgr, server_account_name, TRUE); + if (!server_settings) return NULL; - TnyAccount *result = modest_tny_account_new_from_server_account ( - account_mgr, session, account_data); + tny_account = TNY_ACCOUNT (tny_camel_transport_account_new ()); + + if (tny_account) { + ModestProtocol *protocol; + const gchar* proto_name = NULL; + tny_account_set_id (tny_account, server_account_name); + tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, modest_server_account_settings_get_protocol (server_settings)); + proto_name = modest_protocol_get_name (protocol); + tny_account_set_proto (tny_account, proto_name); + modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, server_account_name); + } + + if (!tny_account) { + g_warning ("%s: failed to create tny_account", __FUNCTION__); + } else { + TnyConnectionPolicy *policy; + + if (!update_tny_account (tny_account, server_settings)) { + g_warning ("%s: failed to initialize tny_account", __FUNCTION__); + } else { + + tny_account_set_forget_pass_func (tny_account, + forget_pass_func ? forget_pass_func : forget_pass_dummy); + tny_account_set_pass_func (tny_account, + get_pass_func ? get_pass_func: get_pass_dummy); + + } + policy = modest_default_connection_policy_new (); + tny_account_set_connection_policy (tny_account, policy); + g_object_unref (policy); + } - modest_account_mgr_free_server_account_data (account_mgr, account_data); + g_object_unref (server_settings); - return result; + return tny_account; } + + /* we need these dummy functions, or tinymail will complain */ static gchar* get_pass_dummy (TnyAccount *account, const gchar *prompt, gboolean *cancel) @@ -457,78 +408,179 @@ forget_pass_dummy (TnyAccount *account) /* intentionally left blank */ } + +static void +set_online_callback (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer user_data) +{ + TnyAccountStore *account_store; + + account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), + "account_store")); + if (err && !canceled) { + /* It seems err is forgotten here ... if the disk is full ! */ + if (account_store) { + tny_account_store_alert ( + account_store, + TNY_ACCOUNT (account), TNY_ALERT_TYPE_ERROR, FALSE, + err); + } + g_warning ("err: %s", err->message); + } +} + +gboolean +modest_tny_account_update_from_account (TnyAccount *tny_account, + TnyGetPassFunc get_pass_func, + TnyForgetPassFunc forget_pass_func) +{ + ModestAccountSettings *settings = NULL; + ModestServerAccountSettings *server_settings = NULL; + ModestAccountMgr *account_mgr; + const gchar *account_name; + TnyAccountType type; + const gchar *display_name; + TnyConnectionStatus conn_status; + TnyConnectionPolicy *policy; + + g_return_val_if_fail (tny_account, FALSE); + + account_mgr = modest_runtime_get_account_mgr (); + account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (tny_account); + type = tny_account_get_account_type (tny_account); + settings = modest_account_mgr_load_account_settings (account_mgr, account_name); + if (!settings) { + g_printerr ("modest: %s: cannot get account data for account %s\n", + __FUNCTION__, account_name); + return FALSE; + } + + display_name = modest_account_settings_get_display_name (settings); + + if (type == TNY_ACCOUNT_TYPE_STORE) + server_settings = modest_account_settings_get_store_settings (settings); + else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) + server_settings = modest_account_settings_get_transport_settings (settings); + + if (modest_server_account_settings_get_account_name (server_settings) == NULL) { + g_printerr ("modest: no %s account defined for '%s'\n", + type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport", + display_name); + g_object_unref (server_settings); + g_object_unref (settings); + return FALSE; + } + + update_tny_account (tny_account, server_settings); + + /* This name is what shows up in the folder view -- so for some POP/IMAP/... server + * account, we set its name to the account of which it is part. */ + + if (display_name) + tny_account_set_name (tny_account, display_name); + + g_object_unref (server_settings); + g_object_unref (settings); + + policy = modest_default_connection_policy_new (); + tny_account_set_connection_policy (tny_account, policy); + g_object_unref (policy); + + /* The callback will have an error for you if the reconnect + * failed. Please handle it (this is TODO). */ + + conn_status = tny_account_get_connection_status (tny_account); + if (conn_status != TNY_CONNECTION_STATUS_DISCONNECTED) { + TnyAccountStore *account_store = NULL; + + account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(tny_account), + "account_store")); + + if (account_store) { + modest_tny_account_store_forget_already_asked (MODEST_TNY_ACCOUNT_STORE (account_store), + tny_account); + } + + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(tny_account), TRUE, + set_online_callback, "online"); + } + + return TRUE; +} + + + TnyAccount* -modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar *account_name, +modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, + const gchar *account_name, TnyAccountType type, TnySessionCamel *session, TnyGetPassFunc get_pass_func, TnyForgetPassFunc forget_pass_func) { TnyAccount *tny_account = NULL; - ModestAccountData *account_data = NULL; - ModestServerAccountData *server_data = NULL; + ModestAccountSettings *settings = NULL; + ModestServerAccountSettings *server_settings = NULL; + const gchar *display_name; + TnyConnectionPolicy *policy; g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (account_name, NULL); g_return_val_if_fail (session, NULL); + g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT, + NULL); - account_data = modest_account_mgr_get_account_data (account_mgr, account_name); - if (!account_data) { - g_printerr ("modest: %s: cannot get account data for account %s\n", __FUNCTION__, account_name); + settings = modest_account_mgr_load_account_settings (account_mgr, account_name); + if (!settings) { + g_printerr ("modest: %s: cannot get account data for account %s\n", + __FUNCTION__, account_name); return NULL; } + display_name = modest_account_settings_get_display_name (settings); - if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account) - server_data = account_data->store_account; - else if (type == TNY_ACCOUNT_TYPE_TRANSPORT && account_data->transport_account) - server_data = account_data->transport_account; - if (!server_data) { + if (type == TNY_ACCOUNT_TYPE_STORE) + server_settings = modest_account_settings_get_store_settings (settings); + else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) + server_settings = modest_account_settings_get_transport_settings (settings); + + if (modest_server_account_settings_get_account_name (server_settings) == NULL) { g_printerr ("modest: no %s account defined for '%s'\n", type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport", - account_data->display_name); - modest_account_mgr_free_account_data (account_mgr, account_data); + display_name); + g_object_unref (server_settings); + g_object_unref (settings); return NULL; } - tny_account = modest_tny_account_new_from_server_account (account_mgr, session, server_data); + tny_account = create_tny_account (session, server_settings); if (!tny_account) { g_printerr ("modest: failed to create tny account for %s (%s)\n", - account_data->account_name, server_data->account_name); - modest_account_mgr_free_account_data (account_mgr, account_data); + account_name, + modest_server_account_settings_get_account_name (server_settings)); + g_object_unref (server_settings); + g_object_unref (settings); return NULL; - } - + } else + update_tny_account (tny_account, server_settings); + + /* This name is what shows up in the folder view -- so for some POP/IMAP/... server + * account, we set its name to the account of which it is part. */ + + if (display_name) + tny_account_set_name (tny_account, display_name); + tny_account_set_forget_pass_func (tny_account, forget_pass_func ? forget_pass_func : forget_pass_dummy); tny_account_set_pass_func (tny_account, get_pass_func ? get_pass_func: get_pass_dummy); - - - /* This name is what shows up in the folder view -- so for some POP/IMAP/... server - * account, we set its name to the account of which it is part. */ - if (account_data->display_name) - tny_account_set_name (tny_account, account_data->display_name); + policy = modest_default_connection_policy_new (); + tny_account_set_connection_policy (tny_account, policy); + g_object_unref (policy); - modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name); - - modest_account_mgr_free_account_data (account_mgr, account_data); - -/* - TnyAccountStore *astore = (TnyAccountStore *) modest_runtime_get_account_store (); - if (astore) { - TnyDevice *device = tny_account_store_get_device (astore); - GError *err = NULL; - g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)astore); - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (tny_account), - tny_device_is_online (device), &err); - if (err) { - g_print ("%s: tny_camel_account_set_online() failed: %s\n", __FUNCTION__, err->message); - g_error_free (err); - } - g_object_unref (device); - } -*/ + modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, + account_name); + g_object_unref (server_settings); + g_object_unref (settings); return tny_account; } @@ -543,12 +595,12 @@ typedef struct - +#ifndef MODEST_TOOLKIT_GTK /* Gets the memory card name: */ static void -on_modest_file_system_info(HildonFileSystemInfoHandle *handle, - HildonFileSystemInfo *info, - const GError *error, gpointer data) +on_modest_file_system_info (HildonFileSystemInfoHandle *handle, + HildonFileSystemInfo *info, + const GError *error, gpointer data) { GetMmcAccountNameData *callback_data = (GetMmcAccountNameData*)data; @@ -567,7 +619,10 @@ on_modest_file_system_info(HildonFileSystemInfoHandle *handle, } /* printf ("DEBUG: %s: display name=%s\n", __FUNCTION__, display_name); */ - tny_account_set_name (account, display_name); + if (display_name && previous_display_name && + (strcmp (display_name, previous_display_name) != 0)) { + tny_account_set_name (account, display_name); + } /* Inform the application that the name is now ready: */ if (callback_data->callback) @@ -577,9 +632,11 @@ on_modest_file_system_info(HildonFileSystemInfoHandle *handle, g_object_unref (callback_data->account); g_slice_free (GetMmcAccountNameData, callback_data); } +#endif void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data) { +#ifndef MODEST_TOOLKIT_GTK /* Just use the hard-coded path for the single memory card, * rather than try to figure out the path to the specific card by * looking at the maildir URI: @@ -618,6 +675,7 @@ void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAc } /* g_free (uri); */ +#endif } @@ -626,18 +684,16 @@ TnyAccount* modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, const gchar* location_filepath) { - - - /* Make sure that the directories exist: */ - modest_init_local_folders (location_filepath); - TnyStoreAccount *tny_account; CamelURL *url; gchar *maildir, *url_string; + TnyConnectionPolicy *policy; g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (session, NULL); - + + /* Make sure that the directories exist: */ + modest_init_local_folders (location_filepath); if (!location_filepath) { /* A NULL filepath means that this is the special local-folders maildir @@ -710,7 +766,11 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess tny_account_set_forget_pass_func (TNY_ACCOUNT(tny_account), forget_pass_dummy); tny_account_set_pass_func (TNY_ACCOUNT(tny_account), get_pass_dummy); - + + policy = modest_default_connection_policy_new (); + tny_account_set_connection_policy (TNY_ACCOUNT (tny_account), policy); + g_object_unref (policy); + modest_tny_account_set_parent_modest_account_name_for_server_account ( TNY_ACCOUNT (tny_account), id); @@ -727,15 +787,19 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac const gchar* account_name, TnySessionCamel *session) { + TnyConnectionPolicy *policy; + TnyStoreAccount *tny_account; + g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (account_name, NULL); g_return_val_if_fail (session, NULL); - + /* Notice that we create a ModestTnyOutboxAccount here, * instead of just a TnyCamelStoreAccount, * so that we can later identify this as a special account for internal use only. */ - TnyStoreAccount *tny_account = TNY_STORE_ACCOUNT (modest_tny_outbox_account_new ()); + tny_account = TNY_STORE_ACCOUNT (modest_tny_outbox_account_new ()); + if (!tny_account) { g_printerr ("modest: cannot create account for per-account local outbox folder."); return NULL; @@ -780,7 +844,11 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac tny_account_set_forget_pass_func (TNY_ACCOUNT(tny_account), forget_pass_dummy); tny_account_set_pass_func (TNY_ACCOUNT(tny_account), get_pass_dummy); - + + policy = modest_default_connection_policy_new (); + tny_account_set_connection_policy (TNY_ACCOUNT (tny_account), policy); + g_object_unref (policy); + /* Make this think that it belongs to the modest local-folders parent account: */ modest_tny_account_set_parent_modest_account_name_for_server_account ( TNY_ACCOUNT (tny_account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID); @@ -790,129 +858,197 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac -typedef gint (*TnyStatsFunc) (TnyFolderStats *stats); - -typedef struct _RecurseFoldersHelper { - TnyStatsFunc function; - guint sum; - guint folders; -} RecurseFoldersHelper; +typedef struct _RecurseFoldersAsyncHelper { + ModestFolderStats stats; + guint pending_calls; + GetFolderStatsCallback callback; + GetFolderStatsCallback status_callback; + gpointer user_data; +} RecurseFoldersAsyncHelper; -static void -recurse_folders (TnyFolderStore *store, - TnyFolderStoreQuery *query, - RecurseFoldersHelper *helper) +static void +recurse_folders_async_cb (TnyFolderStore *folder_store, + gboolean canceled, + TnyList *list, + GError *err, + gpointer user_data) { - TnyIterator *iter; - TnyList *folders = tny_simple_list_new (); + RecurseFoldersAsyncHelper *helper; + TnyIterator *iter; - tny_folder_store_get_folders (store, folders, query, NULL); - iter = tny_list_create_iterator (folders); + helper = (RecurseFoldersAsyncHelper *) user_data; - helper->folders += tny_list_get_length (folders); + /* A goto just to avoid an indentation level */ + if (err || canceled) + goto next_folder; + /* Retrieve children */ + iter = tny_list_create_iterator (list); while (!tny_iterator_is_done (iter)) { - TnyFolderStats *stats; - TnyFolder *folder; + TnyList *folders = NULL; + TnyFolderStore *folder = NULL; - folder = TNY_FOLDER (tny_iterator_get_current (iter)); - stats = tny_folder_get_stats (folder); - - if (stats) { - /* initially, we sometimes get -1 from tinymail; ignore that */ - if (helper->function && helper->function (stats) > 0) - helper->sum += helper->function (stats); + folders = tny_simple_list_new (); + folder = (TnyFolderStore*) tny_iterator_get_current (iter); + + /* Add pending call */ + helper->pending_calls++; + helper->stats.folders++; + if (TNY_IS_FOLDER (folder)) { + helper->stats.msg_count += tny_folder_get_all_count (TNY_FOLDER (folder)); + helper->stats.local_size += tny_folder_get_local_size (TNY_FOLDER (folder)); + } - if (TNY_IS_FOLDER_STORE (folder)) { - recurse_folders (TNY_FOLDER_STORE (folder), query, helper); - } - g_object_unref (stats); - } - g_object_unref (folder); + /* notify */ + if (helper->status_callback) + helper->status_callback (helper->stats, helper->user_data); + + /* Avoid the outbox */ + if (!TNY_IS_MERGE_FOLDER (folder) && + (TNY_IS_FOLDER (folder) && + tny_folder_get_folder_type (TNY_FOLDER (folder)) != TNY_FOLDER_TYPE_OUTBOX)) + tny_folder_store_get_folders_async (folder, folders, NULL, FALSE, + recurse_folders_async_cb, + NULL, helper); + 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 (folders)); -} - -gint -modest_tny_folder_store_get_folder_count (TnyFolderStore *self) -{ - RecurseFoldersHelper *helper; - gint retval; - - g_return_val_if_fail (TNY_IS_FOLDER_STORE (self), -1); - - /* Create helper */ - helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = NULL; - helper->sum = 0; - helper->folders = 0; - - recurse_folders (self, NULL, helper); + g_object_unref (G_OBJECT (iter)); - retval = helper->folders; +next_folder: + /* Remove my own pending call */ + helper->pending_calls--; - g_free (helper); + /* This means that we have all the folders */ + if (helper->pending_calls == 0) { + /* notify */ + if (helper->callback) + helper->callback (helper->stats, helper->user_data); - return retval; + /* Free resources */ + g_slice_free (RecurseFoldersAsyncHelper, helper); + } } -gint -modest_tny_folder_store_get_message_count (TnyFolderStore *self) +void +modest_tny_folder_store_get_folder_stats (TnyFolderStore *self, + GetFolderStatsCallback callback, + GetFolderStatsCallback status_callback, + gpointer user_data) { - RecurseFoldersHelper *helper; - gint retval; + RecurseFoldersAsyncHelper *helper; + TnyList *folders; - g_return_val_if_fail (TNY_IS_FOLDER_STORE (self), -1); - - /* Create helper */ - helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = (TnyStatsFunc) tny_folder_stats_get_all_count; - helper->sum = 0; + g_return_if_fail (TNY_IS_FOLDER_STORE (self)); - recurse_folders (self, NULL, helper); + /* Create helper */ + helper = g_slice_new0 (RecurseFoldersAsyncHelper); + helper->pending_calls = 1; + helper->callback = callback; + helper->status_callback = status_callback; + helper->user_data = user_data; + + if (TNY_IS_FOLDER (self)) { + helper->stats.msg_count = tny_folder_get_all_count (TNY_FOLDER (self)); + helper->stats.local_size = tny_folder_get_local_size (TNY_FOLDER (self)); + } - retval = helper->sum; + folders = tny_simple_list_new (); + tny_folder_store_get_folders_async (TNY_FOLDER_STORE (self), + folders, NULL, FALSE, + recurse_folders_async_cb, + NULL, helper); + g_object_unref (folders); +} - g_free (helper); +const gchar* +modest_tny_account_get_parent_modest_account_name_for_server_account (TnyAccount *self) +{ + return (const gchar *)g_object_get_data (G_OBJECT (self), "modest_account"); +} - return retval; +void +modest_tny_account_set_parent_modest_account_name_for_server_account (TnyAccount *self, + const gchar* parent_modest_account_name) +{ + g_object_set_data_full (G_OBJECT(self), "modest_account", + (gpointer) g_strdup (parent_modest_account_name), g_free); } -gint -modest_tny_folder_store_get_local_size (TnyFolderStore *self) +gboolean +modest_tny_account_is_virtual_local_folders (TnyAccount *self) { - RecurseFoldersHelper *helper; - gint retval; + /* We should make this more sophisticated if we ever use ModestTnyLocalFoldersAccount + * for anything else. */ + return MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self); +} - g_return_val_if_fail (TNY_IS_FOLDER_STORE (self), -1); - /* Create helper */ - helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = (TnyStatsFunc) tny_folder_stats_get_local_size; - helper->sum = 0; +gboolean +modest_tny_account_is_memory_card_account (TnyAccount *self) +{ + const gchar* account_id = NULL; - recurse_folders (self, NULL, helper); + g_return_val_if_fail (TNY_ACCOUNT (self), FALSE); - retval = helper->sum; + if (!self) + return FALSE; - g_free (helper); + account_id = tny_account_get_id (self); - return retval; + if (!account_id) + return FALSE; + else + return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0); } -const gchar* modest_tny_account_get_parent_modest_account_name_for_server_account (TnyAccount *self) +gboolean +modest_tny_folder_store_is_remote (TnyFolderStore *folder_store) { - return (const gchar *)g_object_get_data (G_OBJECT (self), "modest_account"); + TnyAccount *account = NULL; + gboolean result = TRUE; + + g_return_val_if_fail(TNY_IS_FOLDER_STORE(folder_store), FALSE); + + if (TNY_IS_FOLDER (folder_store)) { + /* Get the folder's parent account: */ + account = tny_folder_get_account(TNY_FOLDER(folder_store)); + } else if (TNY_IS_ACCOUNT (folder_store)) { + account = TNY_ACCOUNT(folder_store); + g_object_ref(account); + } + + if (account != NULL) { + if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) { + if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT (account) && + !TNY_IS_CAMEL_IMAP_STORE_ACCOUNT (account)) { + /* This must be a maildir account, which does + * not require a connection: */ + result = FALSE; + } + } + g_object_unref (account); + } else { + result = FALSE; + } + + return result; } -void modest_tny_account_set_parent_modest_account_name_for_server_account (TnyAccount *self, const gchar* parent_modest_acount_name) +ModestProtocolType +modest_tny_account_get_protocol_type (TnyAccount *self) { - g_object_set_data_full (G_OBJECT(self), "modest_account", - (gpointer) g_strdup (parent_modest_acount_name), g_free); -} - - + ModestProtocolRegistry *protocol_registry; + ModestProtocol *protocol; + ModestProtocolType result; + protocol_registry = modest_runtime_get_protocol_registry (); + protocol = modest_protocol_registry_get_protocol_by_name (protocol_registry, + MODEST_PROTOCOL_REGISTRY_TRANSPORT_STORE_PROTOCOLS, + tny_account_get_proto (self)); + result = protocol?modest_protocol_get_type_id (protocol):MODEST_PROTOCOL_REGISTRY_TYPE_INVALID; + return result; +}