Merge lp:~rodrigo-moya/ubuntuone-client/check-network-connectivity into lp:ubuntuone-client

[Rodrigo Moya]

Deal correctly with no network/no U1 tokens cases when creating UDFs from the Nautilus plugin

Deal correctly with no network/no U1 tokens cases when creating UDFs from the Nautilus plugin

[Guillermo Gonzalez (verterok)]

Hi,

The "With User" in the status doesn't mean that we have a valid token, just that the user wants to be connected.

see ubuntuone/syncdaemon/states.py @ lines 35-43

review: Needs Fixing

[Manuel de la Peña (mandel)]

rodrigos code looks good, but I've taken at look at the python and With User seems not to be the correct things, nevertheless, I'm not a big fun of using strings for this type of things, specially WitT diFFerent casing, is error prone ;)

[Rodrigo Moya (rodrigo-moya)]

As a temporary solution (since I'm going to make use of ubuntu-sso's new DBus interface in the next branch), I've added code to check if the tokens are in the keyring, which is what this branch needs. So, Guillermo, Manuel, can you please review it again?

[Guillermo Gonzalez (verterok)]

+1 on ubuntu-sso!

review: Approve

[Manuel de la Peña (mandel)]

+1 looks good to me :D

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-08-04 08:02:09 +0000
+++ configure.ac	2010-08-05 09:18:43 +0000
@@ -112,7 +112,7 @@
 AC_SUBST(NAUTILUS_CFLAGS)
 AC_SUBST(NAUTILUS_LIBS)
 
-PKG_CHECK_MODULES(DBUS, [dbus-glib-1 >= 0.70])
+PKG_CHECK_MODULES(DBUS, [dbus-glib-1 >= 0.70 gnome-keyring-1])
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 

=== modified file 'libsyncdaemon/Makefile.am'
--- libsyncdaemon/Makefile.am	2010-07-20 12:38:17 +0000
+++ libsyncdaemon/Makefile.am	2010-08-05 09:18:43 +0000
@@ -21,6 +21,7 @@
 syncdaemonincludedir = $(includedir)/libsyncdaemon-1.0/libsyncdaemon
 syncdaemoninclude_HEADERS =			\
 	libsyncdaemon.h				\
+	syncdaemon-authentication.h		\
 	syncdaemon-daemon.h			\
 	syncdaemon-config-interface.h		\
 	syncdaemon-events-interface.h		\
@@ -39,6 +40,7 @@
 libsyncdaemon_1_0_la_SOURCES =			\
 	$(MARSHAL_GENERATED)			\
 	$(syncdaemoninclude_HEADERS)		\
+	syncdaemon-authentication.c		\
 	syncdaemon-daemon.c			\
 	syncdaemon-config-interface.c		\
 	syncdaemon-events-interface.c		\

=== modified file 'libsyncdaemon/libsyncdaemon.h'
--- libsyncdaemon/libsyncdaemon.h	2010-07-20 12:38:17 +0000
+++ libsyncdaemon/libsyncdaemon.h	2010-08-05 09:18:43 +0000
@@ -19,6 +19,7 @@
  *
  */
 
+#include <libsyncdaemon/syncdaemon-authentication.h>
 #include <libsyncdaemon/syncdaemon-config-interface.h>
 #include <libsyncdaemon/syncdaemon-daemon.h>
 #include <libsyncdaemon/syncdaemon-events-interface.h>

=== added file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	1970-01-01 00:00:00 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	2010-08-05 09:18:43 +0000
@@ -0,0 +1,88 @@
+/*
+ * Syncdaemon API
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <gnome-keyring.h>
+#include "syncdaemon-authentication.h"
+
+G_DEFINE_TYPE(SyncdaemonAuthentication, syncdaemon_authentication, G_TYPE_OBJECT)
+
+struct _SyncdaemonAuthenticationPrivate {
+	gboolean has_credentials;
+};
+
+static void
+syncdaemon_authentication_finalize (GObject *object)
+{
+	SyncdaemonAuthentication *auth = SYNCDAEMON_AUTHENTICATION (object);
+
+	if (auth->priv != NULL) {
+		g_free (auth->priv);
+	}
+
+	G_OBJECT_CLASS (syncdaemon_authentication_parent_class)->finalize (object);
+}
+
+static void
+syncdaemon_authentication_class_init (SyncdaemonAuthenticationClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = syncdaemon_authentication_finalize;
+}
+
+static void
+syncdaemon_authentication_init (SyncdaemonAuthentication *auth)
+{
+	auth->priv = g_new0 (SyncdaemonAuthenticationPrivate, 1);
+	auth->priv->has_credentials = FALSE;
+}
+
+/**
+ * syncdaemon_authentication_has_credentials:
+ */
+gboolean
+syncdaemon_authentication_has_credentials (SyncdaemonAuthentication *auth)
+{
+	GnomeKeyringAttributeList *attrs;
+        GnomeKeyringResult result;
+        GList *items_found;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_AUTHENTICATION (auth), FALSE);
+
+	if (auth->priv->has_credentials)
+		return TRUE;
+
+	/* FIXME: use ubuntu-sso's DBus interface when available */
+	attrs = gnome_keyring_attribute_list_new ();
+        gnome_keyring_attribute_list_append_string (attrs, "ubuntuone-realm", "https://ubuntuone.com");
+        gnome_keyring_attribute_list_append_string (attrs, "oauth-consumer-key", "ubuntuone");
+
+        result = gnome_keyring_find_items_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET,
+                                                attrs, &items_found);
+        if (result == GNOME_KEYRING_RESULT_OK && items_found != NULL) {
+		gnome_keyring_found_list_free (items_found);
+		auth->priv->has_credentials = TRUE;
+
+		return TRUE;
+	}
+
+	return FALSE;
+}

=== added file 'libsyncdaemon/syncdaemon-authentication.h'
--- libsyncdaemon/syncdaemon-authentication.h	1970-01-01 00:00:00 +0000
+++ libsyncdaemon/syncdaemon-authentication.h	2010-08-05 09:18:43 +0000
@@ -0,0 +1,53 @@
+/*
+ * Syncdaemon API
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef __SYNCDAEMON_AUTHENTICATION_H__
+#define __SYNCDAEMON_AUTHENTICATION_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define SYNCDAEMON_TYPE_AUTHENTICATION                (syncdaemon_authentication_get_type ())
+#define SYNCDAEMON_AUTHENTICATION(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_AUTHENTICATION, SyncdaemonAuthentication))
+#define SYNCDAEMON_IS_AUTHENTICATION(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_AUTHENTICATION))
+#define SYNCDAEMON_AUTHENTICATION_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_AUTHENTICATION, SyncdaemonAuthenticationClass))
+#define SYNCDAEMON_IS_AUTHENTICATION_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_AUTHENTICATION))
+#define SYNCDAEMON_AUTHENTICATION_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_AUTHENTICATION, SyncdaemonAuthenticationClass))
+
+typedef struct _SyncdaemonAuthenticationPrivate SyncdaemonAuthenticationPrivate;
+
+typedef struct {
+	GObject parent;
+	SyncdaemonAuthenticationPrivate *priv;
+} SyncdaemonAuthentication;
+
+typedef struct {
+	GObjectClass parent_class;
+} SyncdaemonAuthenticationClass;
+
+GType    syncdaemon_authentication_get_type (void);
+
+gboolean syncdaemon_authentication_has_credentials (SyncdaemonAuthentication *auth);
+
+G_END_DECLS
+
+#endif

=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2010-07-26 16:18:00 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	2010-08-05 09:18:43 +0000
@@ -54,6 +54,7 @@
 	gboolean ready;
 	gboolean connected;
 	gchar *root_dir;
+	SyncdaemonAuthentication *auth;
 };
 
 /* Signals */
@@ -105,7 +106,10 @@
 
 		if (daemon->priv->root_dir != NULL)
 			g_free (daemon->priv->root_dir);
-		        
+
+		if (daemon->priv->auth != NULL)
+			g_object_unref (G_OBJECT (daemon->priv->auth));
+
 		g_free (daemon->priv);
 	}
 
@@ -390,6 +394,7 @@
 	daemon->priv->connected = FALSE;
 	daemon->priv->subinterfaces = g_hash_table_new_full (g_str_hash, g_str_equal,
 							     g_free, g_object_unref);
+	daemon->priv->auth = g_object_new (SYNCDAEMON_TYPE_AUTHENTICATION, NULL);
 
 	/* Initialize DBus */
 #ifdef HAVE_GDBUS
@@ -602,6 +607,42 @@
 	return NULL;
 }
 
+/**
+ * syncdaemon_daemon_has_network:
+ */
+gboolean
+syncdaemon_daemon_has_network (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+	gboolean result = FALSE;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
+
+	interface = syncdaemon_daemon_get_status_interface (daemon);
+	if (SYNCDAEMON_IS_STATUS_INTERFACE (interface)) {
+		SyncdaemonStatusInfo *status_info;
+
+		status_info = syncdaemon_status_interface_get_current_status (SYNCDAEMON_STATUS_INTERFACE (interface));
+		if (g_strrstr (syncdaemon_status_info_get_connection (status_info), "With Network") != NULL)
+			result = TRUE;
+
+		g_object_unref (G_OBJECT (status_info));
+	}
+
+	return result;
+}
+
+/**
+ * syncdaemon_daemon_get_authentication:
+ */
+SyncdaemonAuthentication *
+syncdaemon_daemon_get_authentication (SyncdaemonDaemon *daemon)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	return daemon->priv->auth;
+}
+
 static SyncdaemonInterface *
 get_interface (SyncdaemonDaemon *daemon, const gchar *path, SyncdaemonInterface * (* new_func) (SyncdaemonDaemon *daemon))
 {

=== modified file 'libsyncdaemon/syncdaemon-daemon.h'
--- libsyncdaemon/syncdaemon-daemon.h	2010-07-20 15:17:43 +0000
+++ libsyncdaemon/syncdaemon-daemon.h	2010-08-05 09:18:43 +0000
@@ -23,6 +23,7 @@
 #define __SYNCDAEMON_DAEMON_H__
 
 #include <glib-object.h>
+#include "syncdaemon-authentication.h"
 #include "syncdaemon-folder-info.h"
 #include "syncdaemon-interface.h"
 #include "syncdaemon-share-info.h"
@@ -90,6 +91,9 @@
 gboolean             syncdaemon_daemon_quit (SyncdaemonDaemon *daemon);
 const gchar         *syncdaemon_daemon_get_root_dir (SyncdaemonDaemon *daemon);
 
+gboolean             syncdaemon_daemon_has_network (SyncdaemonDaemon *daemon);
+SyncdaemonAuthentication *syncdaemon_daemon_get_authentication (SyncdaemonDaemon *daemon);
+
 SyncdaemonInterface *syncdaemon_daemon_get_config_interface (SyncdaemonDaemon *daemon);
 SyncdaemonInterface *syncdaemon_daemon_get_events_interface (SyncdaemonDaemon *daemon);
 SyncdaemonInterface *syncdaemon_daemon_get_filesystem_interface (SyncdaemonDaemon *daemon);

=== modified file 'libsyncdaemon/syncdaemon-status-info.c'
--- libsyncdaemon/syncdaemon-status-info.c	2010-06-24 10:25:12 +0000
+++ libsyncdaemon/syncdaemon-status-info.c	2010-08-05 09:18:43 +0000
@@ -24,6 +24,7 @@
 G_DEFINE_TYPE(SyncdaemonStatusInfo, syncdaemon_status_info, G_TYPE_OBJECT)
 
 struct _SyncdaemonStatusInfoPrivate {
+	gchar *connection;
 	gchar *description;
 	gboolean is_connected;
 	gboolean is_online;
@@ -37,6 +38,15 @@
 	SyncdaemonStatusInfo *sinfo = SYNCDAEMON_STATUS_INFO (object);
 
 	if (sinfo->priv != NULL) {
+		if (sinfo->priv->connection != NULL)
+			g_free (sinfo->priv->connection);
+		if (sinfo->priv->description != NULL)
+			g_free (sinfo->priv->description);
+		if (sinfo->priv->name != NULL)
+			g_free (sinfo->priv->name);
+		if (sinfo->priv->queues != NULL)
+			g_free (sinfo->priv->queues);
+
 		g_free (sinfo->priv);
 	}
 
@@ -76,6 +86,7 @@
 
 	sinfo = g_object_new (SYNCDAEMON_TYPE_STATUS_INFO, NULL);
 	if (hash != NULL) {
+		syncdaemon_status_info_set_connection (sinfo, g_hash_table_lookup (hash, "connection"));
 		syncdaemon_status_info_set_description (sinfo, g_hash_table_lookup (hash, "description"));
 		syncdaemon_status_info_set_connected (
 			sinfo,
@@ -91,6 +102,31 @@
 }
 
 /**
+ * syncdaemon_status_info_get_connection:
+ */
+const gchar *
+syncdaemon_status_info_get_connection (SyncdaemonStatusInfo *sinfo)
+{
+	g_return_val_if_fail (SYNCDAEMON_IS_STATUS_INFO (sinfo), NULL);
+
+	return (const gchar *) sinfo->priv->connection;
+}
+
+/**
+ * syncdaemon_status_info_set_connection:
+ */
+void
+syncdaemon_status_info_set_connection (SyncdaemonStatusInfo *sinfo, const gchar *connection)
+{
+	g_return_if_fail (SYNCDAEMON_IS_STATUS_INFO (sinfo));
+
+	if (sinfo->priv->connection != NULL)
+		g_free (sinfo->priv->connection);
+
+	sinfo->priv->connection = g_strdup (connection);
+}
+
+/**
  * syncdaemon_status_info_get_connected:
  */
 gboolean

=== modified file 'libsyncdaemon/syncdaemon-status-info.h'
--- libsyncdaemon/syncdaemon-status-info.h	2010-06-24 10:25:12 +0000
+++ libsyncdaemon/syncdaemon-status-info.h	2010-08-05 09:18:43 +0000
@@ -49,6 +49,8 @@
 SyncdaemonStatusInfo *syncdaemon_status_info_new (void);
 SyncdaemonStatusInfo *syncdaemon_status_info_new_from_hash_table (GHashTable *hash);
 
+const gchar          *syncdaemon_status_info_get_connection (SyncdaemonStatusInfo *sinfo);
+void                  syncdaemon_status_info_set_connection (SyncdaemonStatusInfo *sinfo, const gchar *connection);
 gboolean              syncdaemon_status_info_get_connected (SyncdaemonStatusInfo *sinfo);
 void                  syncdaemon_status_info_set_connected (SyncdaemonStatusInfo *sinfo, gboolean connected);
 const gchar          *syncdaemon_status_info_get_description (SyncdaemonStatusInfo *sinfo);

=== modified file 'libsyncdaemon/test-libsyncdaemon.c'
--- libsyncdaemon/test-libsyncdaemon.c	2010-07-23 10:29:23 +0000
+++ libsyncdaemon/test-libsyncdaemon.c	2010-08-05 09:18:43 +0000
@@ -51,6 +51,10 @@
 
 	str = syncdaemon_daemon_get_root_dir (the_daemon);
 	g_assert (str != NULL);
+
+	syncdaemon_daemon_has_network (the_daemon);
+	syncdaemon_authentication_has_credentials (
+		syncdaemon_daemon_get_authentication (the_daemon));
 }
 
 static void
@@ -332,6 +336,7 @@
 
 	/* Test creating a SyncdaemonStatusInfo from a hash table */
 	hash = g_hash_table_new (g_str_hash, g_str_equal);
+	g_hash_table_insert (hash, "connection", TEST_DESCRIPTION);
 	g_hash_table_insert (hash, "description", TEST_DESCRIPTION);
 	g_hash_table_insert (hash, "is_connected", "True");
 	g_hash_table_insert (hash, "is_online", "False");
@@ -339,6 +344,7 @@
 	g_hash_table_insert (hash, "queues", TEST_STATUS);
 
 	sinfo = syncdaemon_status_info_new_from_hash_table (hash);
+	g_assert (g_strcmp0 (syncdaemon_status_info_get_connection (sinfo), TEST_DESCRIPTION) == 0);
 	g_assert (g_strcmp0 (syncdaemon_status_info_get_description (sinfo), TEST_DESCRIPTION) == 0);
 	g_assert (syncdaemon_status_info_get_connected (sinfo));
 	g_assert (syncdaemon_status_info_get_online (sinfo) == FALSE);

=== modified file 'nautilus/location-widget.c'
--- nautilus/location-widget.c	2010-07-27 11:27:54 +0000
+++ nautilus/location-widget.c	2010-08-05 09:18:43 +0000
@@ -266,6 +266,20 @@
 	}
 }
 
+static void enable_u1 (LocationWidget *location);
+
+static void
+daemon_connected_cb (SyncdaemonDaemon *daemon, gpointer user_data)
+{
+	LocationWidget *location = LOCATION_WIDGET (user_data);
+
+	if (syncdaemon_daemon_has_network (daemon) &&
+	    syncdaemon_authentication_has_credentials (
+		    syncdaemon_daemon_get_authentication (daemon))) {
+		enable_u1 (location);
+	}
+}
+
 static void
 enable_u1 (LocationWidget *location)
 {
@@ -284,8 +298,16 @@
 		start_spinner (location);		
 		gtk_widget_set_sensitive (location->toggle_button, FALSE);
 
-		syncdaemon_folders_interface_create (SYNCDAEMON_FOLDERS_INTERFACE (interface),
-						     location->path);
+		/* If there is no user authenticated, make Syncdaemon do so */
+		if (syncdaemon_authentication_has_credentials (
+			    syncdaemon_daemon_get_authentication (location->uon->syncdaemon))) {
+			syncdaemon_folders_interface_create (SYNCDAEMON_FOLDERS_INTERFACE (interface),
+							     location->path);
+		} else {
+			g_signal_connect (G_OBJECT (location->uon->syncdaemon), "connected",
+					  G_CALLBACK (daemon_connected_cb), location);
+			syncdaemon_daemon_connect (location->uon->syncdaemon);
+		}
 	}
 }
 
@@ -506,6 +528,16 @@
 		}
 	}
 
+	/* Check for connectivity */
+	if (!syncdaemon_daemon_has_network (location->uon->syncdaemon)) {
+		gtk_widget_set_sensitive (location->toggle_button, FALSE);
+		gtk_label_set_text (GTK_LABEL (location->help_label),
+				    _("Operations on this folder are disabled because there is no network "
+				      "connection"));
+		if (location->expander_status == GTK_ARROW_DOWN)
+					gtk_widget_show (location->help_label);
+	}
+
 	g_signal_connect (G_OBJECT (location->toggle_button), "toggled",
 			  G_CALLBACK (sync_toggled_cb), location);