2007-06-25 Murray Cumming <murrayc@murrayc.com>
[modest] / src / maemo / easysetup / modest-easysetup-wizard.c
index 6ecd3c2..40754a6 100644 (file)
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 
 #include "modest-easysetup-wizard.h"
 #include <glib/gi18n.h>
@@ -52,6 +52,7 @@
 #include "maemo/modest-connection-specific-smtp-window.h"
 #include "widgets/modest-ui-constants.h"
 #include "maemo/modest-account-settings-dialog.h"
+#include "maemo/modest-maemo-utils.h"
 #include <gconf/gconf-client.h>
 #include <string.h> /* For strlen(). */
 
@@ -144,6 +145,63 @@ set_default_custom_servernames(ModestEasysetupWizardDialog *dialog);
 
 static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data);
 
+static gint get_serverport_incoming(ModestPresetsServerType servertype_incoming,
+                                                                                                                                               ModestPresetsSecurity security_incoming)
+{
+       int serverport_incoming = 0;
+               /* We don't check for SMTP here as that is impossible for an incoming server. */
+               if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_IMAP) {
+                       serverport_incoming =
+                               (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING_ALTERNATE_PORT) ? 993 : 143; 
+               } else if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_POP) {
+                       serverport_incoming =
+                               (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING_ALTERNATE_PORT) ? 995 : 110; 
+               }
+       return serverport_incoming;
+}
+
+static GList* check_for_supported_auth_methods(ModestEasysetupWizardDialog* account_wizard)
+{
+       GError *error = NULL;
+       const ModestTransportStoreProtocol protocol = 
+          easysetup_servertype_combo_box_get_active_servertype (
+                                                                EASYSETUP_SERVERTYPE_COMBO_BOX (account_wizard->combo_incoming_servertype));
+    const gchar* hostname = gtk_entry_get_text(GTK_ENTRY(account_wizard->entry_incomingserver));
+    const gchar* username = gtk_entry_get_text(GTK_ENTRY(account_wizard->entry_user_username));
+         const ModestConnectionProtocol protocol_security_incoming = 
+                                       modest_serversecurity_combo_box_get_active_serversecurity (
+                                                                                                                                                                                                                                                                                MODEST_SERVERSECURITY_COMBO_BOX (
+                                                                                                                                                                                                                                                                                                                                                                                                                       account_wizard->combo_incoming_security));
+     int port_num = get_serverport_incoming(protocol, protocol_security_incoming); 
+     GList *list_auth_methods =
+          modest_maemo_utils_get_supported_secure_authentication_methods (
+                                                                      protocol, 
+                                                                      hostname, port_num, username, GTK_WINDOW (account_wizard), &error);
+       if (list_auth_methods) {
+          /* TODO: Select the correct method */
+                         GList* list = NULL;
+                         GList* method;
+                         for (method = list_auth_methods; method != NULL; method = g_list_next(method)) {
+                                 ModestAuthProtocol auth = (ModestAuthProtocol) (GPOINTER_TO_INT(method->data));
+                                 if (modest_protocol_info_auth_is_secure(auth)) {
+                                        list = g_list_append(list, GINT_TO_POINTER(auth));
+                                }
+                        }
+                        g_list_free(list_auth_methods);
+                        if (list)
+                                return list;
+                }
+                /* no secure methods supported */
+     GtkWidget* error_dialog = gtk_message_dialog_new(GTK_WINDOW(account_wizard),
+                                                     GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
+                                                     GTK_BUTTONS_OK, error != NULL ? error->message : _("Server does not support secure authentication!"));
+     if(error != NULL) g_error_free(error);
+
+     gtk_dialog_run(GTK_DIALOG(error_dialog));
+     gtk_widget_destroy(error_dialog);
+     return NULL;
+}
+
 static void
 invoke_enable_buttons_vfunc (ModestEasysetupWizardDialog *wizard_dialog)
 {
@@ -242,10 +300,10 @@ on_combo_account_country (GtkComboBox *widget, gpointer user_data)
        ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self);
        
        /* Fill the providers combo, based on the selected country: */
-       gint mcc_id = easysetup_country_combo_box_get_active_country_id (
+       GSList *list_mcc_ids = easysetup_country_combo_box_get_active_country_ids (
                EASYSETUP_COUNTRY_COMBO_BOX (self->combo_account_country));
        easysetup_provider_combo_box_fill (
-               EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider), priv->presets, mcc_id);
+               EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider), priv->presets, list_mcc_ids);
 }
 
 static void
@@ -793,7 +851,7 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self
 }
 
 static gboolean
