Merge ~nteodosio/software-properties:valid-magic-wait-contract into software-properties:ubuntu/master

[Nathan Teodosio]

This is an alternative to the superseded request.

We already have contract_token to mean "user validated PIN", so simply use it.

[Sebastien Bacher (seb128)]

Thanks, that should work but is there any reason we keep pooling for tokens when the option is not selected? Also wouldn't it be simpler to make the status update conditional to the selected widget option rather than using events?

review: Needs Information

[Nathan Teodosio (nteodosio)]

> is there any reason we keep pooling for tokens when the option is not selected?

Since wait() blocks, interrupting that thread when the user selects the other radio button is a bit involved, as far as I know. But I'll investigate this option further.

> wouldn't it be simpler to make the status update conditional to the selected widget option rather than using events?

Do you mean something like: Once wait() returns,

- If magic button selected, call update_state as we do now.
- If token button selected, set a flag, and make on_radio_toggled consider that flag and call update_state if set.

? That seems good.

[Sebastien Bacher (seb128)]

> Since wait() blocks, interrupting that thread when the user selects the other radio button is a bit involved, as far as I know. But I'll investigate this option further.

right, that might be annoying, don't worry about it if we can go with the other option

> Do you mean something like: Once wait() returns,

> - If magic button selected, call update_state as we do now.
> - If token button selected, set a flag, and make on_radio_toggled consider that flag and call update_state if set.

> ? That seems good.

yes, something around those lines

[Sebastien Bacher (seb128)]

Thanks, seems easier and should do the job!

review: Approve

diff --git a/data/gtkbuilder/dialog-ua-attach.ui b/data/gtkbuilder/dialog-ua-attach.ui
index 6e255a8..1445b82 100644
--- a/data/gtkbuilder/dialog-ua-attach.ui
+++ b/data/gtkbuilder/dialog-ua-attach.ui
@@ -39,7 +39,6 @@
             <property name="margin-top">30</property>
             <property name="xalign">0</property>
             <property name="group">magic_radio</property>
-            <signal name="toggled" handler="on_radio_toggled" swapped="no"/>
             <signal name="clicked" handler="on_magic_radio_clicked" swapped="no"/>
           </object>
         </child>
diff --git a/softwareproperties/gtk/DialogUaAttach.py b/softwareproperties/gtk/DialogUaAttach.py
index 5de167c..d029e64 100644
--- a/softwareproperties/gtk/DialogUaAttach.py
+++ b/softwareproperties/gtk/DialogUaAttach.py
@@ -148,9 +148,11 @@ class DialogUaAttach:
         try:
             response = wait(options)
             self.contract_token = response.contract_token
-            GLib.idle_add(self.update_state, 'pin_validated')
+            if self.magic_radio.get_active():
+                GLib.idle_add(self.update_state, "pin_validated")
         except MagicAttachTokenError:
-            GLib.idle_add(self.update_state, 'expired')
+            if self.magic_radio.get_active():
+                GLib.idle_add(self.update_state, "expired")
         except Exception as e:
             print("Error getting the Ubuntu Pro token: ", e, flush = True)
         finally:
@@ -161,8 +163,6 @@ class DialogUaAttach:
         if self.poll != None or self.contract_token != None:
             return
 
-        self.contract_token = None
-
         # Request a magic attachment and parse relevants fields from response.
         #  userCode:  The pin the user has to type in <ubuntu.com/pro/attach>;
         #  token:     Identifies the request (used for polling for it).
@@ -177,7 +177,10 @@ class DialogUaAttach:
         self.poll = GLib.Thread.new("poll", self.poll_for_magic_token)
 
     def on_radio_toggled(self, button):
-        self.update_state()
+        if self.magic_radio.get_active() and self.contract_token:
+            self.update_state("pin_validated")
+        else:
+            self.update_state()
 
     def on_magic_radio_clicked(self, button):
         self.start_magic_attach()