X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=c41644279b40f5427904601c2ee2e6b217de6028;hb=068e3c0b67ea8ba867c131f32b4d1e24be65874b;hp=81f573c860684873502ee8988632f86bdfa5a723;hpb=40e92875620a12ce1d34126c9a9c6bce97b21e6c;p=modest diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 81f573c..c416442 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -51,6 +51,7 @@ #include #include #include +#include #include "modest-tny-account-store.h" @@ -60,7 +61,7 @@ #ifdef MODEST_PLATFORM_MAEMO #include -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_HILDON0_WIDGETS #include #include #else @@ -72,22 +73,35 @@ #include /* 'private'/'protected' functions */ -static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass); -//static void modest_tny_account_store_init (ModestTnyAccountStore *obj); -static void modest_tny_account_store_finalize (GObject *obj); +static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass); + +static void modest_tny_account_store_finalize (GObject *obj); -/* implementations for tny-account-store-iface */ static void modest_tny_account_store_instance_init (ModestTnyAccountStore *obj); + static void modest_tny_account_store_init (gpointer g, gpointer iface_data); +static void modest_tny_account_store_base_init (gpointer g_class); -static void -get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type); +static void get_server_accounts (TnyAccountStore *self, + TnyList *list, + TnyAccountType type); + +static void on_account_inserted (ModestAccountMgr *acc_mgr, + const gchar *account, + gpointer user_data); + +static void on_account_removed (ModestAccountMgr *acc_mgr, + const gchar *account, + gpointer user_data); /* list my signals */ enum { - ACCOUNT_UPDATE_SIGNAL, + ACCOUNT_CHANGED_SIGNAL, + ACCOUNT_INSERTED_SIGNAL, + ACCOUNT_REMOVED_SIGNAL, + PASSWORD_REQUESTED_SIGNAL, LAST_SIGNAL }; @@ -96,21 +110,26 @@ typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { gchar *cache_dir; GHashTable *password_hash; + GHashTable *account_settings_dialog_hash; ModestAccountMgr *account_mgr; TnySessionCamel *session; TnyDevice *device; + + gulong acc_inserted_handler; + gulong acc_changed_handler; + gulong acc_removed_handler; /* We cache the lists of accounts here. * They are created in our get_accounts_func() implementation. */ - GSList *store_accounts; - GSList *transport_accounts; + TnyList *store_accounts; + TnyList *transport_accounts; /* This is also contained in store_accounts, * but we cached it temporarily separately, * because we create this while creating the transport accounts, * but return it when requesting the store accounts: */ - GSList *store_accounts_outboxes; + TnyList *store_accounts_outboxes; }; #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -130,7 +149,7 @@ modest_tny_account_store_get_type (void) if (!my_type) { static const GTypeInfo my_info = { sizeof(ModestTnyAccountStoreClass), - NULL, /* base init */ + modest_tny_account_store_base_init, /* base init */ NULL, /* base finalize */ (GClassInitFunc) modest_tny_account_store_class_init, NULL, /* class finalize */ @@ -156,6 +175,65 @@ modest_tny_account_store_get_type (void) return my_type; } + +static void +modest_tny_account_store_base_init (gpointer g_class) +{ + static gboolean tny_account_store_initialized = FALSE; + + if (!tny_account_store_initialized) { + + signals[ACCOUNT_CHANGED_SIGNAL] = + g_signal_new ("account_changed", + MODEST_TYPE_TNY_ACCOUNT_STORE, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_changed), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT); + + signals[ACCOUNT_INSERTED_SIGNAL] = + g_signal_new ("account_inserted", + MODEST_TYPE_TNY_ACCOUNT_STORE, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_inserted), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT); + + signals[ACCOUNT_REMOVED_SIGNAL] = + g_signal_new ("account_removed", + MODEST_TYPE_TNY_ACCOUNT_STORE, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_removed), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT); + +/* signals[TNY_ACCOUNT_STORE_CONNECTING_FINISHED] = */ +/* g_signal_new ("connecting_finished", */ +/* TNY_TYPE_ACCOUNT_STORE, */ +/* G_SIGNAL_RUN_FIRST, */ +/* G_STRUCT_OFFSET (TnyAccountStoreIface, connecting_finished), */ +/* NULL, NULL, */ +/* g_cclosure_marshal_VOID__VOID, */ +/* G_TYPE_NONE, 0); */ + + signals[PASSWORD_REQUESTED_SIGNAL] = + g_signal_new ("password_requested", + MODEST_TYPE_TNY_ACCOUNT_STORE, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested), + NULL, NULL, + modest_marshal_VOID__STRING_POINTER_POINTER_POINTER_POINTER, + G_TYPE_NONE, 5, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, + G_TYPE_POINTER); + + tny_account_store_initialized = TRUE; + } +} + + static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) { @@ -167,25 +245,6 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestTnyAccountStorePrivate)); - - signals[ACCOUNT_UPDATE_SIGNAL] = - g_signal_new ("account_update", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET(ModestTnyAccountStoreClass, account_update), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, G_TYPE_STRING); - - signals[PASSWORD_REQUESTED_SIGNAL] = - g_signal_new ("password_requested", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested), - NULL, NULL, - modest_marshal_VOID__STRING_POINTER_POINTER_POINTER_POINTER, - G_TYPE_NONE, 5, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, - G_TYPE_POINTER); } @@ -215,6 +274,11 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) */ priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + /* A hash-map of modest account names to dialog pointers, + * so we can avoid showing the account settings twice for the same modest account: */ + priv->account_settings_dialog_hash = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, NULL); /* Respond to volume mounts and unmounts, such * as the insertion/removal of the memory card: */ @@ -228,129 +292,245 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) obj); } +/* disconnect the list of TnyAccounts */ static void -account_list_free (GSList *accounts) +foreach_account_disconnect (gpointer data, + gpointer user_data) { - GSList *cursor = accounts; - - while (cursor) { - if (G_IS_OBJECT(cursor->data)) { /* check twice... */ - const gchar *id = tny_account_get_id(TNY_ACCOUNT(cursor->data)); - modest_runtime_verify_object_last_ref(cursor->data,id); - } - g_object_unref (G_OBJECT(cursor->data)); - cursor = cursor->next; - } - g_slist_free (accounts); + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL); +} + + +static void +foreach_account_append_to_list (gpointer data, + gpointer user_data) +{ + TnyList *list; + + list = TNY_LIST (user_data); + tny_list_append (list, G_OBJECT (data)); } + static void recreate_all_accounts (ModestTnyAccountStore *self) { + /* printf ("DEBUG: %s\n", __FUNCTION__); */ + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); if (priv->store_accounts_outboxes) { - account_list_free (priv->store_accounts_outboxes); + g_object_unref (priv->store_accounts_outboxes); priv->store_accounts_outboxes = NULL; } + if (priv->store_accounts) { - account_list_free (priv->store_accounts); + g_object_unref (priv->store_accounts); priv->store_accounts = NULL; - get_server_accounts (TNY_ACCOUNT_STORE(self), - NULL, TNY_ACCOUNT_TYPE_STORE); } + get_server_accounts (TNY_ACCOUNT_STORE(self), + NULL, TNY_ACCOUNT_TYPE_STORE); + + if (priv->transport_accounts) { - account_list_free (priv->transport_accounts); + g_object_unref (priv->transport_accounts); priv->transport_accounts = NULL; - get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, - TNY_ACCOUNT_TYPE_TRANSPORT); } + + get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, + TNY_ACCOUNT_TYPE_TRANSPORT); } static void on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor, - GnomeVFSVolume *volume, gpointer user_data) + GnomeVFSVolume *volume, + gpointer user_data) { - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); +/* ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); */ /* Check whether this was the external MMC1 card: */ gchar *uri = gnome_vfs_volume_get_activation_uri (volume); if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) { printf ("DEBUG: %s: MMC1 card mounted.\n", __FUNCTION__); - /* TODO: Just add an account and emit (and respond to) - * TnyAccountStore::accountinserted signal? - */ - recreate_all_accounts (self); - - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, - NULL); +/* /\* TODO: Just add an account and emit (and respond to) */ +/* * TnyAccountStore::accountinserted signal? */ +/* *\/ */ +/* recreate_all_accounts (self); */ + + /* TODO */ +/* g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, */ +/* NULL); */ +/* g_signal_emit (G_OBJECT (self), */ +/* signals [ACCOUNT_INSERTED_SIGNAL], */ +/* 0, mmc_account); */ } - g_free (uri); } static void on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, - GnomeVFSVolume *volume, gpointer user_data) + GnomeVFSVolume *volume, + gpointer user_data) { - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); +/* ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); */ /* Check whether this was the external MMC1 card: */ gchar *uri = gnome_vfs_volume_get_activation_uri (volume); if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) { printf ("DEBUG: %s: MMC1 card unmounted.\n", __FUNCTION__); - /* TODO: Just add an account and emit (and respond to) - * TnyAccountStore::accountinserted signal? - */ - recreate_all_accounts (self); +/* /\* TODO: Just add an account and emit (and respond to) */ +/* * TnyAccountStore::accountinserted signal? */ +/* *\/ */ +/* recreate_all_accounts (self); */ - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, - NULL); +/* g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, */ +/* NULL); */ + + /* TODO */ +/* g_signal_emit (G_OBJECT (self), */ +/* signals [ACCOUNT_REMOVED_SIGNAL], */ +/* 0, mmc_account); */ } - g_free (uri); } static void -on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, +on_account_inserted (ModestAccountMgr *acc_mgr, + const gchar *account, + gpointer user_data) +{ + ModestTnyAccountStorePrivate *priv = NULL; + TnyAccount *store_account = NULL, *transport_account = NULL; + ModestTnyAccountStore *self = NULL; + + self = MODEST_TNY_ACCOUNT_STORE(user_data); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* Get the server and the transport account */ + store_account = + modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_STORE); + transport_account = + modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); + + /* Add to the cached accounts */ + tny_list_prepend (priv->store_accounts, G_OBJECT (store_account)); + tny_list_prepend (priv->transport_accounts, G_OBJECT (transport_account)); + + /* Notify the observers */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, store_account); + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, transport_account); + + /* Frees */ + g_object_unref (store_account); + g_object_unref (transport_account); +} + +static void +on_account_removed (ModestAccountMgr *acc_mgr, + const gchar *account, gpointer user_data) { + TnyAccount *store_account = NULL, *transport_account = NULL; ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); - /* 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); - - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, - account); + /* Get the server and the transport account */ + store_account = + modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_STORE); + transport_account = + modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); + + /* If there was any problem creating the account, for example, + with the configuration system this could not exist */ + if (store_account) { + /* Clear the cache */ + tny_store_account_delete_cache (TNY_STORE_ACCOUNT (store_account)); + + /* Notify the observers */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, store_account); + g_object_unref (store_account); + } else { + g_warning ("There is no store account for account %s\n", account); + } + + /* If there was any problem creating the account, for example, + with the configuration system this could not exist */ + if (transport_account) { + /* Notify the observers */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account); + g_object_unref (transport_account); + } else { + g_warning ("There is no transport account for account %s\n", account); + } } +/** + * modest_tny_account_store_forget_password_in_memory + * @self: a TnyAccountStore instance + * @account: A server account. + * + * Forget any password stored in memory for this account. + * For instance, this should be called when the user has changed the password in the account settings. + */ static void -on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, - const gchar *key, gboolean server_account, gpointer user_data) +modest_tny_account_store_forget_password_in_memory (ModestTnyAccountStore *self, const gchar * server_account_name) +{ + /* printf ("DEBUG: %s\n", __FUNCTION__); */ + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + if (server_account_name && priv->password_hash) { + g_hash_table_remove (priv->password_hash, server_account_name); + } +} + +static void +on_account_changed (ModestAccountMgr *acc_mgr, + const gchar *account, + const GSList *keys, + gboolean server_account, + gpointer user_data) { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + /* + printf ("DEBUG: %s\n", __FUNCTION__); + const GSList *iter = keys; + for (iter = keys; iter; iter = g_slist_next (iter)) { + printf (" DEBUG: %s: key=%s\n", __FUNCTION__, (const gchar*)iter->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); + + /* TODO: This doesn't actually work, because + * a) The account name is not sent correctly per key: + * b) We should test the end of the key, not the whole keym + * c) We don't seem to be getting all keys here. + * Instead, we just forget the password for all accounts when we create them, for now. + */ + #if 0 + /* If a password has changed, then forget the previously cached password for this account: */ + if (server_account && keys && g_slist_find_custom ((GSList *)keys, MODEST_ACCOUNT_PASSWORD, (GCompareFunc)strcmp)) { + printf ("DEBUG: %s: Forgetting cached password for account ID=%s\n", __FUNCTION__, account); + modest_tny_account_store_forget_password_in_memory (self, account); + } + #endif - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, - account); +/* g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, */ +/* account); */ } @@ -361,77 +541,295 @@ get_account_store_for_account (TnyAccount *account) "account_store")); } +static +void on_account_settings_hide (GtkWidget *widget, gpointer user_data) +{ + TnyAccount *account = (TnyAccount*)user_data; + + /* This is easier than using a struct for the user_data: */ + ModestTnyAccountStore *self = modest_runtime_get_account_store(); + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + const gchar *modest_account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + if (modest_account_name) + g_hash_table_remove (priv->account_settings_dialog_hash, modest_account_name); +} + +static +gboolean on_idle_wrong_password_warning_only (gpointer user_data) +{ + gdk_threads_enter(); + + ModestWindow *main_window = + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + + /* Show an explanatory temporary banner: */ + hildon_banner_show_information ( + GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect")); + + gdk_threads_leave(); + + return FALSE; /* Don't show again. */ +} + +static +gboolean on_idle_wrong_password (gpointer user_data) +{ + TnyAccount *account = (TnyAccount*)user_data; + /* This is easier than using a struct for the user_data: */ + ModestTnyAccountStore *self = modest_runtime_get_account_store(); + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + const gchar *modest_account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + if (!modest_account_name) { + g_warning ("%s: modest_tny_account_get_parent_modest_account_name_for_server_account() failed.\n", + __FUNCTION__); + + g_object_unref (account); + return FALSE; + } + + + /* Check whether this window is already open, + * for instance because of a previous get_password() call: + */ + gpointer dialog_as_gpointer = NULL; + gboolean found = FALSE; + if (priv->account_settings_dialog_hash) { + found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash, + modest_account_name, NULL, (gpointer*)&dialog_as_gpointer); + } + ModestAccountSettingsDialog *dialog = dialog_as_gpointer; + + ModestWindow *main_window = + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + + gdk_threads_enter (); + gboolean created_dialog = FALSE; + if (!found || !dialog) { + dialog = modest_account_settings_dialog_new (); + modest_account_settings_dialog_set_account_name (dialog, modest_account_name); + modest_account_settings_dialog_switch_to_user_info (dialog); + + g_hash_table_insert (priv->account_settings_dialog_hash, g_strdup (modest_account_name), dialog); + + created_dialog = TRUE; + } + + /* Show an explanatory temporary banner: */ + hildon_banner_show_information ( + GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect")); + + if (created_dialog) { + /* Forget it when it closes: */ + g_signal_connect_object (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide), + account, 0); + + /* Show it and delete it when it closes: */ + modest_maemo_show_dialog_and_forget (GTK_WINDOW (main_window), GTK_DIALOG (dialog)); + } + else { + /* Just show it instead of showing it and deleting it when it closes, + * though it is probably open already: */ + gtk_window_present (GTK_WINDOW (dialog)); + } + + g_object_unref (account); + gdk_threads_leave (); + + return FALSE; /* Dont' call this again. */ +} + +typedef struct +{ + GMainLoop *loop; + ModestTnyAccountStore* account_store; + const gchar* server_account_id; + gchar **username; + gchar **password; + gboolean *cancel; + gboolean *remember; +} IdlePasswordRequest; + +static gboolean +on_idle_request_password (gpointer user_data) +{ + gdk_threads_enter(); + + IdlePasswordRequest* info = (IdlePasswordRequest*)user_data; + g_signal_emit (G_OBJECT(info->account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0, + info->server_account_id, /* server_account_name */ + info->username, info->password, info->cancel, info->remember); + + if (info->loop) + g_main_loop_quit (info->loop); + + gdk_threads_leave(); + + return FALSE; /* Don't call again. */ +} + +static void +request_password_in_main_loop_and_wait (ModestTnyAccountStore *account_store, + const gchar* server_account_id, + gchar **username, + gchar **password, + gboolean *cancel, + gboolean *remember) +{ + IdlePasswordRequest *data = g_slice_new0 (IdlePasswordRequest); + data->account_store = account_store; + data->server_account_id = server_account_id; + data->username = username; + data->password = password; + data->cancel = cancel; + data->remember = remember; + + 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 (&on_idle_request_password, data); + + /* This main loop will run until the idle handler has stopped it: */ + printf ("DEBUG: %s: before g_main_loop_run()\n", __FUNCTION__); + GDK_THREADS_LEAVE(); + g_main_loop_run (data->loop); + GDK_THREADS_ENTER(); + printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__); + printf ("DEBUG: %s: Finished\n", __FUNCTION__); + g_main_loop_unref (data->loop); + + g_slice_free (IdlePasswordRequest, data); +} + /* This callback will be called by Tinymail when it needs the password - * from the user, for instance if the password was not remembered. + * from the user or the account settings. + * It can also call 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; + /* TODO: Settting cancel to FALSE does not actually cancel everything. + * We still get multiple requests afterwards, so we end up showing the + * same dialogs repeatedly. + */ + + printf ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); - const gchar *key; - const TnyAccountStore *account_store; - ModestTnyAccountStore *self; + g_return_val_if_fail (account, NULL); + + const TnyAccountStore *account_store = NULL; + ModestTnyAccountStore *self = NULL; ModestTnyAccountStorePrivate *priv; gchar *username = NULL; gchar *pwd = NULL; - gpointer pwd_ptr; - gboolean already_asked; - - key = tny_account_get_id (account); + gpointer pwd_ptr = NULL; + gboolean already_asked = FALSE; + + /* Initialize the output parameter: */ + if (cancel) + *cancel = FALSE; + + const gchar *server_account_name = tny_account_get_id (account); account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account)); - + + if (!server_account_name || !account_store) { + g_warning ("modest: %s: could not retrieve account_store for account %s", + __FUNCTION__, server_account_name ? server_account_name : ""); + if (cancel) + *cancel = TRUE; + + return NULL; + } + self = MODEST_TNY_ACCOUNT_STORE (account_store); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); /* 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... */ + /* 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, - key, + already_asked = priv->password_hash && + g_hash_table_lookup_extended (priv->password_hash, + server_account_name, NULL, (gpointer*)&pwd_ptr); + + printf ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked); - /* if the password is not already there, try ModestConf */ + /* If the password is not already there, try ModestConf */ if (!already_asked) { - pwd = modest_account_mgr_get_string (priv->account_mgr, - key, MODEST_ACCOUNT_PASSWORD, TRUE); - g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup (pwd)); + pwd = modest_server_account_get_password (priv->account_mgr, + server_account_name); + g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup (pwd)); } - /* if it was already asked, it must have been wrong, so ask again */ - /* TODO: However, when we supply a wrong password to tinymail, - * it seems to (at least sometimes) call our alert_func() instead of - * asking for the password again. - */ + /* If it was already asked, it must have been wrong, so ask again */ if (already_asked || !pwd || strlen(pwd) == 0) { + /* 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: + */ + const gboolean settings_have_password = + modest_server_account_get_has_password (priv->account_mgr, server_account_name); + printf ("DEBUG: modest: %s: settings_have_password=%d\n", __FUNCTION__, settings_have_password); + if (settings_have_password) { + + + /* The password must be wrong, so show the account settings dialog so it can be corrected: */ + /* We show it in the main loop, because this function might not be in the main loop. */ + g_object_ref (account); /* unrefed in the idle handler. */ + g_idle_add (on_idle_wrong_password, account); + + if (cancel) + *cancel = TRUE; + + return NULL; + } + /* we don't have it yet. Get the password from the user */ const gchar* account_id = tny_account_get_id (account); 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 */ + if (already_asked) { + /* Show an info banner, before we show the protected password dialog: */ + g_idle_add (on_idle_wrong_password_warning_only, NULL); + } + + request_password_in_main_loop_and_wait (self, account_id, &username, &pwd, cancel, &remember); if (!*cancel) { - if (remember) - modest_account_mgr_set_string (priv->account_mgr,key, - MODEST_ACCOUNT_PASSWORD, - pwd, TRUE); + /* The password will be returned as the result, + * but we need to tell tinymail about the username too: */ + 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": */ + /* + if (remember) { + printf ("%s: Storing username=%s, password=%s\n", + __FUNCTION__, username, pwd); + modest_server_account_set_username (priv->account_mgr, server_account_name, + username); + modest_server_account_set_password (priv->account_mgr, server_account_name, + pwd); + } + */ + /* 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 (key), g_strdup(pwd)); + g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup(pwd)); } else { - g_hash_table_remove (priv->password_hash, key); + g_hash_table_remove (priv->password_hash, server_account_name); g_free (pwd); pwd = NULL; @@ -473,10 +871,25 @@ forget_password (TnyAccount *account) } /* Remove from configuration system */ + /* modest_account_mgr_unset (priv->account_mgr, key, MODEST_ACCOUNT_PASSWORD, TRUE); + */ } +static void +destroy_password_hashtable (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + g_free (priv->cache_dir); + priv->cache_dir = NULL; + + if (priv->password_hash) { + g_hash_table_destroy (priv->password_hash); + priv->password_hash = NULL; + } +} static void modest_tny_account_store_finalize (GObject *obj) @@ -493,8 +906,24 @@ modest_tny_account_store_finalize (GObject *obj) g_hash_table_destroy (priv->password_hash); priv->password_hash = NULL; } + + destroy_password_hashtable (self); if (priv->account_mgr) { + /* Disconnect signals */ + if (g_signal_handler_is_connected (priv->account_mgr, + priv->acc_inserted_handler)) + g_signal_handler_disconnect (priv->account_mgr, + priv->acc_inserted_handler); + if (g_signal_handler_is_connected (priv->account_mgr, + priv->acc_changed_handler)) + g_signal_handler_disconnect (priv->account_mgr, + priv->acc_changed_handler); + if (g_signal_handler_is_connected (priv->account_mgr, + priv->acc_removed_handler)) + g_signal_handler_disconnect (priv->account_mgr, + priv->acc_removed_handler); + g_object_unref (G_OBJECT(priv->account_mgr)); priv->account_mgr = NULL; } @@ -504,13 +933,19 @@ modest_tny_account_store_finalize (GObject *obj) priv->device = NULL; } - /* this includes the local folder */ - account_list_free (priv->store_accounts); - priv->store_accounts = NULL; - - account_list_free (priv->transport_accounts); - priv->transport_accounts = NULL; + /* Destroy all accounts. Disconnect all accounts before they are destroyed */ + if (priv->store_accounts) { + tny_list_foreach (priv->store_accounts, foreach_account_disconnect, NULL); + g_object_unref (priv->store_accounts); + priv->store_accounts = NULL; + } + if (priv->transport_accounts) { + tny_list_foreach (priv->transport_accounts, foreach_account_disconnect, NULL); + g_object_unref (priv->transport_accounts); + priv->transport_accounts = NULL; + } + if (priv->session) { camel_object_unref (CAMEL_OBJECT(priv->session)); priv->session = NULL; @@ -525,7 +960,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); @@ -537,22 +972,21 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) priv->device = g_object_ref (device); priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj)); - + if (!priv->session) { + g_warning ("failed to get TnySessionCamel"); + return NULL; + } + + /* Set the ui locker */ tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ()); - /* FIXME: unref this in the end? */ - 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); - + /* Connect signals */ - g_signal_connect (G_OBJECT(account_mgr), "account_changed", - G_CALLBACK (on_account_changed), obj); - g_signal_connect (G_OBJECT(account_mgr), "account_removed", - G_CALLBACK (on_account_removed), obj); + priv->acc_inserted_handler = g_signal_connect (G_OBJECT(account_mgr), "account_inserted", + G_CALLBACK (on_account_inserted), obj); + priv->acc_changed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_changed", + G_CALLBACK (on_account_changed), obj); + priv->acc_removed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_removed", + G_CALLBACK (on_account_removed), obj); return MODEST_TNY_ACCOUNT_STORE(obj); } @@ -561,54 +995,47 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) static void get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) { - ModestTnyAccountStorePrivate *priv; - GSList *accounts, *cursor; + ModestTnyAccountStorePrivate *priv = NULL; + TnyList *accounts = NULL; - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - accounts = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + accounts = (type == TNY_ACCOUNT_TYPE_STORE) ? priv->store_accounts : priv->transport_accounts; - cursor = accounts; - while (cursor) { - if (cursor->data) { - GObject *object = G_OBJECT(cursor->data); - tny_list_prepend (list, object); - } - - cursor = cursor->next; - } + /* Add accounts to the list */ + tny_list_foreach (accounts, foreach_account_append_to_list, list); } static void create_per_account_local_outbox_folders (TnyAccountStore *self) { + ModestTnyAccountStorePrivate *priv; + TnyList *accounts = NULL; + GSList *account_names = NULL, *iter = NULL; + g_return_if_fail (self); - ModestTnyAccountStorePrivate *priv = - MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - /* printf("DEBUG: %s: priv->store_accounts_outboxes = %p\n", __FUNCTION__, priv->store_accounts_outboxes); */ + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + /* including disabled accounts */ + account_names = modest_account_mgr_account_names (priv->account_mgr, TRUE); - GSList *accounts = NULL; - - GSList *account_names = modest_account_mgr_account_names (priv->account_mgr, - TRUE /* including disabled accounts */); - - GSList *iter = NULL; + accounts = tny_simple_list_new (); for (iter = account_names; iter; iter = g_slist_next (iter)) { - + TnyAccount *tny_account_outbox = NULL; const gchar* account_name = (const gchar*)iter->data; /* Create a per-account local outbox folder (a _store_ account) * for each _transport_ account: */ - TnyAccount *tny_account_outbox = - modest_tny_account_new_for_per_account_local_outbox_folder ( - priv->account_mgr, account_name, priv->session); - - accounts = g_slist_append (accounts, tny_account_outbox); /* cache it */ + tny_account_outbox = + modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr, + account_name, + priv->session); + /* Cache it */ + tny_list_append (accounts, G_OBJECT (tny_account_outbox)); + g_object_unref (tny_account_outbox); }; - - g_slist_free (account_names); - + + /* Free and save */ + modest_account_mgr_free_account_names (account_names); priv->store_accounts_outboxes = accounts; } @@ -619,31 +1046,33 @@ create_per_account_local_outbox_folders (TnyAccountStore *self) static void get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) { + GSList *account_names = NULL, *cursor = NULL; + TnyList *accounts = NULL; + ModestTnyAccountStorePrivate *priv = NULL; + + g_return_if_fail (type == TNY_ACCOUNT_TYPE_STORE || + type == TNY_ACCOUNT_TYPE_TRANSPORT); 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); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); /* Do nothing if the accounts are already cached: */ if (type == TNY_ACCOUNT_TYPE_STORE) { if (priv->store_accounts) return; - } else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) { + } else { if (priv->transport_accounts) return; } - GSList *account_names = NULL, *cursor = NULL; - GSList *accounts = NULL; /* These are account names, not server_account names */ + accounts = tny_simple_list_new (); account_names = modest_account_mgr_account_names (priv->account_mgr,FALSE); for (cursor = account_names; cursor; cursor = cursor->next) { - gchar *account_name = (gchar*)cursor->data; + gchar *account_name = (gchar*) cursor->data; /* we get the server_accounts for enabled accounts */ if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) { @@ -656,19 +1085,29 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) get_password, forget_password); if (tny_account) { + /* Forget any cached password for the account, + * so that we use a new account if any. + * TODO: Really we should do this in a more precise way in + * on_account_changed(). + */ + modest_tny_account_store_forget_password_in_memory ( + MODEST_TNY_ACCOUNT_STORE (self), + tny_account_get_id (tny_account)); + g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)self); + + /* Append to the list and cache it */ if (list) - tny_list_prepend (list, G_OBJECT(tny_account)); - - accounts = g_slist_append (accounts, tny_account); /* cache it */ + tny_list_append (list, G_OBJECT (tny_account)); + tny_list_append (accounts, G_OBJECT (tny_account)); } else g_printerr ("modest: failed to create account for %s\n", account_name); } } - if (type == TNY_ACCOUNT_TYPE_STORE) { + if (type == TNY_ACCOUNT_TYPE_STORE) { /* Also add the Memory card account if it is mounted: */ gboolean mmc_is_mounted = FALSE; GnomeVFSVolumeMonitor* monitor = @@ -697,9 +1136,11 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) TnyAccount *tny_account = modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session, MODEST_MCC1_VOLUMEPATH); + + /* Append to the list and cache it */ if (list) tny_list_prepend (list, G_OBJECT(tny_account)); - accounts = g_slist_append (accounts, tny_account); /* cache it */ + tny_list_append (accounts, G_OBJECT (tny_account)); } } @@ -720,6 +1161,7 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) * modest account: */ GSList *iter = list_specifics; while (iter) { + /* The list alternates between the connection name and the transport name: */ /* const gchar* this_connection_name = (const gchar*)(iter->data); */ iter = g_slist_next (iter); if (iter) { @@ -728,14 +1170,16 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) TnyAccount * tny_account = NULL; /* Add the account: */ tny_account = modest_tny_account_new_from_server_account_name ( - priv->account_mgr, transport_account_name); + priv->account_mgr, priv->session, transport_account_name); if (tny_account) { + modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name); g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)self); + + /* Append to the list and cache it */ if (list) tny_list_prepend (list, G_OBJECT(tny_account)); - - accounts = g_slist_append (accounts, tny_account); /* cache it */ + tny_list_append (accounts, G_OBJECT (tny_account)); } else g_printerr ("modest: failed to create smtp-specific account for %s\n", transport_account_name); @@ -748,73 +1192,58 @@ 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) { - /* Now would be a good time to create the per-account local outbox folder - * _store_ accounts corresponding to each transport account: */ - if (!priv->store_accounts_outboxes) { - create_per_account_local_outbox_folders (self); - } - } + if (!priv->store_accounts_outboxes) + create_per_account_local_outbox_folders (self); /* But we only return the per-account local outbox folder when * _store_ accounts are requested. */ if (type == TNY_ACCOUNT_TYPE_STORE) { - /* Create them if necessary, - * (which also requires creating the transport accounts, - * if necessary.) */ - if (!priv->store_accounts_outboxes) { - 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; - for (iter = priv->store_accounts_outboxes; iter; iter = g_slist_next (iter)) { - TnyAccount *outbox_account = (TnyAccount*)iter->data; - if (list && outbox_account) - tny_list_prepend (list, G_OBJECT(outbox_account)); - - g_object_ref (outbox_account); - accounts = g_slist_append (accounts, outbox_account); - } - - - /* Also add the local folder pseudo-account: */ - TnyAccount *tny_account = - modest_tny_account_new_for_local_folders (priv->account_mgr, - priv->session, NULL); - /* 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); - + /* Add accounts to the lists */ if (list) - tny_list_prepend (list, G_OBJECT(tny_account)); - accounts = g_slist_append (accounts, tny_account); /* cache it */ - + tny_list_foreach (priv->store_accounts_outboxes, + foreach_account_append_to_list, list); + tny_list_foreach (priv->store_accounts_outboxes, + foreach_account_append_to_list, accounts); + } + + /* 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); + g_object_unref (priv->store_accounts_outboxes); priv->store_accounts_outboxes = NULL; } + + /* Append to the list and cache it */ + if (list) + tny_list_append (list, G_OBJECT(tny_account)); + tny_list_append (accounts, G_OBJECT(tny_account)); } + /* Store the cache: */ if (type == TNY_ACCOUNT_TYPE_STORE) { - /* Store the cache: */ - priv->store_accounts = accounts; + priv->store_accounts = accounts; } else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) { - /* Store the cache: */ - priv->transport_accounts = accounts; + priv->transport_accounts = accounts; } -} +} static void @@ -833,6 +1262,9 @@ modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, TNY_ACCOUNT_STORE_STORE_ACCOUNTS); modest_tny_account_store_get_accounts (self, list, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); + + tny_session_camel_set_initialized (priv->session); + return; } @@ -841,12 +1273,16 @@ modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, get_server_accounts (self, list, TNY_ACCOUNT_TYPE_STORE); else get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_STORE); + + tny_session_camel_set_initialized (priv->session); } else if (request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) { if (!priv->transport_accounts) get_server_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); else get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); + + tny_session_camel_set_initialized (priv->session); } else g_return_if_reached (); /* incorrect req type */ } @@ -887,110 +1323,132 @@ 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); } static gboolean -modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, +modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyAlertType type, gboolean question, const GError *error) { g_return_val_if_fail (error, FALSE); if ((error->domain != TNY_ACCOUNT_ERROR) && (error->domain != TNY_ACCOUNT_STORE_ERROR)) { - g_warning("%s: Unexpected error domain: != TNY_ACCOUNT_ERROR: %d, message=%s", + g_warning("modest: %s: Unexpected error domain: != TNY_ACCOUNT_ERROR: %d, message=%s", __FUNCTION__, error->domain, error->message); + return FALSE; } - /* printf("DEBUG: %s: error->message=%s\n", __FUNCTION__, error->message); */ + printf("DEBUG: %s: GError code: %d, message=%s\n", + __FUNCTION__, error->code, error->message); - + /* Get the server name: */ + const gchar* server_name = NULL; + if (account && TNY_IS_ACCOUNT (account)) { + server_name = tny_account_get_hostname (account); + printf ("modest: %s: account name = %s, server_name=%s\n", __FUNCTION__, + tny_account_get_id (account), server_name); + } + + if (!server_name) + server_name = _("Unknown Server"); + + ModestTransportStoreProtocol proto = MODEST_PROTOCOL_STORE_POP; /* Arbitrary default. */ + if (account) { + const gchar *proto_name = tny_account_get_proto (account); + if (proto_name) + proto = modest_protocol_info_get_transport_store_protocol (proto_name); + else { + g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__, + tny_account_get_id (account)); + } + } + /* const gchar *prompt = NULL; */ gchar *prompt = NULL; switch (error->code) { + case TNY_ACCOUNT_STORE_ERROR_CANCEL_ALERT: + case TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL: + /* Don't show waste the user's time by showing him a dialog telling + * him that he has just cancelled something: */ + g_debug ("%s: Handling GError domain=%d, code=%d (cancelled) without showing a dialog, message=%s", + __FUNCTION__, error->domain, error->code, error->message); + prompt = NULL; + break; + + case TNY_ACCOUNT_ERROR_TRY_CONNECT_HOST_LOOKUP_FAILED: + /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */ + g_debug ("%s: Handling GError domain=%d, code=%d (lookup failed), message=%s", + __FUNCTION__, error->domain, error->code, error->message); + + switch (proto) { + case MODEST_PROTOCOL_STORE_POP: + prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), server_name); + break; + case MODEST_PROTOCOL_STORE_IMAP: + prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), server_name); + break; + case MODEST_PROTOCOL_TRANSPORT_SMTP: + default: /* Arbitrary default. */ + prompt = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); + break; + } + + /* + prompt = g_strdup_printf( + _("Incorrect Account Settings:\n Host lookup failed.%s"), + error->message); + */ + break; + + case TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED: + g_debug ("%s: Handling GError domain=%d, code=%d (authentication not supported), message=%s", + __FUNCTION__, error->domain, error->code, error->message); + /* TODO: This needs a logical ID for the string: */ + prompt = g_strdup_printf( + _("Incorrect Account Settings:\nThe secure authentication method is not supported.\n%s"), + error->message); + break; + + case TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE: + g_debug ("%s: Handling GError domain=%d, code=%d (certificatae), message=%s", + __FUNCTION__, error->domain, error->code, error->message); + prompt = g_strdup_printf( + _("Certificate Problem:\n%s"), + error->message); + break; + case TNY_ACCOUNT_ERROR_TRY_CONNECT: /* 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); + /* This debug output is useful. Please keep it uncommented until + * we have fixed the problems in this function: */ + 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: - * In this case, the UI spec wants us to show a banner, and then - * open the Account Settings dialog. */ - /* Note: Sometimes, the get_password() function seems to be called again - * when a password is wrong, but sometimes this alert_func is called. */ - #if 0 - GtkWidget *parent_widget = - GTK_WIDGET ( - modest_window_mgr_get_main_window ( - modest_runtime_get_window_mgr ())); - - hildon_banner_show_information ( - parent_widget, - NULL /* icon name */, - _("mcen_ib_username_pw_incorrect") ); - - /* Show the Account Settings window: */ - ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); - /* TODO: Get the account somehow. Maybe tinymail should send it with the signal. */ - const gchar* modest_account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); - g_assert (modest_account_name); - modest_account_settings_dialog_set_account_name (dialog, - modest_account_name); - - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - #endif + /* Note: If the password was wrong then get_password() would be called again, + * instead of this vfunc being called. */ break; - - //TODO: We have started receiving errors of - //domain=TNY_ACCOUNT_ERROR, code=TNY_ACCOUNT_ERROR_TRY_CONNECT, messagae="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. default: g_warning ("%s: Unhandled GError code: %d, message=%s", @@ -1002,48 +1460,31 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, if (!prompt) return FALSE; -#ifdef MODEST_PLATFORM_MAEMO - /* The Tinymail documentation says that we should show Yes and No buttons, - * when it is a question. - * Obviously, we need tinymail to use more specific error codes instead, - * so we know what buttons to show. */ - GtkWidget *dialog = NULL; - if (question) { - dialog = GTK_WIDGET (hildon_note_new_confirmation (NULL, + ModestWindow *main_window = + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + gboolean retval = TRUE; + if (question) { + /* The Tinymail documentation says that we should show Yes and No buttons, + * when it is a question. + * Obviously, we need tinymail to use more specific error codes instead, + * so we know what buttons to show. */ + + /* TODO: Do this in the main context: */ + GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window), prompt)); + const int response = gtk_dialog_run (GTK_DIALOG (dialog)); + if (question) { + retval = (response == GTK_RESPONSE_YES) || + (response == GTK_RESPONSE_OK); + } + + gtk_widget_destroy (dialog); + } else { - dialog = GTK_WIDGET (hildon_note_new_information (NULL, - prompt)); + /* Just show the error text and use the default response: */ + modest_maemo_show_information_note_in_main_context_and_forget (GTK_WINDOW (main_window), + prompt); } -#else - - GtkMessageType gtktype = GTK_MESSAGE_ERROR; - switch (type) - { - case TNY_ALERT_TYPE_INFO: - gtktype = GTK_MESSAGE_INFO; - break; - case TNY_ALERT_TYPE_WARNING: - gtktype = GTK_MESSAGE_WARNING; - break; - case TNY_ALERT_TYPE_ERROR: - default: - gtktype = GTK_MESSAGE_ERROR; - break; - } - - GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - gtktype, GTK_BUTTONS_YES_NO, prompt); -#endif /* #ifdef MODEST_PLATFORM_MAEMO */ - - gboolean retval = TRUE; - const int response = gtk_dialog_run (GTK_DIALOG (dialog)); - if (question) { - retval = (response == GTK_RESPONSE_YES) || - (response == GTK_RESPONSE_OK); - } - - gtk_widget_destroy (dialog); /* TODO: Don't free this when we no longer strdup the message for testers. */ g_free (prompt); @@ -1091,91 +1532,157 @@ modest_tny_account_store_get_session (TnyAccountStore *self) } + + +static TnyAccount* +get_tny_account_by (TnyList *accounts, + ModestTnyAccountStoreQueryType type, + const gchar *str) +{ + TnyIterator *iter = NULL; + gboolean found = FALSE; + TnyAccount *retval = NULL; + + iter = tny_list_create_iterator (accounts); + while (!tny_iterator_is_done (iter) && !found) { + TnyAccount *tmp_account = NULL; + const gchar *val = NULL; + + tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter)); + switch (type) { + case MODEST_TNY_ACCOUNT_STORE_QUERY_ID: + val = tny_account_get_id (tmp_account); + break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_URL: + val = tny_account_get_url_string (tmp_account); + break; + } + + if (type == MODEST_TNY_ACCOUNT_STORE_QUERY_URL && + tny_account_matches_url_string (tmp_account, str)) { + retval = g_object_ref (tmp_account); + found = TRUE; + } else { + if (strcmp (val, str) == 0) { + retval = g_object_ref (tmp_account); + found = TRUE; + } + } + g_object_unref (tmp_account); + tny_iterator_next (iter); + } + g_object_unref (iter); + + return retval; +} + 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; - + 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); + /* ******************** WARNING ******************** */ + /* Fill the caches, as that may not have happened yet */ +/* list = TNY_LIST(tny_simple_list_new()); */ +/* modest_tny_account_store_get_accounts (TNY_ACCOUNT_STORE(self), */ +/* list, TNY_ACCOUNT_STORE_BOTH); */ +/* g_object_unref (list); */ + + /* Search in store accounts */ + account = get_tny_account_by (priv->store_accounts, type, str); - 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); - break; - } + /* If we already found something, no need to search the transport accounts */ + if (!account) { + account = get_tny_account_by (priv->transport_accounts, type, str); } - - /* 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); + + /* Warn if nothing was found. This is generally unusual. */ + if (!account) { + switch (type) { + case MODEST_TNY_ACCOUNT_STORE_QUERY_ID: + g_warning("%s: Failed to find account with ID=%s\n", __FUNCTION__, str); + break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_URL: + g_warning("%s: Failed to find account with URL=%s\n", __FUNCTION__, str); break; } } - if (account) - g_object_ref (G_OBJECT(account)); - + /* Returns a new reference to the account if found*/ return account; } TnyAccount* -modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self, - const gchar *account_name, - TnyAccountType type) +modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, + const gchar *account_name, + TnyAccountType type) { - TnyAccount *account = NULL; - gchar *id = NULL; - ModestTnyAccountStorePrivate *priv; + ModestTnyAccountStorePrivate *priv = NULL; + TnyAccount *retval = NULL; + TnyList *account_list = NULL; + TnyIterator *iter = NULL; + gboolean found; g_return_val_if_fail (self, NULL); g_return_val_if_fail (account_name, NULL); - g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT, + g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || + type == TNY_ACCOUNT_TYPE_TRANSPORT, NULL); 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); - } 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); - return NULL; - } + /* ******************** WARNING ******************** */ +/* /\* Make sure that the tny accounts have been created: */ + if (!priv->store_accounts || !priv->transport_accounts) + recreate_all_accounts (self); - if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account) - id = g_strdup (account_data->store_account->account_name); - else if (account_data->transport_account) - id = g_strdup (account_data->transport_account->account_name); + account_list = (type == TNY_ACCOUNT_TYPE_STORE) ? + priv->store_accounts : + priv->transport_accounts; - modest_account_mgr_free_account_data (priv->account_mgr, account_data); + if (!account_list) { + g_printerr ("%s: No server accounts of type %s\n", __FUNCTION__, + (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport"); + return NULL; + } + + /* Look for the server account */ + found = FALSE; + iter = tny_list_create_iterator (account_list); + while (!tny_iterator_is_done (iter) && !found) { + const gchar *modest_acc_name; + TnyAccount *tmp_account; + + tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter)); + modest_acc_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (tmp_account); + + if (!strcmp (account_name, modest_acc_name)) { + found = TRUE; + retval = g_object_ref (tmp_account); + } + /* Free and continue */ + g_object_unref (tmp_account); + tny_iterator_next (iter); } - if (!id) - 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); - - if (!account) - g_printerr ("modest: could not get tny %s account for %s (id=%s)\n", - type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport", - account_name, id ? id : ""); + if (!found) { + g_printerr ("modest: %s: could not get tny %s account for %s\n." \ + "Number of server accounts of this type=%d\n", __FUNCTION__, + (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport", + account_name, tny_list_get_length (account_list)); + } - return account; + /* Returns a new reference */ + return retval; } static TnyAccount* @@ -1188,6 +1695,10 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * if (!tny_device_is_online (device)) return NULL; + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (account_name, NULL); + + #ifdef MODEST_PLATFORM_MAEMO g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device)); TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device); @@ -1215,7 +1726,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,23 +1747,83 @@ TnyAccount* modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self, const gchar *account_name) { + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (account_name, NULL); + + if (!account_name || !self) + return NULL; + /* Get the connection-specific transport acccount, if any: */ - TnyAccount *account = get_smtp_specific_transport_account_for_open_connection (self, account_name); + TnyAccount *account = + get_smtp_specific_transport_account_for_open_connection (self, account_name); /* If there is no connection-specific transport account (the common case), * 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_account_is_virtual_local_folders (TnyAccount *self) +gboolean +modest_tny_account_is_virtual_local_folders (TnyAccount *self) { /* We should make this more sophisticated if we ever use ModestTnyLocalFoldersAccount * for anything else. */ 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; + TnyIterator *iter; + gboolean found; + + g_return_val_if_fail (self, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + found = FALSE; + iter = tny_list_create_iterator (priv->store_accounts); + while (!tny_iterator_is_done (iter) && !found) { + TnyAccount *tmp_account; + + tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter)); + if (modest_tny_account_is_virtual_local_folders (tmp_account)) { + account = g_object_ref (tmp_account); + found = TRUE; + } + g_object_unref (tmp_account); + tny_iterator_next (iter); + } + g_object_unref (iter); + + /* Returns a new reference to the account */ + return account; +} + +