-on_timeout_show_advanced_edit(gpointer user_data)
+show_advanced_edit(gpointer user_data)
 {
        ModestEasysetupWizardDialog * self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
        
@@ -808,18 +866,7 @@ on_timeout_show_advanced_edit(gpointer user_data)
        
        gtk_dialog_run (GTK_DIALOG (dialog));
 
-       /* TODO: The hide() is not necessary.
-        * It is just here to show that it doesn't work,
-        * just as destroy doesn't work.
-        */
-       gtk_widget_hide (GTK_WIDGET(dialog));
-
-       /* TODO: The dialog remains on screen, not allowing any interaction.
-        * But gtk_widget_destroy() should always destroy.
-        */
-       printf("debug: destroying settings dialog\n");
        gtk_widget_destroy (GTK_WIDGET (dialog));
-       printf("debug: after destroying settings dialog (doesn't seem to work).\n");
        
        return FALSE; /* Do not call this timeout callback again. */
 }
@@ -834,10 +881,8 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data)
         * This account will be deleted if Finish is never actually clicked. */
 
        gboolean saved = TRUE;
-       gboolean was_already_saved = TRUE;
        if (!(self->saved_account_name)) {
                saved = create_account (self, FALSE);
-               was_already_saved = FALSE;
        }
                
        if (!saved)
@@ -847,17 +892,7 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data)
                return;
        
        /* Show the Account Settings window: */
-       if (was_already_saved) {
-               /* Just show the dialog immediately: */
-               on_timeout_show_advanced_edit(self);
-       }
-       else
-       {
-               printf ("debug: waiting for gconf to update its local cache. "
-                       "This is a hack to work around a maemo gconf bug in maemo bora.\n");
-       
-               g_timeout_add (5000, on_timeout_show_advanced_edit, self);
-       }
+       show_advanced_edit(self);
 }
 static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self)
 {
@@ -1200,11 +1235,12 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget *
                        
                if (!modest_text_utils_validate_email_address (email_address)) {
                        /* Warn the user via a dialog: */
-                       show_error (GTK_WINDOW (account_wizard), _("mcen_ib_invalid_email"));
+                       hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email"));
                                              
                        /* Return focus to the email address entry: */
                        gtk_widget_grab_focus (account_wizard->entry_user_email);
-            
+                       gtk_editable_select_region (GTK_EDITABLE (account_wizard->entry_user_email), 0, -1);
+
                        return FALSE;
                }
                
@@ -1221,6 +1257,23 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget *
        }
        else if (next_page == account_wizard->page_custom_outgoing) {
                set_default_custom_servernames (account_wizard);
+    /* Check if the server supports secure authentication */
+               const ModestConnectionProtocol security_incoming = 
+                       modest_serversecurity_combo_box_get_active_serversecurity (
+                                                                                                                                                                                                                                                                MODEST_SERVERSECURITY_COMBO_BOX (
+                                                                                                                                                                                                                                                                                                                                                                                                       account_wizard->combo_incoming_security));
+               if (gtk_toggle_button_get_active (
+                       GTK_TOGGLE_BUTTON (account_wizard->checkbox_incoming_auth))
+                               && !modest_protocol_info_is_secure(security_incoming))
+               {
+                               GList* methods = check_for_supported_auth_methods(account_wizard);
+                               if (!methods)
+                               {
+                                       g_list_free(methods);
+                                       return FALSE;
+                               }
+                               g_list_free(methods);
+               }
        }
        
        /* If this is the last page, and this is a click on Finish, 
@@ -1378,7 +1431,6 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled)
        /* username and password (for both incoming and outgoing): */
        const gchar* username = gtk_entry_get_text (GTK_ENTRY (self->entry_user_username));
        const gchar* password = gtk_entry_get_text (GTK_ENTRY (self->entry_user_password));
-       
        /* Incoming server: */
        /* Note: We need something as default for the ModestTransportStoreProtocol* values, 
         * or modest_account_mgr_add_server_account will fail. */
@@ -1387,7 +1439,7 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled)
        ModestTransportStoreProtocol protocol_incoming = MODEST_PROTOCOL_STORE_POP;
        ModestConnectionProtocol protocol_security_incoming = MODEST_PROTOCOL_CONNECTION_NORMAL;
        ModestAuthProtocol protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_NONE;
-       
+
        /* Get details from the specified presets: */
        gchar* provider_id = easysetup_provider_combo_box_get_active_provider_id (
                EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider));
@@ -1404,18 +1456,15 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled)
                                                                                                   TRUE /* incoming */);
 
                g_warning ("security incoming: %x", security_incoming);
