Merge ~nteodosio/software-properties:network into software-properties:ubuntu/master

[Nathan Teodosio]

Add internet connection awareness.

Design in https://warthogs.atlassian.net/browse/DT-1014.

[Sebastien Bacher (seb128)]

Quite an improvement, thanks Nathan!

review: Approve

diff --git a/data/gtkbuilder/dialog-ua-attach.ui b/data/gtkbuilder/dialog-ua-attach.ui
index 515f995..6e255a8 100644
--- a/data/gtkbuilder/dialog-ua-attach.ui
+++ b/data/gtkbuilder/dialog-ua-attach.ui
@@ -26,6 +26,10 @@
                 <property name="max-width-chars">130</property>
               </object>
             </child>
+      <child>
+        <object class="GtkBox" id="radio_net_control_box">
+          <property name="visible">True</property>
+          <property name="orientation">vertical</property>
         <child>
           <object class="GtkRadioButton" id="magic_radio">
             <property name="label" translatable="yes">Enter code on ubuntu.com/pro/attach</property>
@@ -160,6 +164,30 @@
             <property name="label" translatable="yes">From your admin, or from &lt;a href="https://ubuntu.com/pro"&gt;ubuntu.com/pro&lt;/a&gt;</property>
           </object>
         </child>
+              </object>
+            </child>
+        <child>
+          <object class="GtkBox" id="no_connection">
+            <property name="visible">False</property>
+            <property name="margin-left">5</property>
+            <property name="margin-top">18</property>
+            <property name="margin-bottom">18</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="margin-right">5</property>
+                <property name="stock">gtk-dialog-warning</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="wrap">True</property>
+                <property name="label" translatable="yes">Unable to connect to Ubuntu Pro servers. Check your internet connection.</property>
+              </object>
+            </child>
+          </object>
+        </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
@@ -174,6 +202,9 @@
               </object>
             </child>
             <child>
+              <object class="GtkBox" id="confirm_net_control_box">
+                <property name="visible">True</property>
+            <child>
               <object class="GtkButton" id="confirm">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Confirm</property>
@@ -181,6 +212,8 @@
                 <signal name="clicked" handler="on_confirm_clicked" swapped="no"/>
               </object>
             </child>
+              </object>
+            </child>
           </object>
         </child>
       </object>
diff --git a/softwareproperties/gtk/DialogUaAttach.py b/softwareproperties/gtk/DialogUaAttach.py
index 7c7f89d..42d5365 100644
--- a/softwareproperties/gtk/DialogUaAttach.py
+++ b/softwareproperties/gtk/DialogUaAttach.py
@@ -20,7 +20,7 @@ import os
 from gettext import gettext as _
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk,GLib
+from gi.repository import Gtk,GLib,Gio
 from softwareproperties.gtk.utils import setup_ui
 from uaclient.api.u.pro.attach.magic.initiate.v1 import initiate
 from uaclient.api.u.pro.attach.magic.wait.v1 import MagicAttachWaitOptions, wait
@@ -40,6 +40,12 @@ class DialogUaAttach:
         self.poll = None
         self.pin = ""
 
+        self.net_monitor = Gio.network_monitor_get_default()
+        self.net_monitor.connect("network-changed", self.net_status_changed, 0)
+        self.net_status_changed(
+            self.net_monitor, self.net_monitor.get_network_available(), 1
+        )
+
         self.start_magic_attach()
 
     def run(self):
@@ -148,7 +154,7 @@ class DialogUaAttach:
         except MagicAttachTokenError:
             GLib.idle_add(self.update_state, 'expired')
         except Exception as e:
-            print("Error getting the Ubuntu Pro token: ", e)
+            print("Error getting the Ubuntu Pro token: ", e, flush = True)
         finally:
             self.poll = None
 
@@ -167,7 +173,7 @@ class DialogUaAttach:
             self.pin = response.user_code
             self.req_id = response.token
         except Exception as e:
-            print(e)
+            print("Error retrieving magic token: ", e)
             return
         self.update_state()
         self.poll = GLib.Thread.new("poll", self.poll_for_magic_token)
@@ -178,5 +184,16 @@ class DialogUaAttach:
     def on_magic_radio_clicked(self, button):
         self.start_magic_attach()
 
+    # Do not control the radio buttons and confirm button widgets directly,
+    # since those former are controlled by update_state and this function must
+    # be logically independent of it. Control the net_control_box'es instead.
+    def net_status_changed(self, monitor, available, first_run):
+        self.no_connection.set_visible(not available)
+        self.radio_net_control_box.set_sensitive(available)
+        self.confirm_net_control_box.set_sensitive(available)
+        # wait() may have timed out without internet; Restart polling.
+        if (available and self.poll == None and not first_run):
+            self.poll = GLib.Thread.new("poll", self.poll_for_magic_token)
+
     def finish(self):
         self.dialog.response(Gtk.ResponseType.OK)