X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=9e0fee1ea6db40110d3bf64d0bd66f6306f57f8f;hp=0952eb4cc4c288c65193738cffcb7f7140686b88;hb=364bebc9387ddeca8a598a9085f1bb41d4b74222;hpb=68fb0fbca7fe7008a297fb9a00aeab94faaa3bda diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 0952eb4..9e0fee1 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,7 @@ #ifdef MODEST_PLATFORM_MAEMO #include -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_HILDON0_WIDGETS #include #include #else @@ -80,9 +81,9 @@ static void modest_tny_account_store_instance_init (ModestTnyAccountStore *ob static void modest_tny_account_store_init (gpointer g, gpointer iface_data); -static void -get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type); - +static void get_server_accounts (TnyAccountStore *self, + TnyList *list, + TnyAccountType type); /* list my signals */ enum { @@ -316,37 +317,55 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, } static void -on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, +on_account_removed (ModestAccountMgr *acc_mgr, + const gchar *account, + gboolean server_account, gpointer user_data) { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + TnyAccount *store_account; - /* FIXME: make this more finegrained; changes do not really affect _all_ - * accounts, and some do not affect tny accounts at all (such as 'last_update') - */ - if (server_account) - recreate_all_accounts (self); + /* Clear the account cache */ + store_account = modest_tny_account_store_get_tny_account_by (self, + MODEST_TNY_ACCOUNT_STORE_QUERY_NAME, + account); + if (store_account) { + tny_store_account_delete_cache (TNY_STORE_ACCOUNT (store_account)); + + g_signal_emit (G_OBJECT (self), + tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED], + 0, store_account); + + g_object_unref (store_account); + } else + g_printerr ("modest: cannot find server account for %s", account); + /* FIXME: make this more finegrained; changes do not + * really affect _all_ accounts, and some do not + * affect tny accounts at all (such as 'last_update') + */ + recreate_all_accounts (self); + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); } static void on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, - const gchar *key, gboolean server_account, gpointer user_data) + const GSList *keys, gboolean server_account, gpointer user_data) { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); /* Ignore the change if it's a change in the last_updated value */ - if (g_str_has_suffix (key, MODEST_ACCOUNT_LAST_UPDATED)) + if (g_slist_length ((GSList *)keys) == 1 && + g_str_has_suffix ((const gchar *) keys->data, MODEST_ACCOUNT_LAST_UPDATED)) return; /* FIXME: make this more finegrained; changes do not really affect _all_ - * accounts, and some do not affect tny accounts at all (such as 'last_update') + * accounts */ - if (server_account) - recreate_all_accounts (self); + recreate_all_accounts (self); g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); @@ -362,13 +381,15 @@ get_account_store_for_account (TnyAccount *account) /* This callback will be called by Tinymail when it needs the password * from the user, for instance if the password was not remembered. + * It also calls forget_password() before calling this, + * so that we clear wrong passwords out of our account settings. * Note that TnyAccount here will be the server account. */ static gchar* -get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) +get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *cancel) { /* Initialize the output parameter: */ - if (cancel) - *cancel = FALSE; + + g_return_val_if_fail (account, NULL); const gchar *key; const TnyAccountStore *account_store; @@ -378,10 +399,22 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) gchar *pwd = NULL; gpointer pwd_ptr; gboolean already_asked; - + + if (cancel) + *cancel = FALSE; + key = tny_account_get_id (account); account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account)); - + + if (!key || !account_store) { + g_warning ("BUG: could not retrieve account_store for account %s", + key ? key : ""); + if (cancel) + *cancel = TRUE; + + return NULL; + } + self = MODEST_TNY_ACCOUNT_STORE (account_store); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); @@ -389,7 +422,8 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) /* 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 = g_hash_table_lookup_extended (priv->password_hash, + already_asked = priv->password_hash && + g_hash_table_lookup_extended (priv->password_hash, key, NULL, (gpointer*)&pwd_ptr); @@ -412,18 +446,25 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) gboolean remember = FALSE; pwd = NULL; - /* Note that we ignore the returned username here, - * because it is enough that it will be stored in gconf - * by the signal handler. */ g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, account_id, /* server_account_name */ &username, &pwd, cancel, &remember); if (!*cancel) { - if (remember) + /* The password will be returned as the result, + * but we need to tell tinymail about the username too: */ + tny_account_set_user (account, username); + + if (remember) { + printf ("%s: Storing username=%s, password=%s\n", + __FUNCTION__, username, pwd); + modest_account_mgr_set_string (priv->account_mgr,key, + MODEST_ACCOUNT_USERNAME, + username, TRUE); modest_account_mgr_set_string (priv->account_mgr,key, MODEST_ACCOUNT_PASSWORD, pwd, TRUE); + } /* 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 @@ -524,7 +565,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) GObject *obj; ModestTnyAccountStorePrivate *priv; - TnyList *list; +// TnyList *list; g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (device, NULL); @@ -542,10 +583,10 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) tny_session_camel_set_async_connecting (priv->session, TRUE); /* force a cache fill... ugly */ - list = TNY_LIST(tny_simple_list_new()); - tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list, - TNY_ACCOUNT_STORE_BOTH); - g_object_unref(list); + /* list = TNY_LIST(tny_simple_list_new()); */ +/* tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list, */ +/* TNY_ACCOUNT_STORE_BOTH); */ +/* g_object_unref(list); */ /* Connect signals */ g_signal_connect (G_OBJECT(account_mgr), "account_changed", @@ -605,8 +646,9 @@ create_per_account_local_outbox_folders (TnyAccountStore *self) accounts = g_slist_append (accounts, tny_account_outbox); /* cache it */ }; - - g_slist_free (account_names); + + modest_account_mgr_free_account_names (account_names); + account_names = NULL; priv->store_accounts_outboxes = accounts; } @@ -619,8 +661,6 @@ static void get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) { g_return_if_fail (self); - - /* printf ("DEBUG: %s: list=%p, type=%d\n", __FUNCTION__, list, type); */ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); @@ -634,8 +674,8 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) return; } - GSList *account_names = NULL, *cursor = NULL; - GSList *accounts = NULL; + GSList *account_names = NULL, *cursor = NULL; + GSList *accounts = NULL; /* These are account names, not server_account names */ account_names = modest_account_mgr_account_names (priv->account_mgr,FALSE); @@ -667,16 +707,7 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) } } - if (type == TNY_ACCOUNT_TYPE_STORE) { - /* Also add the local folder pseudo-account: */ - TnyAccount *tny_account = - modest_tny_account_new_for_local_folders (priv->account_mgr, - priv->session, NULL); - if (list) - tny_list_prepend (list, G_OBJECT(tny_account)); - accounts = g_slist_append (accounts, tny_account); /* cache it */ - - + if (type == TNY_ACCOUNT_TYPE_STORE) { /* Also add the Memory card account if it is mounted: */ gboolean mmc_is_mounted = FALSE; GnomeVFSVolumeMonitor* monitor = @@ -756,13 +787,11 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) iter_account_names = g_slist_next (iter_account_names); } } - - g_slist_free (account_names); + + /* free the account_names */ + modest_account_mgr_free_account_names (account_names); account_names = NULL; - - /* TODO: Delete the strings in the GSList */ - - + /* We also create a per-account local outbox folder (a _store_ account) * for each _transport_ account. */ if (type == TNY_ACCOUNT_TYPE_TRANSPORT) { @@ -783,6 +812,11 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) create_per_account_local_outbox_folders (self); } + /* Also add the local folder pseudo-account: */ + TnyAccount *tny_account = + modest_tny_account_new_for_local_folders (priv->account_mgr, + priv->session, NULL); + /* Add them to the TnyList: */ if (priv->store_accounts_outboxes) { GSList *iter = NULL; @@ -794,10 +828,21 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) g_object_ref (outbox_account); accounts = g_slist_append (accounts, outbox_account); } + } + + /* Add a merged folder, merging all the per-account outbox folders: */ + modest_tny_local_folders_account_add_merged_outbox_folders ( + MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (tny_account), priv->store_accounts_outboxes); + if (priv->store_accounts_outboxes) { + /* We have finished with this temporary list, so free it: */ account_list_free (priv->store_accounts_outboxes); priv->store_accounts_outboxes = NULL; } + + if (list) + tny_list_prepend (list, G_OBJECT(tny_account)); + accounts = g_slist_append (accounts, tny_account); /* cache it */ } if (type == TNY_ACCOUNT_TYPE_STORE) { @@ -880,35 +925,9 @@ modest_tny_account_store_get_device (TnyAccountStore *self) static TnyAccount* modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar* url_string) { - TnyAccount *account = NULL; - ModestTnyAccountStorePrivate *priv; - GSList *cursor; - - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (url_string, NULL); - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { - if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) { - account = TNY_ACCOUNT(cursor->data); - break; - } - } - - if (!account) { - for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) { - if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) { - account = TNY_ACCOUNT(cursor->data); - break; - } - } - } - - if (account) - g_object_ref (G_OBJECT(account)); - - return account; + return modest_tny_account_store_get_tny_account_by (MODEST_TNY_ACCOUNT_STORE (self), + MODEST_TNY_ACCOUNT_STORE_QUERY_URL, + url_string); } @@ -917,6 +936,8 @@ static gboolean modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, gboolean question, const GError *error) { + /* TODO: It would be nice to know what account caused this error. */ + g_return_val_if_fail (error, FALSE); if ((error->domain != TNY_ACCOUNT_ERROR) @@ -936,15 +957,20 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, /* The tinymail camel implementation just sends us this for almost * everything, so we have to guess at the cause. * It could be a wrong password, or inability to resolve a hostname, - * or lack of network, or something entirely different: */ + * or lack of network, or incorrect authentication method, or something entirely different: */ + /* TODO: Fix camel to provide specific error codes, and then use the + * specific dialog messages from Chapter 12 of the UI spec. + */ case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: - g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", - __FUNCTION__, error->domain, error->code, error->message); +/* g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", */ +/* __FUNCTION__, error->domain, error->code, error->message); */ /* TODO: Remove the internal error message for the real release. * This is just so the testers can give us more information: */ /* prompt = _("Modest account not yet fully configured."); */ - prompt = g_strdup_printf(_("Modest account not yet fully configured. Error=%s"), + prompt = g_strdup_printf( + "%s\n (Internal error message, often very misleading):\n%s", + _("Incorrect Account Settings"), error->message); /* TODO: If we can ever determine that the problem is a wrong password: @@ -980,7 +1006,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, break; //TODO: We have started receiving errors of - //domain=TNY_ACCOUNT_ERROR, code=TNY_ACCOUNT_ERROR_TRY_CONNECT, messagae="Canceled". + //domain=TNY_ACCOUNT_ERROR, code=TNY_ACCOUNT_ERROR_TRY_CONNECT, message="Canceled". //If this is really a result of us cancelling our own operation then //a) this probably shouldn't be an error, and //b) should have its own error code. @@ -1084,36 +1110,96 @@ modest_tny_account_store_get_session (TnyAccountStore *self) } +static void +fill_server_account_cache_if_needed (ModestTnyAccountStore *self) +{ + /* cache if needed */ + ModestTnyAccountStorePrivate *priv; + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + TnyList* list = TNY_LIST(tny_simple_list_new()); + if (!priv->store_accounts) + modest_tny_account_store_get_accounts (TNY_ACCOUNT_STORE(self), + list, TNY_ACCOUNT_STORE_STORE_ACCOUNTS); + g_object_unref (list); + + list = TNY_LIST(tny_simple_list_new()); + if (!priv->transport_accounts) + modest_tny_account_store_get_accounts (TNY_ACCOUNT_STORE(self), + list, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); + g_object_unref (list); +} + + TnyAccount* -modest_tny_account_store_get_tny_account_by_id (ModestTnyAccountStore *self, const gchar *id) +modest_tny_account_store_get_tny_account_by (ModestTnyAccountStore *self, + ModestTnyAccountStoreQueryType type, + const gchar *str) { TnyAccount *account = NULL; ModestTnyAccountStorePrivate *priv; GSList *cursor; + const gchar *val = NULL; g_return_val_if_fail (self, NULL); - g_return_val_if_fail (id, NULL); + g_return_val_if_fail (str, NULL); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - + fill_server_account_cache_if_needed (self); + + /* Search in store accounts */ for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { - const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data)); - if (acc_id && strcmp (acc_id, id) == 0) { - account = TNY_ACCOUNT(cursor->data); + switch (type) { + case MODEST_TNY_ACCOUNT_STORE_QUERY_ID: + val = tny_account_get_id (TNY_ACCOUNT(cursor->data)); + break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_NAME: + val = modest_tny_account_get_parent_modest_account_name_for_server_account (TNY_ACCOUNT(cursor->data)); break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_URL: + val = tny_account_get_url_string (TNY_ACCOUNT(cursor->data)); + break; + } + + if (type == MODEST_TNY_ACCOUNT_STORE_QUERY_URL && + tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), str)) { + account = TNY_ACCOUNT (cursor->data); + goto end; + } else { + if (strcmp (val, str) == 0) { + account = TNY_ACCOUNT(cursor->data); + goto end; + } } } /* if we already found something, no need to search the transport accounts */ for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) { - const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data)); - if (acc_id && strcmp (acc_id, id) == 0) { - account = TNY_ACCOUNT(cursor->data); + switch (type) { + case MODEST_TNY_ACCOUNT_STORE_QUERY_ID: + val = tny_account_get_id (TNY_ACCOUNT(cursor->data)); + break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_NAME: + val = tny_account_get_name (TNY_ACCOUNT(cursor->data)); break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_URL: + val = tny_account_get_url_string (TNY_ACCOUNT(cursor->data)); + break; + } + + if (type == MODEST_TNY_ACCOUNT_STORE_QUERY_URL && + tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), val)) { + account = TNY_ACCOUNT (cursor->data); + goto end; + } else { + if (strcmp (val, str) == 0) { + account = TNY_ACCOUNT(cursor->data); + goto end; + } } } - + end: if (account) g_object_ref (G_OBJECT(account)); @@ -1121,7 +1207,7 @@ modest_tny_account_store_get_tny_account_by_id (ModestTnyAccountStore *self, co } TnyAccount* -modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self, +modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, const gchar *account_name, TnyAccountType type) { @@ -1137,15 +1223,19 @@ modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); /* Special case for the local account */ - if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) && - type == TNY_ACCOUNT_TYPE_STORE) { - id = g_strdup (MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID); + if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { + if(type == TNY_ACCOUNT_TYPE_STORE) + id = g_strdup (MODEST_LOCAL_FOLDERS_ACCOUNT_ID); + else { + /* The local folders modest account has no transport server account. */ + return NULL; + } } else { ModestAccountData *account_data; - account_data = modest_account_mgr_get_account_data (priv->account_mgr, account_name); if (!account_data) { - g_printerr ("modest: %s: cannot get account data for account '%s'\n", __FUNCTION__, account_name); + g_printerr ("modest: %s: cannot get account data for account '%s'\n", __FUNCTION__, + account_name); return NULL; } @@ -1161,7 +1251,7 @@ modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self g_printerr ("modest: could not get an id for account %s\n", account_name); else - account = modest_tny_account_store_get_tny_account_by_id (self, id); + account = modest_tny_account_store_get_tny_account_by (self, MODEST_TNY_ACCOUNT_STORE_QUERY_ID, id); if (!account) g_printerr ("modest: could not get tny %s account for %s (id=%s)\n", @@ -1208,7 +1298,9 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * return NULL; /* No connection-specific SMTP server was specified for this connection. */ } - TnyAccount* account = modest_tny_account_store_get_tny_account_by_id (self, server_account_name); + TnyAccount* account = modest_tny_account_store_get_tny_account_by (self, + MODEST_TNY_ACCOUNT_STORE_QUERY_ID, + server_account_name); /* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */ g_free (server_account_name); @@ -1234,16 +1326,63 @@ modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAcc * just get the regular transport account: */ if (!account) { /* printf("DEBUG: %s: using regular transport account for account %s.\n", __FUNCTION__, account_name); */ - account = modest_tny_account_store_get_tny_account_by_account (self, account_name, + + /* The special local folders don't have transport accounts. */ + if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0) + account = NULL; + else + account = modest_tny_account_store_get_server_account (self, account_name, TNY_ACCOUNT_TYPE_TRANSPORT); } return account; } -gboolean modest_tny_folder_store_is_virtual_local_folders (TnyFolderStore *self) +gboolean +modest_tny_account_is_virtual_local_folders (TnyAccount *self) { - /* We should make this more sophisticated if we ever use ModestTnySimpleFolderStore + /* We should make this more sophisticated if we ever use ModestTnyLocalFoldersAccount * for anything else. */ - return MODEST_IS_TNY_SIMPLE_FOLDER_STORE (self); + return MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self); +} + + +gboolean +modest_tny_account_is_memory_card_account (TnyAccount *self) +{ + if (!self) + return FALSE; + + const gchar* account_id = tny_account_get_id (self); + if (!account_id) + return FALSE; + + return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0); +} + +TnyAccount* +modest_tny_account_store_get_local_folders_account (TnyAccountStore *self) +{ + TnyAccount *account = NULL; + ModestTnyAccountStorePrivate *priv; + GSList *cursor; + + g_return_val_if_fail (self, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { + TnyAccount *this_account = TNY_ACCOUNT(cursor->data); + if (modest_tny_account_is_virtual_local_folders (this_account)) { + account = this_account; + break; + } + } + + if (account) + g_object_ref (G_OBJECT(account)); + + return account; } + +