-               
+                       
                /* We don't check for SMTP here as that is impossible for an incoming server. */
                if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_IMAP) {
                        protocol_incoming = MODEST_PROTOCOL_STORE_IMAP;
-                       serverport_incoming =
-                               (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING_ALTERNATE_PORT) ? 993 : 143; 
                } else if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_POP) {
-                       protocol_incoming = MODEST_PROTOCOL_STORE_POP;
-                       serverport_incoming =
-                               (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING_ALTERNATE_PORT) ? 995 : 110; 
+                       protocol_incoming = MODEST_PROTOCOL_STORE_POP; 
                }
-                               
+               serverport_incoming = get_serverport_incoming(servertype_incoming, security_incoming);
+               
                if (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING)
                        protocol_security_incoming = MODEST_PROTOCOL_CONNECTION_SSL; /* TODO: Is this what we want? */
                
@@ -1435,11 +1484,19 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled)
                /* The UI spec says:
                 * If secure authentication is unchecked, allow sending username and password also as plain text.
                 * If secure authentication is checked, require one of the secure methods during connection: SSL, TLS, CRAM-MD5 etc. 
-                * TODO: Do we need to discover which of these (SSL, TLS, CRAM-MD5) is supported?
                 */
-               protocol_authentication_incoming = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth)) 
-                       ? MODEST_PROTOCOL_AUTH_CRAMMD5
-                       : MODEST_PROTOCOL_AUTH_PASSWORD;
+               
+               if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth)) &&
+                               !modest_protocol_info_is_secure(protocol_security_incoming))
+               {
+                               GList* methods = check_for_supported_auth_methods(self);
+                               if (!methods)
+                                       return FALSE;
+                               else
+                                 protocol_authentication_incoming = (ModestAuthProtocol) (GPOINTER_TO_INT(methods->data));
+               }
+               else
+                       protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_PASSWORD;
        }
        
        /* First we add the 2 server accounts, and then we add the account that uses them.
@@ -1467,18 +1524,6 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled)
                return FALSE;   
        }
        
-       /* Sanity check: */
-       /* There must be at least one account now: */
-       /* Note, when this fails is is caused by a Maemo gconf bug that has been 
-        * fixed in versions after 3.1. */
-       GSList *account_names = modest_account_mgr_account_names (self->account_manager, FALSE);
-       if(!account_names)
-       {
-               g_warning ("modest_account_mgr_account_names() returned NULL after adding an account.");
-       }
-       g_slist_free (account_names);
-       
-       
        /* Outgoing server: */
        gchar* servername_outgoing = NULL;
        ModestTransportStoreProtocol protocol_outgoing = MODEST_PROTOCOL_STORE_POP;
@@ -1503,15 +1548,19 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled)
                ModestPresetsSecurity security_outgoing = 
                        modest_presets_get_info_server_security (priv->presets, provider_id, 
                                                                 FALSE /* incoming */);
-                       
+
+               /* TODO: There is no SMTP authentication enum for presets, 
+                  so we should probably check what the server supports. */
                protocol_security_outgoing = MODEST_PROTOCOL_CONNECTION_NORMAL;
                if (security_outgoing & MODEST_PRESETS_SECURITY_SECURE_SMTP) {
+                       /* printf("DEBUG: %s: using secure SMTP\n", __FUNCTION__); */
                        protocol_security_outgoing = MODEST_PROTOCOL_CONNECTION_SSL; /* TODO: Is this what we want? */
                        serverport_outgoing = 465;
                        protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_PASSWORD;
-               } else
+               } else {
+                       /* printf("DEBUG: %s: using non-secure SMTP\n", __FUNCTION__); */
                        protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_NONE;
-               /* TODO: There is no SMTP authentication enum for presets. */
+               }
        }
        else {
                /* Use custom pages because no preset was specified: */
@@ -1562,7 +1611,14 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled)
                show_error (GTK_WINDOW (self), _("An error occurred while creating the account."));
                return FALSE;   
        }
-       
+
+       /* Sanity check: */
+       /* There must be at least one account now: */
+       /* Note, when this fails is is caused by a Maemo gconf bug that has been 
+        * fixed in versions after 3.1. */
+       if(!modest_account_mgr_has_accounts (self->account_manager, FALSE))
+               g_warning ("modest_account_mgr_account_names() returned NULL after adding an account.");
+               
        /* The user name and email address must be set additionally: */
        const gchar* user_name = gtk_entry_get_text (GTK_ENTRY (self->entry_user_name));
        modest_account_mgr_set_string (self->account_manager, account_name,