X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=5c3385fcf1e2c1ead8c73bfa2138f0672a9135af;hp=4a8f2b2822e290088a3cf4cdcdca5f43bafb7128;hb=96d9a8c787c693406a0f26e3d3a00065c7236fe5;hpb=e7875b487b0d122d32d8f77fa3e05d936ee73eae diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 4a8f2b2..5c3385f 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -28,20 +28,40 @@ */ #include +#include #include #include #include +#include #include -#include +#include #include #include -#include +#include +#include + +#include #include -#include -#include "modest-account-mgr.h" +#include +#include +#include +#include +#include + #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" +#include +#include + +#ifdef MODEST_PLATFORM_MAEMO +#include +#ifdef MODEST_HILDON_VERSION_0 +#include +#else +#include +#endif +#endif /* 'private'/'protected' functions */ static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass); @@ -50,39 +70,45 @@ 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 +get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type); + -static void modest_tny_account_store_init (gpointer g, gpointer iface_data); -static void modest_tny_account_store_add_store_account (TnyAccountStore *self, - TnyStoreAccount *account); -static void modest_tny_account_store_add_transport_account (TnyAccountStore *self, - TnyTransportAccount *account); -static void modest_tny_account_store_get_accounts (TnyAccountStore *iface, TnyList *list, - TnyGetAccountsRequestType type); /* list my signals */ enum { - PASSWORD_REQUESTED_SIGNAL, ACCOUNT_UPDATE_SIGNAL, + PASSWORD_REQUESTED_SIGNAL, LAST_SIGNAL }; typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { - - GMutex *store_lock; - gchar *cache_dir; - gulong sig1, sig2; - - GHashTable *password_hash; + gchar *cache_dir; + GHashTable *password_hash; + ModestAccountMgr *account_mgr; + TnySessionCamel *session; + TnyDevice *device; - TnySessionCamel *tny_session_camel; - TnyDevice *device; + /* We cache the lists of accounts here. + * They are created in our get_accounts_func() implementation. */ + GSList *store_accounts; + GSList *transport_accounts; - ModestAccountMgr *account_mgr; + /* 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; }; #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_TNY_ACCOUNT_STORE, \ ModestTnyAccountStorePrivate)) + /* globals */ static GObjectClass *parent_class = NULL; @@ -134,16 +160,7 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestTnyAccountStorePrivate)); - 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, - G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER); - - signals[ACCOUNT_UPDATE_SIGNAL] = + signals[ACCOUNT_UPDATE_SIGNAL] = g_signal_new ("account_update", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, @@ -151,43 +168,111 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) 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); } + static void modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) { ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); + priv->cache_dir = NULL; priv->account_mgr = NULL; + priv->session = NULL; priv->device = NULL; - priv->cache_dir = NULL; - priv->tny_session_camel = NULL; - + + /* An in-memory store of passwords, + * for passwords that are not remembered in the configuration, + * so they need to be asked for from the user once in each session: + */ priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); } + +static void +account_list_free (GSList *accounts) +{ + 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); +} + + static void on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, gpointer user_data) { - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + /* 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') + */ + + account_list_free (priv->store_accounts); + get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, TNY_ACCOUNT_TYPE_STORE); + + account_list_free (priv->transport_accounts); + get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, + TNY_ACCOUNT_TYPE_TRANSPORT); + + /* TODO: Ref these when we add them? */ + g_slist_free (priv->store_accounts_outboxes); + priv->store_accounts_outboxes = NULL; + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); - } static void -on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, - const gchar *key, gpointer user_data) +on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, + const gchar *key, gboolean server_account, gpointer user_data) + { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + /* 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) { + if (priv->store_accounts) { + account_list_free (priv->store_accounts); + priv->store_accounts = NULL; + get_server_accounts (TNY_ACCOUNT_STORE(self), + NULL, TNY_ACCOUNT_TYPE_STORE); + } + + if (priv->transport_accounts) { + account_list_free (priv->transport_accounts); + priv->transport_accounts = NULL; + get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, + TNY_ACCOUNT_TYPE_TRANSPORT); + } + } + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); } @@ -196,479 +281,409 @@ on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean se static ModestTnyAccountStore* get_account_store_for_account (TnyAccount *account) { - return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), "account_store")); + return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), + "account_store")); } - - -static void -set_account_store_for_account (TnyAccount *account, ModestTnyAccountStore *store) -{ - g_object_set_data (G_OBJECT(account), "account_store", (gpointer)store); -} - - +/* This callback will be called by Tinymail when it needs the password + * from the user, for instance if the password was not remembered. + * Note that TnyAccount here will be the server account. */ static gchar* get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) { + /* Initialize the output parameter: */ + if (cancel) + *cancel = FALSE; + const gchar *key; const TnyAccountStore *account_store; ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; + gchar *username = NULL; gchar *pwd = NULL; + gpointer pwd_ptr; gboolean already_asked; - g_return_val_if_fail (account, NULL); - key = tny_account_get_id (account); account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account)); - + self = MODEST_TNY_ACCOUNT_STORE (account_store); 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... */ - already_asked = g_hash_table_lookup (priv->password_hash, key) != NULL; + 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, + NULL, + (gpointer*)&pwd_ptr); /* if the password is not already there, try ModestConf */ -/* if (!already_asked) */ + if (!already_asked) { pwd = modest_account_mgr_get_string (priv->account_mgr, - key, MODEST_ACCOUNT_PASSWORD, - TRUE, NULL); - -/* /\* if it was already asked, it must have been wrong, so ask again *\/ */ -/* if (!already_asked || !pwd || strlen(pwd) == 0) { */ - -/* /\* we don't have it yet. we emit a signal to get the password somewhere *\/ */ -/* const gchar* name = tny_account_get_name (account); */ -/* *cancel = TRUE; */ -/* pwd = NULL; */ -/* g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, */ -/* name, &pwd, cancel); */ -/* if (!*cancel) /\* remember the password *\/ */ -/* modest_account_mgr_set_string (priv->account_mgr, */ -/* key, MODEST_ACCOUNT_PASSWORD, */ -/* pwd, TRUE, NULL); */ -/* } else */ -/* *cancel = FALSE; */ - -/* g_hash_table_insert (priv->password_hash, key, pwd); */ - - /* FIXME: pwd needs to be freed somehow */ - return pwd; -} + key, MODEST_ACCOUNT_PASSWORD, TRUE); + g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup (pwd)); + } + /* if it was already asked, it must have been wrong, so ask again */ + if (already_asked || !pwd || strlen(pwd) == 0) { + /* 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 */ + &username, &pwd, cancel, &remember); + + if (!*cancel) { + if (remember) + 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 + will free it */ + g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup(pwd)); + } else { + g_hash_table_remove (priv->password_hash, key); + + g_free (pwd); + pwd = NULL; + } -static void -forget_password (TnyAccount *account) { + g_free (username); + username = NULL; + } else + *cancel = FALSE; + + /* printf(" DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */ + + return pwd; +} +/* tinymail calls this if the connection failed due to an incorrect password. + * And it seems to call this for any general connection failure. */ +static void +forget_password (TnyAccount *account) +{ + printf ("DEBUG: %s\n", __FUNCTION__); ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; const TnyAccountStore *account_store; - + gchar *pwd; + const gchar *key; + account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account)); self = MODEST_TNY_ACCOUNT_STORE (account_store); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); -} - - - -/* create a tnyaccount for the server account connected to the account with name 'key' - */ -static TnyAccount* -tny_account_from_name (ModestTnyAccountStore *self, const gchar *account, - const gchar *server_account, ModestProtocolType modest_type) -{ - TnyAccount *tny_account; - ModestTnyAccountStorePrivate *priv; - gchar *val; - GSList *options = NULL; - GError *error = NULL; - - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (account, NULL); - g_return_val_if_fail (server_account, NULL); - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - /* is it a store or a transport? */ - if (modest_type == MODEST_PROTOCOL_TYPE_STORE) - tny_account = TNY_ACCOUNT(tny_camel_store_account_new ()); - else if (modest_type == MODEST_PROTOCOL_TYPE_TRANSPORT) - tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ()); - else - g_assert_not_reached (); - - if (!tny_account) { - g_printerr ("modest: failed to create new tny account for '%s:%s'\n", - account, server_account); - return NULL; - } - - set_account_store_for_account (TNY_ACCOUNT(tny_account), self); - - /* session */ - tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), - priv->tny_session_camel); - - /* id */ - tny_account_set_id (tny_account, server_account); - - /* name */ - val = modest_account_mgr_get_string (priv->account_mgr, account, - MODEST_ACCOUNT_DISPLAY_NAME, FALSE, NULL); - if (val) { - tny_account_set_name (tny_account, val); - g_free (val); - } else { - g_printerr ("modest: display name not defined for '%s:%s'\n", - account, server_account); - g_object_unref (G_OBJECT(tny_account)); - return NULL; - } - - /* proto */ - val = modest_account_mgr_get_string (priv->account_mgr, server_account, - MODEST_ACCOUNT_PROTO, TRUE, NULL); - if (val) { - tny_account_set_proto (tny_account, val); - g_free (val); - } else { - g_printerr ("modest: protocol not defined for '%s:%s'\n", - account, server_account); - g_object_unref (G_OBJECT(tny_account)); - return NULL; + key = tny_account_get_id (account); + + /* Do not remove the key, this will allow us to detect that we + have already asked for it at least once */ + pwd = g_hash_table_lookup (priv->password_hash, key); + if (pwd) { + memset (pwd, 0, strlen (pwd)); + g_hash_table_insert (priv->password_hash, g_strdup (key), NULL); } - /* Options */ - options = modest_account_mgr_get_list (priv->account_mgr, - tny_account_get_id (tny_account), - MODEST_ACCOUNT_OPTIONS, - MODEST_CONF_VALUE_STRING, - TRUE, - &error); - - if (error) { - g_warning ("Error retrieving account %s options: %s", - tny_account_get_id (tny_account), error->message); - g_error_free (error); - } else { - GSList *tmp = options; - while (options) { - tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), options->data); - g_free (options->data); - options = g_slist_next (options); - } - g_slist_free (tmp); - } - - /* hostname */ - val = modest_account_mgr_get_string (priv->account_mgr, server_account, - MODEST_ACCOUNT_HOSTNAME, TRUE, - NULL); - if (val) { - tny_account_set_hostname (tny_account, val); - g_free (val); - } - - /* username */ - val = modest_account_mgr_get_string (priv->account_mgr, server_account, - MODEST_ACCOUNT_USERNAME, TRUE, - NULL); - if (val) { - tny_account_set_user (tny_account, val); - g_free (val); - } - - tny_account_set_pass_func (tny_account, get_password); - tny_account_set_forget_pass_func (tny_account, forget_password); - - return tny_account; + /* Remove from configuration system */ + modest_account_mgr_unset (priv->account_mgr, + key, MODEST_ACCOUNT_PASSWORD, TRUE); } - static void modest_tny_account_store_finalize (GObject *obj) { - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj); - ModestTnyAccountStorePrivate *priv = - MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj); + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + //gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS; + + g_free (priv->cache_dir); + priv->cache_dir = NULL; + + if (priv->password_hash) { + g_hash_table_destroy (priv->password_hash); + priv->password_hash = NULL; + } if (priv->account_mgr) { - g_signal_handler_disconnect (G_OBJECT(priv->account_mgr), - priv->sig1); - g_signal_handler_disconnect (G_OBJECT(priv->account_mgr), - priv->sig2); g_object_unref (G_OBJECT(priv->account_mgr)); priv->account_mgr = NULL; } - if (priv->tny_session_camel) { - // FIXME: how to kill a camel - priv->tny_session_camel = NULL; - } - if (priv->device) { g_object_unref (G_OBJECT(priv->device)); priv->device = NULL; } - if (priv->store_lock) - g_mutex_free (priv->store_lock); - - g_free (priv->cache_dir); - priv->cache_dir = 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; - if (priv->password_hash) { - g_hash_table_destroy (priv->password_hash); - priv->password_hash = NULL; + if (priv->session) { + camel_object_unref (CAMEL_OBJECT(priv->session)); + priv->session = NULL; } - + G_OBJECT_CLASS(parent_class)->finalize (obj); } ModestTnyAccountStore* -modest_tny_account_store_new (ModestAccountMgr *account_mgr) { +modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) { GObject *obj; ModestTnyAccountStorePrivate *priv; - TnyPlatformFactory *pfact; + TnyList *list; g_return_val_if_fail (account_mgr, NULL); + g_return_val_if_fail (device, NULL); obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL)); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); - g_object_ref(G_OBJECT(account_mgr)); - priv->account_mgr = account_mgr; - - priv->sig1 = g_signal_connect (G_OBJECT(account_mgr), "account_changed", - G_CALLBACK (on_account_changed), obj); - priv->sig2 = g_signal_connect (G_OBJECT(account_mgr), "account_removed", - G_CALLBACK (on_account_removed), obj); + priv->account_mgr = g_object_ref (G_OBJECT(account_mgr)); + priv->device = g_object_ref (device); - priv->store_lock = g_mutex_new (); - - pfact = TNY_PLATFORM_FACTORY (modest_tny_platform_factory_get_instance()); - if (!pfact) { - g_printerr ("modest: cannot create platform factory\n"); - g_object_unref (obj); - return NULL; - } + priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj)); - priv->device = TNY_DEVICE(tny_platform_factory_new_device(pfact)); - if (!priv->device) { - g_printerr ("modest: cannot create device instance\n"); - g_object_unref (obj); - return NULL; - } - tny_device_force_online (priv->device); + 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); - priv->tny_session_camel = tny_session_camel_new (TNY_ACCOUNT_STORE(obj)); - - if (!priv->tny_session_camel) { - g_printerr ("modest: cannot create TnySessionCamel instance\n"); - g_object_unref (obj); - return NULL; - } + /* 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); return MODEST_TNY_ACCOUNT_STORE(obj); } - -static gboolean -add_account (TnyAccountStore *self, TnyAccount *account) { - - ModestTnyAccountStore *account_store; - ModestTnyAccountStorePrivate *priv; - - const gchar *account_name; - const gchar *hostname, *username, *proto; - - g_return_val_if_fail (self, FALSE); - g_return_val_if_fail (account, FALSE); - - account_store = MODEST_TNY_ACCOUNT_STORE(self); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - account_name = tny_account_get_id(account); - if (!account_name) { - g_printerr ("modest: failed to retrieve account name\n"); - return FALSE; - } - - hostname = tny_account_get_hostname(account); - username = tny_account_get_user(account); - proto = tny_account_get_proto(account); - - return modest_account_mgr_add_server_account (priv->account_mgr, - account_name, - hostname, username, NULL, - proto); -} - - +/** Fill the TnyList from the appropriate cached GSList of accounts. */ static void -modest_tny_account_store_add_store_account (TnyAccountStore *self, - TnyStoreAccount *account) +get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) { ModestTnyAccountStorePrivate *priv; - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(account), - priv->tny_session_camel); + GSList *accounts, *cursor; - if (!add_account (self, TNY_ACCOUNT(account))) - g_printerr ("modest: failed to add store account\n"); -} + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + accounts = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts); + cursor = accounts; + while (cursor) { + tny_list_prepend (list, G_OBJECT(cursor->data)); + cursor = cursor->next; + } +} static void -modest_tny_account_store_add_transport_account (TnyAccountStore *self, - TnyTransportAccount *account) +create_per_account_local_outbox_folders (TnyAccountStore *self) { - ModestTnyAccountStorePrivate *priv; - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(account), - priv->tny_session_camel); + g_return_if_fail (self); - if (!add_account (self, TNY_ACCOUNT(account))) - g_printerr ("modest: failed to add transport account\n"); -} - - -static gchar* -get_server_account_for_account (ModestTnyAccountStore *self, const gchar *account_name, - ModestProtocolType modest_type) -{ - ModestTnyAccountStorePrivate *priv; - gchar *server; - gchar *key; - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - if (modest_type == MODEST_PROTOCOL_TYPE_STORE) - key = MODEST_ACCOUNT_STORE_ACCOUNT; - else if (modest_type == MODEST_PROTOCOL_TYPE_TRANSPORT) - key = MODEST_ACCOUNT_TRANSPORT_ACCOUNT; - else - g_assert_not_reached(); + ModestTnyAccountStorePrivate *priv = + MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - server = modest_account_mgr_get_string (priv->account_mgr, - account_name, - key, FALSE, NULL); - if (!server) - return NULL; + /* printf("DEBUG: %s: priv->store_accounts_outboxes = %p\n", __FUNCTION__, priv->store_accounts_outboxes); */ + + if (priv->store_accounts_outboxes) { + return; + } - if (!modest_account_mgr_account_exists (priv->account_mgr, - server, TRUE, NULL)) { - g_free (server); - return NULL; + /* Create the transport accounts, if necessary: */ + if (!(priv->transport_accounts)) { + get_server_accounts (self, NULL /* TnyList */, + TNY_ACCOUNT_TYPE_TRANSPORT); } - return server; + + GSList *accounts = NULL; + + GSList *account_names = modest_account_mgr_account_names (priv->account_mgr, + TRUE /* including disabled accounts */); + + GSList *iter = account_names; + for (iter = priv->transport_accounts; iter; iter = g_slist_next (iter)) { + + TnyAccount *transport_account = (TnyAccount*)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, transport_account, priv->session); + + accounts = g_slist_append (accounts, tny_account_outbox); /* cache it */ + }; + + priv->store_accounts_outboxes = accounts; } +/* This function fills the TnyList, and also stores a GSList of the accounts, + * for caching purposes. It creates the TnyAccount objects if necessary. + * The @list parameter may be NULL, if you just want to fill the cache. + */ static void -modest_tny_account_store_get_accounts (TnyAccountStore *iface, - TnyList *list, - TnyGetAccountsRequestType type) +get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) { - ModestTnyAccountStore *self; - ModestTnyAccountStorePrivate *priv; - GSList *accounts, *cursor; - ModestProtocolType modest_type; + g_return_if_fail (self); - g_return_if_fail (iface); - - self = MODEST_TNY_ACCOUNT_STORE(iface); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - switch (type) { - case TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS: - modest_type = MODEST_PROTOCOL_TYPE_TRANSPORT; - break; - case TNY_ACCOUNT_STORE_STORE_ACCOUNTS: - modest_type = MODEST_PROTOCOL_TYPE_STORE; - break; - case TNY_ACCOUNT_STORE_BOTH: - modest_type = MODEST_PROTOCOL_TYPE_ANY; - break; - default: - g_assert_not_reached (); + /* printf ("DEBUG: %s: list=%p, type=%d\n", __FUNCTION__, list, type); */ + + ModestTnyAccountStorePrivate *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) { + if (priv->transport_accounts) + return; } + + GSList *account_names = NULL, *cursor = NULL; + GSList *accounts = NULL; - cursor = accounts = modest_account_mgr_account_names (priv->account_mgr, NULL); - - while (cursor) { - gchar *account_name; - gchar *server_account; - TnyAccount *account; - gboolean is_server_account; - - account_name = (gchar*)cursor->data; - account = NULL; - is_server_account = FALSE; + /* these account names, not server_account names */ + account_names = modest_account_mgr_account_names (priv->account_mgr,FALSE); - if (!modest_account_mgr_account_get_enabled (priv->account_mgr, account_name)) { - g_free (account_name); - cursor = cursor->next; - continue; - } + for (cursor = account_names; cursor; cursor = cursor->next) { - if (modest_type == MODEST_PROTOCOL_TYPE_TRANSPORT || modest_type == MODEST_PROTOCOL_TYPE_ANY) { - server_account = get_server_account_for_account (self, account_name, - MODEST_PROTOCOL_TYPE_TRANSPORT); - if (server_account) { - account = tny_account_from_name (self, account_name, - server_account, - MODEST_PROTOCOL_TYPE_TRANSPORT); - is_server_account = TRUE; - } - - if (!account) - g_printerr ("modest: no transport account for '%s'\n", - account_name); - else - tny_list_prepend (list, G_OBJECT(account)); + gchar *account_name = (gchar*)cursor->data; - g_free (server_account); + /* we get the server_accounts for enabled accounts */ + if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) { + + /* Add the account: */ + TnyAccount *tny_account = + modest_tny_account_new_from_account (priv->account_mgr, + account_name, + type, priv->session, + get_password, + forget_password); + if (tny_account) { + g_object_set_data (G_OBJECT(tny_account), "account_store", + (gpointer)self); + if (list) + tny_list_prepend (list, G_OBJECT(tny_account)); + + accounts = g_slist_append (accounts, tny_account); /* cache it */ + } else + g_printerr ("modest: failed to create account for %s\n", + account_name); + } + g_free (account_name); + } + g_slist_free (account_names); + + 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); + if (list) + tny_list_prepend (list, G_OBJECT(tny_account)); + accounts = g_slist_append (accounts, tny_account); /* cache it */ + } + + /* Do this here, in case create_per_account_local_outbox_folders() needs it. */ + if (type == TNY_ACCOUNT_TYPE_TRANSPORT) { + /* Store the cache: */ + priv->transport_accounts = accounts; + } + + /* 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 (modest_type == MODEST_PROTOCOL_TYPE_STORE || modest_type == MODEST_PROTOCOL_TYPE_ANY) { - server_account = get_server_account_for_account (self, account_name, - MODEST_PROTOCOL_TYPE_STORE); - if (server_account) { - account = tny_account_from_name (self, account_name, - server_account, - MODEST_PROTOCOL_TYPE_STORE); - is_server_account = TRUE; + } + + /* 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); + } + + /* 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)); + + accounts = g_slist_append (accounts, outbox_account); } - - if (!account) - g_printerr ("modest: no store account for '%s'\n", - account_name); - else - tny_list_prepend (list, G_OBJECT(account)); - g_free (server_account); } - - g_free (account_name); - cursor = cursor->next; } + + if (type == TNY_ACCOUNT_TYPE_STORE) { + /* Store the cache: */ + priv->store_accounts = accounts; + } +} - g_slist_free (accounts); - tny_session_camel_set_account_store (priv->tny_session_camel, iface); +static void +modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, + TnyGetAccountsRequestType request_type) +{ + ModestTnyAccountStorePrivate *priv; + + g_return_if_fail (self); + g_return_if_fail (TNY_IS_LIST(list)); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + if (request_type == TNY_ACCOUNT_STORE_BOTH) { + modest_tny_account_store_get_accounts (self, list, + TNY_ACCOUNT_STORE_STORE_ACCOUNTS); + modest_tny_account_store_get_accounts (self, list, + TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); + return; + } + + if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS) { + if (!priv->store_accounts) + get_server_accounts (self, list, TNY_ACCOUNT_TYPE_STORE); + else + get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_STORE); + + } 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); + } else + g_return_if_reached (); /* incorrect req type */ } -/* - * the cache dir will be ~/.modest/cache - * might want to change this in a simple #define... - */ static const gchar* modest_tny_account_store_get_cache_dir (TnyAccountStore *self) { @@ -676,10 +691,8 @@ modest_tny_account_store_get_cache_dir (TnyAccountStore *self) priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); if (!priv->cache_dir) - priv->cache_dir = g_build_filename (g_get_home_dir(), - ".modest", - "cache", - NULL); + priv->cache_dir = g_build_filename (g_get_home_dir(), + MODEST_DIR, MODEST_CACHE_DIR, NULL); return priv->cache_dir; } @@ -692,21 +705,146 @@ modest_tny_account_store_get_device (TnyAccountStore *self) { ModestTnyAccountStorePrivate *priv; - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + g_return_val_if_fail (self, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + if (priv->device) + return g_object_ref (G_OBJECT(priv->device)); + else + return NULL; +} + + +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; + } + } - return g_object_ref (G_OBJECT(priv->device)); + 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; } static gboolean modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, - const gchar *prompt) + gboolean question, const GError *error) { - g_printerr ("modest: alert [%d]: %s", - type, prompt); + 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", + __FUNCTION__, error->domain, error->message); + return FALSE; + } + + /* printf("DEBUG: %s: error->message=%s\n", __FUNCTION__, error->message); */ + - return TRUE; + /* const gchar *prompt = NULL; */ + gchar *prompt = NULL; + switch (error->code) { + 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: */ + 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); + + /* 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"), + error->message); + break; + default: + g_warning ("%s: Unhandled GError code: %d, message=%s", + __FUNCTION__, error->code, error->message); + prompt = NULL; + break; + } + + 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, + prompt)); + } else { + dialog = GTK_WIDGET (hildon_note_new_information (NULL, + 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); + + + printf("DEBUG: %s: returning %d\n", __FUNCTION__, retval); + return retval; } @@ -721,31 +859,184 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data) klass->get_accounts_func = modest_tny_account_store_get_accounts; - klass->add_transport_account_func = - modest_tny_account_store_add_transport_account; - klass->add_store_account_func = - modest_tny_account_store_add_store_account; klass->get_cache_dir_func = modest_tny_account_store_get_cache_dir; klass->get_device_func = modest_tny_account_store_get_device; klass->alert_func = modest_tny_account_store_alert; + klass->find_account_func = + modest_tny_account_store_find_account_by_url; } void modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self, ModestTnyGetPassFunc func) { - g_warning (__FUNCTION__); - return; /* not implemented, we use signals */ + /* not implemented, we use signals */ + g_printerr ("modest: set_get_pass_func not implemented\n"); } - TnySessionCamel* -tny_account_store_get_session (TnyAccountStore *self) +modest_tny_account_store_get_session (TnyAccountStore *self) +{ + g_return_val_if_fail (self, NULL); + return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->session; +} + + +TnyAccount* +modest_tny_account_store_get_tny_account_by_id (ModestTnyAccountStore *self, const gchar *id) +{ + TnyAccount *account = NULL; + ModestTnyAccountStorePrivate *priv; + GSList *cursor; + + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (id, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + + 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 */ + 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); + break; + } + } + + if (account) + g_object_ref (G_OBJECT(account)); + + return account; +} + +TnyAccount* +modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self, + const gchar *account_name, + TnyAccountType type) { + TnyAccount *account = NULL; + gchar *id = NULL; + ModestTnyAccountStorePrivate *priv; + 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, + NULL); - return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self)->tny_session_camel; + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* Special case for the local account */ + if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) { + 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: cannot get account data for account '%s'\n", account_name); + return NULL; + } + + 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); + + modest_account_mgr_free_account_data (priv->account_mgr, account_data); + } + + 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 : ""); + + return account; +} + +static TnyAccount* +get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, + const gchar *account_name) +{ + /* Get the current connection: */ + TnyDevice *device = modest_runtime_get_device (); + + if (!tny_device_is_online (device)) + return NULL; + +#ifdef MODEST_PLATFORM_MAEMO + g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device)); + TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device); + const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device); + if (!iap_id) + return NULL; + + ConIcIap* connection = tny_maemo_conic_device_get_iap (maemo_device, iap_id); + if (!connection) + return NULL; + + const gchar *connection_name = con_ic_iap_get_name (connection); + if (!connection_name) + return NULL; + + /* Get the connection-specific transport acccount, if any: */ + ModestAccountMgr *account_manager = modest_runtime_get_account_mgr (); + gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager, + account_name, connection_name); + + if (!server_account_name) + 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); + g_free (server_account_name); + + /* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */ + g_object_unref (connection); + + return account; +#else + return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */ +#endif /* MODEST_PLATFORM_MAEMO */ +} + + +TnyAccount* +modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self, + const gchar *account_name) +{ + /* Get the connection-specific transport acccount, if any: */ + 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) { + account = modest_tny_account_store_get_tny_account_by_account (self, account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + } + + return account; +} + +gboolean modest_tny_folder_store_is_virtual_local_folders (TnyFolderStore *self) +{ + /* We should make this more sophisticated if we ever use ModestTnySimpleFolderStore + * for anything else. */ + return MODEST_IS_TNY_SIMPLE_FOLDER_STORE (self); }