#include <tny-account.h>
#include <tny-account-store.h>
#include <tny-store-account.h>
+#include <tny-error.h>
#include <tny-transport-account.h>
#include <tny-simple-list.h>
#include <tny-account-store.h>
#include <tny-camel-transport-account.h>
#include <tny-camel-imap-store-account.h>
#include <tny-camel-pop-store-account.h>
+
#include <modest-runtime.h>
#include <modest-marshal.h>
#include <modest-protocol-info.h>
#include <tny-gtk-lockable.h>
#include <camel/camel.h>
+#ifdef MODEST_PLATFORM_MAEMO
+#include <tny-maemo-conic-device.h>
+#ifdef MODEST_HILDON_VERSION_0
+#include <hildon-widgets/hildon-note.h>
+#else
+#include <hildon/hildon-note.h>
+#endif
+#endif
+
/* '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_init (gpointer g, gpointer iface_data);
+static GSList*
+get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type);
+
+
/* list my signals */
enum {
ACCOUNT_UPDATE_SIGNAL,
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
NULL, NULL,
- modest_marshal_VOID__STRING_POINTER_POINTER_POINTER,
- G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER,
+ 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);
}
priv->session = NULL;
priv->device = 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);
}
GSList *cursor = accounts;
while (cursor) {
- g_object_unref (G_OBJECT(cursor->data));
if (G_IS_OBJECT(cursor->data)) { /* check twice... */
const gchar *id = tny_account_get_id(TNY_ACCOUNT(cursor->data));
- modest_runtime_verify_object_death(cursor->data,id);
+ modest_runtime_verify_object_last_ref(cursor->data,id);
}
+ g_object_unref (G_OBJECT(cursor->data));
cursor = cursor->next;
}
g_slist_free (accounts);
* accounts, and some do not affect tny accounts at all (such as 'last_update')
*/
-
account_list_free (priv->store_accounts);
- priv->store_accounts = NULL;
+ priv->store_accounts = get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, TNY_ACCOUNT_TYPE_STORE);
account_list_free (priv->transport_accounts);
- priv->transport_accounts = NULL;
-
+ priv->transport_accounts = get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
+ TNY_ACCOUNT_TYPE_TRANSPORT);
+
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')
*/
- account_list_free (priv->store_accounts);
- priv->store_accounts = NULL;
-
- account_list_free (priv->transport_accounts);
- priv->transport_accounts = NULL;
+ if (server_account) {
+ if (priv->store_accounts) {
+ account_list_free (priv->store_accounts);
+ priv->store_accounts =
+ 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 =
+ get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
+ TNY_ACCOUNT_TYPE_TRANSPORT);
+ }
+ }
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
account);
"account_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)
{
const TnyAccountStore *account_store;
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
+ gchar *username = NULL;
gchar *pwd = NULL;
gpointer pwd_ptr;
gboolean already_asked;
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... */
pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
* type-punned ptrs...*/
/* 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);
+ 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* name = tny_account_get_name (account);
+ 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,
- name, &pwd, cancel, &remember);
+ account_id, /* server_account_name */
+ &username, &pwd, cancel, &remember);
if (!*cancel) {
if (remember)
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;
}
+
+ g_free (username);
+ username = NULL;
} else
*cancel = FALSE;
+ /* printf(" DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */
+
return pwd;
}
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;
+ //gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS;
g_free (priv->cache_dir);
priv->cache_dir = NULL;
if (priv->session) {
camel_object_unref (CAMEL_OBJECT(priv->session));
- if (debug && CAMEL_IS_OBJECT(priv->session))
- g_warning ("%s:%d: TnyCamelSession still holds a refcount of %d",
- __FILE__,__LINE__,CAMEL_OBJECT(priv->session)->ref_count);
priv->session = NULL;
}
obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL));
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
- priv->account_mgr = account_mgr;
- g_object_ref (G_OBJECT(priv->account_mgr));
-
- priv->device = device;
- g_object_ref (priv->device);
+ priv->account_mgr = g_object_ref (G_OBJECT(account_mgr));
+ priv->device = g_object_ref (device);
priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj));
* for caching purposes
*/
static GSList*
-get_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
+get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
{
- ModestTnyAccountStorePrivate *priv;
- GSList *account_names, *cursor;
+ ModestTnyAccountStorePrivate *priv = NULL;
+ GSList *account_names = NULL, *cursor = NULL;
GSList *accounts = NULL;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- account_names = modest_account_mgr_account_names (priv->account_mgr);
-
+
+ /* these account names, not server_account names */
+ 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;
- /* only return enabled accounts */
+ /* we get the server_accounts for enabled accounts */
if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) {
TnyAccount *tny_account =
modest_tny_account_new_from_account (priv->account_mgr,
type, priv->session,
get_password,
forget_password);
- if (tny_account) { /* something went wrong */
+ if (tny_account) {
g_object_set_data (G_OBJECT(tny_account), "account_store",
(gpointer)self);
- tny_list_prepend (list, G_OBJECT(tny_account));
+ 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",
if (type == TNY_ACCOUNT_TYPE_STORE) {
TnyAccount *tny_account =
modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session);
- tny_list_prepend (list, G_OBJECT(tny_account));
+ if (list)
+ tny_list_prepend (list, G_OBJECT(tny_account));
accounts = g_slist_append (accounts, tny_account); /* cache it */
}
return accounts;
}
if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS) {
-
if (!priv->store_accounts)
- priv->store_accounts = get_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
+ 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)
priv->transport_accounts =
- get_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
+ get_server_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
else
get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
} else
}
+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;
+}
+
+
static gboolean
modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
- const gchar *prompt)
+ gboolean question, const GError *error)
{
- GtkMessageType gtktype;
+ 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); */
+
+
+ /* 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;
+
gboolean retval = FALSE;
- GtkWidget *dialog;
+#ifdef MODEST_PLATFORM_MAEMO
+ /* The Tinymail documentation says that we should show Yes and No buttons,
+ * but these never seem to be questions: */
+ GtkWidget *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_ERROR;
break;
}
-
- dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+
+ GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
gtktype, GTK_BUTTONS_YES_NO, prompt);
+#endif /* #ifdef MODEST_PLATFORM_MAEMO */
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
retval = TRUE;
- gtk_widget_destroy (dialog);
-
- return retval;
-}
-
-
+#ifdef MODEST_PLATFORM_MAEMO
+ /* FIXME: for mameo, assume it's ok; thus, we can get passed
+ * SSL cert notes etc.
+ */
+ retval = TRUE;
+#endif /*MODEST_PLATFORM_MAEMO*/
-static void
-modest_tny_account_store_add_store_account (TnyAccountStore *self,
- TnyStoreAccount *account)
-{
- /* we should not need this...*/
- g_printerr ("modest: add_store_account_func not implemented\n");
-}
+
+ gtk_widget_destroy (dialog);
+
+ /* TODO: Don't free this when we no longer strdup the message for testers. */
+ g_free (prompt);
-static void
-modest_tny_account_store_add_transport_account (TnyAccountStore *self,
- TnyTransportAccount *account)
-{
- /* we should not need this...*/
- g_printerr ("modest: add_transport_account_func not implemented\n");
+
+ return retval;
}
-
static void
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
}
TnySessionCamel*
-tny_account_store_get_session (TnyAccountStore *self)
+modest_tny_account_store_get_session (TnyAccountStore *self)
{
- g_return_val_if_fail (self, NULL);
+ g_return_val_if_fail (self, NULL);
return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->session;
}
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);
+ 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));
return account;
}
-
TnyAccount*
modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self,
const gchar *account_name,
else if (account_data->transport_account)
id = account_data->transport_account->account_name;
- if (id)
- account = modest_tny_account_store_get_tny_account_by_id (self, id);
+ 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",
modest_account_mgr_free_account_data (priv->account_mgr, account_data);
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;
+}
projects / modest / blobdiff