#include <modest-tny-account-store.h>
#include <modest-tny-local-folders-account.h>
#include <modest-runtime.h>
+#include <modest-platform.h>
#include <tny-simple-list.h>
#include <modest-tny-folder.h>
#include <modest-tny-outbox-account.h>
return special_folder;
}
+static void
+on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, gpointer user_data)
+{
+ printf ("DEBUG: %s: status=%d\n", __FUNCTION__, status);
+
+ if (status == TNY_CONNECTION_STATUS_DISCONNECTED) {
+ /* We are trying to use the network with an account,
+ * but the accounts are set as offline, because our TnyDevice is offline,
+ * because libconic says we are offline.
+ * So ask the user to go online:
+ */
+ modest_platform_connect_and_wait(NULL);
+ } else if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) {
+ printf ("DEBUG: %s: Connection broken. Forcing TnyDevice offline.\n",
+ __FUNCTION__);
+
+ /* Something went wrong during some network operation.
+ * Stop trying to use the network now,
+ * by forcing accounts into offline mode:
+ *
+ * When libconic reconnects, it will set the device back online again,
+ * regardless of it being forced offline before.
+ */
+ TnyDevice *device = modest_runtime_get_device ();
+ tny_device_force_offline (device);
+ }
+}
+
/* Camel options: */
/* These seem to be listed in
/**
* modest_tny_account_new_from_server_account:
* @account_mgr: a valid account mgr instance
- * @account_name: the server account name for which to create a corresponding tny account
+ * @session: A valid TnySessionCamel instance.
+ * @account_data: the server account for which to create a corresponding tny account
* @type: the type of account to create (TNY_ACCOUNT_TYPE_STORE or TNY_ACCOUNT_TYPE_TRANSPORT)
*
* get a tnyaccount corresponding to the server_accounts (store or transport) for this account.
*/
static TnyAccount*
modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
+ TnySessionCamel *session,
ModestServerAccountData *account_data)
{
gchar *url = NULL;
g_return_val_if_fail (account_mgr, NULL);
+ g_return_val_if_fail (session, NULL);
g_return_val_if_fail (account_data, NULL);
/* sanity checks */
}
tny_account_set_id (tny_account, account_data->account_name);
+ /* This must be set quite early, or other set() functions will fail. */
+ tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session);
+
+ /* Handle connection requests:
+ * This (badly-named) signal will be called when we try to use an offline account. */
+ g_signal_connect (G_OBJECT (tny_account), "connection-status-changed",
+ G_CALLBACK (on_connection_status_changed), NULL);
+
/* Proto */
const gchar* proto_name =
modest_protocol_info_get_transport_store_protocol_name(account_data->proto);
TnyAccount*
modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
- const gchar *server_account_name)
+ TnySessionCamel *session,
+ const gchar *server_account_name)
{
ModestServerAccountData *account_data =
modest_account_mgr_get_server_account_data (account_mgr,
return NULL;
TnyAccount *result = modest_tny_account_new_from_server_account (
- account_mgr, account_data);
+ account_mgr, session, account_data);
modest_account_mgr_free_server_account_data (account_mgr, account_data);
g_return_val_if_fail (account_mgr, NULL);
g_return_val_if_fail (account_name, NULL);
+ g_return_val_if_fail (session, NULL);
account_data = modest_account_mgr_get_account_data (account_mgr, account_name);
if (!account_data) {
return NULL;
}
- tny_account = modest_tny_account_new_from_server_account (account_mgr, server_data);
+ tny_account = modest_tny_account_new_from_server_account (account_mgr, session, server_data);
if (!tny_account) {
g_printerr ("modest: failed to create tny account for %s (%s)\n",
account_data->account_name, server_data->account_name);
return NULL;
}
- tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
tny_account_set_forget_pass_func (tny_account,
forget_pass_func ? forget_pass_func : forget_pass_dummy);
tny_account_set_pass_func (tny_account,
TnyAccount*
-modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, const gchar* location_filepath)
+modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session,
+ const gchar* location_filepath)
{
+
+
/* Make sure that the directories exist: */
modest_init_local_folders (location_filepath);
gchar *maildir, *url_string;
g_return_val_if_fail (account_mgr, NULL);
+ g_return_val_if_fail (session, NULL);
+
if (!location_filepath) {
/* A NULL filepath means that this is the special local-folders maildir
TnyAccount*
-modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr, const gchar* account_name, TnySessionCamel *session)
+modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr,
+ const gchar* account_name,
+ TnySessionCamel *session)
{
g_return_val_if_fail (account_mgr, NULL);
g_return_val_if_fail (account_name, NULL);
+ g_return_val_if_fail (session, NULL);
/* Notice that we create a ModestTnyOutboxAccount here,
* instead of just a TnyCamelStoreAccount,
projects / modest / blobdiff