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

[Nathan Teodosio]

Unmerged commits

2d4142e... by Nathan Teodosio on 2023-02-10

Make PIN validation wait to update UI until magic radio is selected.

https://launchpad.net/bugs/2006940

diff --git a/softwareproperties/gtk/DialogUaAttach.py b/softwareproperties/gtk/DialogUaAttach.py
index 5de167c..b6575ba 100644
--- a/softwareproperties/gtk/DialogUaAttach.py
+++ b/softwareproperties/gtk/DialogUaAttach.py
@@ -144,13 +144,18 @@ class DialogUaAttach:
         self.dialog.response(Gtk.ResponseType.CANCEL)
 
     def poll_for_magic_token(self):
+        def update_state_when_magic_radio_is_active(case):
+            while not self.magic_radio.get_active():
+                GLib.usleep(987987)
+            GLib.idle_add(self.update_state, case)
+
         options = MagicAttachWaitOptions(magic_token=self.req_id)
         try:
             response = wait(options)
             self.contract_token = response.contract_token
-            GLib.idle_add(self.update_state, 'pin_validated')
+            update_state_when_magic_radio_is_active('pin_validated')
         except MagicAttachTokenError:
-            GLib.idle_add(self.update_state, 'expired')
+            update_state_when_magic_radio_is_active('expired')
         except Exception as e:
             print("Error getting the Ubuntu Pro token: ", e, flush = True)
         finally: