Merge ~seb128/software-properties:ubuntu-pro-jammy into ~robert-ancell/software-properties:ubuntu-pro-jammy

[Sebastien Bacher]

Updated version include the work for Nathan on the magic attach workflow

[Sebastien Bacher (seb128)]

Uploaded also to https://launchpad.net/~ubuntu-desktop/+archive/ubuntu/ppa since you are on holidays and I don't have upload rights for the existing ppa

diff --git a/.gitignore b/.gitignore
index 6f5f004..d55034a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 debian/files
 tests/aptroot/
+__pycache__
+software_properties.egg-info
diff --git a/data/gtkbuilder/dialog-ua-attach.ui b/data/gtkbuilder/dialog-ua-attach.ui
index 3ae3b1b..b709fd6 100644
--- a/data/gtkbuilder/dialog-ua-attach.ui
+++ b/data/gtkbuilder/dialog-ua-attach.ui
@@ -1,119 +1,196 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk+" version="3.16"/>
   <object class="GtkDialog" id="dialog_ua_attach">
-    <property name="border_width">18</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">18</property>
     <property name="title" translatable="yes">Enable Ubuntu Pro</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">True</property>
+    <!-- interface-requires gtk+ 3.0 -->
     <child internal-child="vbox">
       <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="no-show-all">True</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">18</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="label" translatable="yes">To upgrade to Ubuntu Pro, use your existing free personal, or company Ubuntu One account, or provide a token. &lt;a href="https://ubuntu.com/login"&gt;Register a new account&lt;/a&gt;.</property>
+                <property name="use-markup">True</property>
+                <property name="wrap">True</property>
+                <property name="max-width-chars">130</property>
+              </object>
+            </child>
+        <child>
+          <object class="GtkRadioButton" id="magic_radio">
+            <property name="label" translatable="yes">Enter code on ubuntu.com/pro/attach</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <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>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">18</property>
+            <property name="can-focus">False</property>
+            <property name="orientation">horizontal</property>
             <child>
-              <object class="GtkLabel">
+              <object class="GtkBox" id="pin_label_box">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Enter your Ubuntu Pro token here.
-From &lt;a href="https://ubuntu.com/pro"&gt;ubuntu.com/pro&lt;/a&gt; or your system administrator</property>
-                <property name="use_markup">True</property>
-                <property name="xalign">0</property>
+                <property name="margin-left">20</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">8</property>
+                <property name="can-focus">False</property>
+                <child>
+                  <object class="GtkLabel" id="pin_label">
+                    <property name="label">      </property>
+                    <property name="visible">True</property>
+                    <property name="selectable">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin-left">6</property>
+                    <property name="margin-right">6</property>
+                    <property name="margin-top">4</property>
+                    <property name="margin-bottom">4</property>
+                    <attributes>
+                      <attribute name="scale" value="2"/>
+                    </attributes>
+                  </object>
+                </child>
               </object>
             </child>
             <child>
-              <object class="GtkGrid">
+              <object class="GtkFixed">
                 <property name="visible">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="valign">center</property>
+                <property name="margin">3</property>
+                <property name="margin-left">9</property>
                 <child>
-                  <object class="GtkLabel">
+                  <object class="GtkSpinner" id="pin_spinner">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Token:</property>
+                    <property name="valign">center</property>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkEntry" id="entry_token">
-                        <property name="visible">True</property>
-                        <property name="max-width-chars">30</property>
-                        <signal name="changed" handler="on_token_entry_changed"/>
-                        <signal name="activate" handler="on_token_entry_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSpinner" id="spinner">
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
+                  <object class="GtkImage" id="pin_status_icon">
+                    <property name="visible">False</property>
+                    <property name="valign">center</property>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
                 </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="pin_status">
+                <property name="margin">3</property>
+                <property name="visible">True</property>
+                <property name="valign">center</property>
+                <property name="use-markup">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="token_radio">
+            <property name="label" translatable="yes">Or add token manually</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="margin-top">6</property>
+            <property name="xalign">0</property>
+            <property name="group">magic_radio</property>
+            <signal name="toggled" handler="on_radio_toggled" swapped="no"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="no-show-all">True</property>
+            <child>
+              <object class="GtkEntry" id="token_field">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can-focus">True</property>
+                <property name="margin-left">20</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">12</property>
+                <property name="margin-right">4</property>
+                <property name="width-chars">35</property>
+                <property name="placeholder-text" translatable="yes">Token</property>
+                <property name="halign">start</property>
+                <signal name="activate" handler="on_token_entry_activate" swapped="no"/>
+                <signal name="changed" handler="on_token_typing" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkFixed">
+                <property name="visible">True</property>
+                <property name="valign">center</property>
+                <property name="margin">3</property>
                 <child>
-                  <object class="GtkLabel">
+                  <object class="GtkSpinner" id="token_spinner">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;a href="https://login.ubuntu.com"&gt;Don't have a token yet? Register&lt;/a&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="valign">center</property>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label_attach_error">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="foreground" value="red"/>
-                      <attribute name="scale" value="0.9"/>
-                    </attributes>
+                  <object class="GtkImage" id="token_status_icon">
+                    <property name="visible">False</property>
+                    <property name="valign">center</property>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkLabel" id="token_status">
+                <property name="margin">3</property>
+                <property name="visible">True</property>
+                <property name="valign">center</property>
+                <property name="use-markup">True</property>
+              </object>
+            </child>
           </object>
         </child>
-      </object>
-    </child>
-    <child internal-child="action_area">
-      <object class="GtkHButtonBox">
-        <property name="visible">True</property>
-        <property name="layout_style">end</property>
         <child>
-          <object class="GtkButton">
+          <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Cance_l</property>
-            <property name="use_underline">True</property>
-            <signal name="clicked" handler="on_cancel_clicked"/>
+            <property name="halign">start</property>
+            <property name="margin-left">20</property>
+            <property name="use-markup">True</property>
+            <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>
         <child>
-          <object class="GtkButton" id="button_attach">
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="label" translatable="yes">_Continue</property>
-            <property name="use_underline">True</property>
-            <signal name="clicked" handler="on_attach_clicked"/>
+            <property name="orientation">horizontal</property>
+            <property name="halign">end</property>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="visible">True</property>
+                <property name="margin-right">10</property>
+                <property name="label" translatable="yes">Cancel</property>
+                <signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="confirm">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Confirm</property>
+                <property name="sensitive">False</property>
+                <signal name="clicked" handler="on_confirm_clicked" swapped="no"/>
+              </object>
+            </child>
           </object>
         </child>
       </object>
diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui
index a78bfe2..f508a6c 100644
--- a/data/gtkbuilder/main.ui
+++ b/data/gtkbuilder/main.ui
@@ -1285,7 +1285,7 @@
                                       <object class="GtkLabel">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes">&lt;b&gt;This machine is not covered by an Ubuntu Pro subscription.&lt;/b&gt;
-Receive security updates for over 25,000 Ubuntu packages, on up to 3 machines free for personal use. &lt;a href="https://ubuntu.com/pro"&gt;Learn more&lt;/a&gt;.</property>
+Receive security updates for over 25,000 Ubuntu packages, free for up to 5 machines. &lt;a href="https://ubuntu.com/pro"&gt;Learn more&lt;/a&gt;.</property>
                                         <property name="use_markup">True</property>
                                         <property name="wrap">True</property>
                                         <property name="max-width-chars">90</property>
@@ -1376,7 +1376,6 @@ Receive security updates for over 25,000 Ubuntu packages, on up to 3 machines fr
                         <child>
                           <object class="GtkLabel" id="label_ua_esm_infra_error">
                             <property name="visible">False</property>
-                            <property name="label" translatable="yes">Could not enable ESM Infra. Please try again.</property>
                             <property name="valign">center</property>
                             <property name="xalign">0</property>
                             <attributes>
@@ -1414,7 +1413,6 @@ Receive security updates for over 25,000 Ubuntu packages, on up to 3 machines fr
                         <child>
                           <object class="GtkLabel" id="label_ua_esm_apps_error">
                             <property name="visible">False</property>
-                            <property name="label" translatable="yes">Could not enable ESM Apps. Please try again.</property>
                             <property name="xalign">0</property>
                             <attributes>
                               <attribute name="foreground" value="red"/>
@@ -1452,7 +1450,6 @@ Receive security updates for over 25,000 Ubuntu packages, on up to 3 machines fr
                         <child>
                           <object class="GtkLabel" id="label_ua_livepatch_error">
                             <property name="visible">False</property>
-                            <property name="label" translatable="yes">Could not enable Livepatch. Please try again.</property>
                             <property name="xalign">0</property>
                             <attributes>
                               <attribute name="foreground" value="red"/>
diff --git a/data/ubuntu-pro-logo-dark.svg b/data/ubuntu-pro-logo-dark.svg
new file mode 100644
index 0000000..49215a9
--- /dev/null
+++ b/data/ubuntu-pro-logo-dark.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="Layer_1"
+   data-name="Layer 1"
+   viewBox="0 0 1444.23 360.27"
+   version="1.1"
+   sodipodi:docname="ubuntu-pro-logo-dark.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview39"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.3155799"
+     inkscape:cx="722.49505"
+     inkscape:cy="179.76863"
+     inkscape:window-width="3072"
+     inkscape:window-height="1665"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#e95420;}.cls-2{fill:#fff;}.cls-3{fill:#111;}</style>
+  </defs>
+  <rect
+     class="cls-1"
+     width="233.93"
+     height="360.27"
+     id="rect6" />
+  <circle
+     class="cls-2"
+     cx="52.26"
+     cy="238.51"
+     r="24.44"
+     id="circle8" />
+  <circle
+     class="cls-2"
+     cx="154.06"
+     cy="184.91"
+     r="24.44"
+     id="circle10" />
+  <path
+     class="cls-2"
+     d="M107.39,301.42a59.52,59.52,0,0,1-40.6-31A35.22,35.22,0,0,1,45.89,273a80.08,80.08,0,0,0,74.65,49.8,35,35,0,0,1-7.16-20.44A60.26,60.26,0,0,1,107.39,301.42Z"
+     id="path12" />
+  <circle
+     class="cls-2"
+     cx="148.55"
+     cy="301.55"
+     r="24.44"
+     id="circle14" />
+  <path
+     class="cls-2"
+     d="M182.56,292.58a79.94,79.94,0,0,0,4-93.83,35.16,35.16,0,0,1-13.74,16.09,60,60,0,0,1-2,59.53A35,35,0,0,1,182.56,292.58Z"
+     id="path16" />
+  <path
+     class="cls-2"
+     d="M50.37,203.46c.62,0,1.24-.05,1.87-.05a35.36,35.36,0,0,1,7.37.78,35,35,0,0,1,11.16,4.5,59.63,59.63,0,0,1,48-25.68,36.52,36.52,0,0,1,.74-5.5,35.3,35.3,0,0,1,6.68-14.32A80.38,80.38,0,0,0,50.37,203.46Z"
+     id="path18" />
+  <path
+     class="cls-3"
+     d="M347.78,331.73q-16.27,0-27.71-5a47.72,47.72,0,0,1-18.52-13.68,54.81,54.81,0,0,1-10.26-20.41,95.22,95.22,0,0,1-3.19-25.12V164.73h16V265.45a75.46,75.46,0,0,0,3.19,23.23,44.78,44.78,0,0,0,8.84,16.16,34.55,34.55,0,0,0,13.68,9.44,54.06,54.06,0,0,0,35.86,0,34.55,34.55,0,0,0,13.68-9.44,44.78,44.78,0,0,0,8.84-16.16,75.46,75.46,0,0,0,3.19-23.23V164.73h16V267.57a95.22,95.22,0,0,1-3.19,25.12A54.81,54.81,0,0,1,394,313.1a47.76,47.76,0,0,1-18.51,13.68Q364.06,331.73,347.78,331.73Z"
+     id="path20"
+     style="fill:#ffffff" />
+  <path
+     class="cls-3"
+     d="M460.55,213.56q4-3.06,12.85-6.49a58,58,0,0,1,20.88-3.42,55.7,55.7,0,0,1,23.47,4.72,48.76,48.76,0,0,1,17.33,13.21,58.28,58.28,0,0,1,10.74,20.17,85.49,85.49,0,0,1,3.65,25.59A76.4,76.4,0,0,1,545.11,294,57.25,57.25,0,0,1,532.84,314,52.66,52.66,0,0,1,514,326.66,65.48,65.48,0,0,1,489.56,331q-16.28,0-26.89-2.12a137.63,137.63,0,0,1-17.45-4.48V148l15.33-2.83Zm0,100.25A68.84,68.84,0,0,0,471,316.05a127.35,127.35,0,0,0,18.28,1.06q19.81,0,31.85-12.86t12-36.91a84.07,84.07,0,0,0-2.13-19.23,44.87,44.87,0,0,0-6.84-15.8,34.25,34.25,0,0,0-12.38-10.73q-7.67-4-19-4a49.31,49.31,0,0,0-10.38,1.06,61.57,61.57,0,0,0-9.19,2.71,51,51,0,0,0-12.74,7.08Z"
+     id="path22"
+     style="fill:#ffffff" />
+  <path
+     class="cls-3"
+     d="M673.56,324q-6.84,1.89-18.4,4.24a144.38,144.38,0,0,1-28.3,2.36q-13.68,0-22.88-4a37.07,37.07,0,0,1-14.86-11.32A45.88,45.88,0,0,1,581,297.53a98.64,98.64,0,0,1-2.47-22.88v-68.4h15.33V269.7a108.25,108.25,0,0,0,1.88,21.93q1.89,9,6.14,14.51a23.86,23.86,0,0,0,11,8,47.64,47.64,0,0,0,16.39,2.48,132.49,132.49,0,0,0,18.87-1.18c5.34-.79,8.73-1.5,10.14-2.13V206.25h15.33Z"
+     id="path24"
+     style="fill:#ffffff" />
+  <path
+     class="cls-3"
+     d="M710.26,210.49q6.84-1.87,18.4-4.24a144.38,144.38,0,0,1,28.3-2.36q13.92,0,23.24,4a35.73,35.73,0,0,1,14.86,11.44,46.84,46.84,0,0,1,7.9,17.81A103.44,103.44,0,0,1,805.32,260v68.16H790V265A115.58,115.58,0,0,0,788.22,243a36.61,36.61,0,0,0-5.9-14.62,23,23,0,0,0-10.85-8.14q-6.72-2.47-16.87-2.47A128.49,128.49,0,0,0,735.85,219q-7.9,1.17-10.26,2.12V328.19H710.26Z"
+     id="path26"
+     style="fill:#ffffff" />
+  <path
+     class="cls-3"
+     d="M855.39,206.25H904v13H855.39v64.87A65.79,65.79,0,0,0,857.16,301a23.36,23.36,0,0,0,5.07,10,16,16,0,0,0,8,4.72,42.53,42.53,0,0,0,10.38,1.18q9.66,0,15.56-2.24a67,67,0,0,0,9.2-4.13l3.78,12.74q-3.31,2.13-11.56,4.83a57.11,57.11,0,0,1-17.93,2.72q-11.32,0-19-3a27.48,27.48,0,0,1-12.26-9,36.72,36.72,0,0,1-6.49-15,104.2,104.2,0,0,1-1.88-21.23V170.4l15.33-2.83Z"
+     id="path28"
+     style="fill:#ffffff" />
+  <path
+     class="cls-3"
+     d="M1023.33,324q-6.86,1.89-18.4,4.24a144.49,144.49,0,0,1-28.31,2.36q-13.68,0-22.88-4a37.14,37.14,0,0,1-14.86-11.32,45.87,45.87,0,0,1-8.13-17.69,98.62,98.62,0,0,1-2.48-22.88v-68.4H943.6V269.7a108.17,108.17,0,0,0,1.89,21.93q1.89,9,6.13,14.51a23.91,23.91,0,0,0,11,8A47.64,47.64,0,0,0,979,316.64a132.49,132.49,0,0,0,18.87-1.18q8-1.18,10.14-2.13V206.25h15.34Z"
+     id="path30"
+     style="fill:#ffffff" />
+  <path
+     class="cls-3"
+     d="M1156.68,163.32q34.68,0,51.66,13.21t17,37.5q0,13.92-5,23.71a40.35,40.35,0,0,1-14.15,15.8q-9.21,6-22.53,8.73a151.33,151.33,0,0,1-30.07,2.71h-22.17v63.21h-16V167.8a115.14,115.14,0,0,1,19.93-3.42Q1146.77,163.32,1156.68,163.32Zm.71,13.92q-9,0-15.21.59t-10.73,1.06v72.17h20.28a163.68,163.68,0,0,0,23.47-1.53,52.38,52.38,0,0,0,17.93-5.66,28.63,28.63,0,0,0,11.44-11.44q4-7.31,4-18.63,0-10.85-4.37-17.93a32.14,32.14,0,0,0-11.56-11.2,50.62,50.62,0,0,0-16.39-5.78A106.64,106.64,0,0,0,1157.39,177.24Z"
+     id="path32"
+     style="fill:#ffffff" />
+  <path
+     class="cls-3"
+     d="M1292.85,203.89a82.18,82.18,0,0,1,14.27,1.18,43.81,43.81,0,0,1,9.32,2.36l-3.07,13.21a34.1,34.1,0,0,0-7.66-2,87.42,87.42,0,0,0-15.22-1.06,71.62,71.62,0,0,0-15.92,1.42,44.62,44.62,0,0,0-7.9,2.35V328.19h-15.33V211.91a113,113,0,0,1,16.27-5.31Q1278,203.9,1292.85,203.89Z"
+     id="path34"
+     style="fill:#ffffff" />
+  <path
+     class="cls-3"
+     d="M1438.5,267.34a78.87,78.87,0,0,1-4.13,26.18,58.25,58.25,0,0,1-11.56,20.05,52.56,52.56,0,0,1-17.57,12.85,56.86,56.86,0,0,1-44.81,0,52.6,52.6,0,0,1-17.58-12.85,58.39,58.39,0,0,1-11.55-20.05,85,85,0,0,1,0-52.36A59.72,59.72,0,0,1,1342.85,221a51.86,51.86,0,0,1,17.58-13,56.86,56.86,0,0,1,44.81,0,51.82,51.82,0,0,1,17.57,13,59.57,59.57,0,0,1,11.56,20.17A78.87,78.87,0,0,1,1438.5,267.34Zm-16.28,0q0-22.87-10.61-36.44t-28.78-13.57q-18.16,0-28.77,13.57t-10.62,36.44q0,22.88,10.62,36.32t28.77,13.45q18.17,0,28.78-13.45T1422.22,267.34Z"
+     id="path36"
+     style="fill:#ffffff" />
+</svg>
diff --git a/debian/changelog b/debian/changelog
index d269e9c..958decb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-software-properties (0.99.22.3+ubuntupro5) jammy; urgency=medium
+software-properties (0.99.22.4+ubuntupro3) jammy; urgency=medium
 
-  * Show Ubuntu Pro settings.
+  * Show Ubuntu Pro settings, including magic attach, thanks Nathan!
 
  -- Robert Ancell <[e-mail]>  Thu, 29 Sep 2022 13:50:26 +1300
 
+software-properties (0.99.22.4) jammy; urgency=medium
+
+  * cloudarchive: Enable support for the Antelope Ubuntu Cloud Archive on
+    22.04 (LP: #1996067).
+
+ -- Corey Bryant <[e-mail]>  Wed, 09 Nov 2022 09:29:26 -0500
+
 software-properties (0.99.22.3) jammy; urgency=medium
 
   * Fix GPG keys are not shown in Software and Updates (LP: #1970449)
diff --git a/debian/control b/debian/control
index a3bace0..4b26817 100644
--- a/debian/control
+++ b/debian/control
@@ -84,6 +84,7 @@ Depends: gir1.2-goa-1.0 (>= 3.27.92-1ubuntu1),
          python3-gi,
          python3-software-properties (= ${binary:Version}),
          software-properties-common,
+         ubuntu-advantage-tools (>= 27.11~),
          ubuntu-advantage-desktop-daemon,
          ubuntu-drivers-common (>= 1:0.9.6),
          ${misc:Depends},
diff --git a/debian/software-properties-gtk.install b/debian/software-properties-gtk.install
index 35ded3e..be53144 100644
--- a/debian/software-properties-gtk.install
+++ b/debian/software-properties-gtk.install
@@ -10,3 +10,4 @@ debian/tmp/usr/share/metainfo/software-properties-gtk.appdata.xml
 debian/tmp/usr/share/mime/packages
 debian/tmp/usr/share/software-properties/gtkbuilder
 debian/tmp/usr/share/software-properties/ubuntu-pro-logo.svg
+debian/tmp/usr/share/software-properties/ubuntu-pro-logo-dark.svg
diff --git a/softwareproperties/cloudarchive.py b/softwareproperties/cloudarchive.py
index 7252470..9f523f3 100644
--- a/softwareproperties/cloudarchive.py
+++ b/softwareproperties/cloudarchive.py
@@ -56,6 +56,7 @@ RELEASE_MAP = {
     'xena': 'focal',
     'yoga': 'focal',
     'zed': 'jammy',
+    'antelope': 'jammy',
 }
 UCA = "Ubuntu Cloud Archive"
 WEB_LINK = 'https://wiki.ubuntu.com/OpenStack/CloudArchive'
diff --git a/softwareproperties/gtk/DialogUaAttach.py b/softwareproperties/gtk/DialogUaAttach.py
index 4649545..221def4 100644
--- a/softwareproperties/gtk/DialogUaAttach.py
+++ b/softwareproperties/gtk/DialogUaAttach.py
@@ -20,11 +20,11 @@ import os
 from gettext import gettext as _
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
-
-from softwareproperties.gtk.utils import (
-    setup_ui,
-)
+from gi.repository import Gtk,Gdk,GLib
+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
+from uaclient.exceptions import MagicAttachTokenError
 
 class DialogUaAttach:
     def __init__(self, parent, datadir, ua_object):
@@ -35,50 +35,146 @@ class DialogUaAttach:
         self.dialog = self.dialog_ua_attach
         self.dialog.set_transient_for(parent)
 
+        self.contract_token = None
         self.attaching = False
+        self.poll = None
+        self.pin_label_box.override_background_color(Gtk.StateType.NORMAL, Gdk.RGBA(0.5, 0.5, 0.5, 0.5))
+
+        self.start_magic_attach()
 
     def run(self):
         self.dialog.run()
         self.dialog.hide()
 
-    def update_state(self):
-        have_token = self.entry_token.get_text() != ''
-        self.button_attach.set_sensitive(have_token and not self.attaching)
-        self.entry_token.set_sensitive(not self.attaching)
+    def update_state(self, case = None):
+        """
+        fail   : called by the attachment callback, and it failed.
+        success: called by the attachment callback, and it succeeded.
+        expired: called by the token polling when the token expires.
+        """
+        if self.token_radio.get_active():
+            self.pin_label.set_opacity(0)
+            self.confirm.set_sensitive(self.token_field.get_text() != "" and
+                                       not self.attaching)
+            icon = self.token_status_icon
+            spinner = self.token_spinner
+            status = self.token_status
+        else:
+            self.pin_label.set_text(self.pin)
+            self.pin_label.set_opacity(1)
+            self.confirm.set_sensitive(self.contract_token != None and
+                                       not self.attaching)
+            icon = self.pin_status_icon
+            spinner = self.pin_spinner
+            status = self.pin_status
+
         if self.attaching:
-            self.spinner.start()
+            spinner.start()
         else:
-            self.spinner.stop()
+            spinner.stop()
+
+        def lock_radio_buttons(boolean):
+            self.token_radio.set_sensitive(not boolean)
+            self.magic_radio.set_sensitive(not boolean)
+
+        lock_radio_buttons(self.attaching)
+        self.token_field.set_sensitive(not self.attaching
+                                       and self.token_radio.get_active())
+
+        if (case == "fail"):
+            status.set_markup('<span foreground="red">%s</span>' % _('Invalid token'))
+            icon.set_from_icon_name('emblem-unreadable', 1)
+        elif (case == "success"):
+            self.finish()
+        elif (case == "pin_validated"):
+            status.set_markup('<span foreground="green">%s</span>' % _('Valid token'))
+            icon.set_from_icon_name('emblem-default', 1)
+            lock_radio_buttons(True)
+        elif (case == "expired"):
+            status.set_markup(_('Code expired'))
+            icon.set_from_icon_name('gtk-dialog-warning', 1)
+
+        #Only show icons/status if case is set
+        self.token_status_icon.set_visible(False)
+        self.token_status.set_visible(False)
+        self.pin_status_icon.set_visible(False)
+        self.pin_status.set_visible(False)
+        icon.set_visible(case)
+        status.set_visible(case)
 
     def attach(self):
         if self.attaching:
             return
 
-        token = self.entry_token.get_text()
-        if token == '':
-            return
+        if self.token_radio.get_active():
+            token = self.token_field.get_text()
+        else:
+            token = self.contract_token
 
         self.attaching = True
-        self.label_attach_error.set_text('')
         def on_reply():
-            self.dialog.response(Gtk.ResponseType.OK)
+            self.attaching = False
+            self.update_state("success")
         def on_error(error):
-            # FIXME
-            print(error)
-            self.label_attach_error.set_text(_('Failed to attach. Please try again'))
             self.attaching = False
-            self.update_state()
+            if self.magic_radio.get_active():
+                self.contract_token = None
+            self.update_state("fail")
         self.ua_object.Attach(token, reply_handler=on_reply, error_handler=on_error, dbus_interface='com.canonical.UbuntuAdvantage.Manager', timeout=600)
         self.update_state()
 
-    def on_token_entry_changed(self, entry):
-        self.update_state()
+    def on_token_typing(self, entry):
+        self.confirm.set_sensitive(self.token_field.get_text() != '')
 
     def on_token_entry_activate(self, entry):
-        self.attach()
+        token = self.token_field.get_text()
+        if token != '':
+            self.attach()
 
-    def on_attach_clicked(self, button):
+    def on_confirm_clicked(self, button):
         self.attach()
 
     def on_cancel_clicked(self, button):
+        if self.poll:
+            GLib.Thread.unref(self.poll)
         self.dialog.response(Gtk.ResponseType.CANCEL)
+
+    def poll_for_magic_token(self):
+        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')
+        except MagicAttachTokenError:
+            GLib.idle_add(self.update_state, 'expired')
+        finally:
+            self.poll = None
+
+    def start_magic_attach(self):
+        # Already polling, don't bother the server with a new request.
+        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).
+        try:
+            response = initiate()
+            self.pin = response.user_code
+            self.req_id = response.token
+        except Exception as e:
+            print(e)
+            return
+        self.update_state()
+        self.poll = GLib.Thread.new("poll", self.poll_for_magic_token)
+
+    def on_radio_toggled(self, button):
+        self.update_state()
+
+    def on_magic_radio_clicked(self, button):
+        self.start_magic_attach()
+
+    def finish(self):
+        self.dialog.response(Gtk.ResponseType.OK)
diff --git a/softwareproperties/gtk/UbuntuProPage.py b/softwareproperties/gtk/UbuntuProPage.py
index 1e10c0a..3339297 100644
--- a/softwareproperties/gtk/UbuntuProPage.py
+++ b/softwareproperties/gtk/UbuntuProPage.py
@@ -22,7 +22,7 @@ from gettext import gettext as _
 import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import GdkPixbuf, Gio, Gtk
-from softwareproperties.gtk.utils import current_distro
+from softwareproperties.gtk.utils import current_distro, is_dark_theme
 
 from .DialogUaAttach import DialogUaAttach
 from .DialogUaDetach import DialogUaDetach
@@ -50,13 +50,25 @@ class UbuntuProPage(object):
         self.switch_ua_esm_infra = parent.switch_ua_esm_infra
         self.label_ua_esm_infra = parent.label_ua_esm_infra
         self.label_ua_esm_infra_error = parent.label_ua_esm_infra_error
+        self.label_ua_esm_infra_error_messages = {
+            "enable": _("Could not enable ESM Infra. Please try again."),
+            "disable": _("Could not disable ESM Infra. Please try again."),
+        }
         self.switch_ua_esm_apps = parent.switch_ua_esm_apps
         self.label_ua_esm_apps = parent.label_ua_esm_apps
         self.label_ua_esm_apps_error = parent.label_ua_esm_apps_error
+        self.label_ua_esm_apps_error_messages = {
+            "enable": _("Could not enable ESM Apps. Please try again."),
+            "disable": _("Could not disable ESM Apps. Please try again."),
+        }
         self.switch_ua_livepatch = parent.switch_ua_livepatch
         self.checkbutton_livepatch_topbar = parent.checkbutton_livepatch_topbar
         self.label_ua_livepatch = parent.label_ua_livepatch
         self.label_ua_livepatch_error = parent.label_ua_livepatch_error
+        self.label_ua_livepatch_error_messages = {
+            "enable": _("Could not enable Livepatch. Please try again."),
+            "disable": _("Could not disable Livepatch. Please try again."),
+        }
         self.button_ua_fips = parent.button_ua_fips
         self.label_ua_fips_status = parent.label_ua_fips_status
         self.label_ua_fips_description = parent.label_ua_fips_description
@@ -65,7 +77,10 @@ class UbuntuProPage(object):
         self.label_ua_usg_status = parent.label_ua_usg_status
         self.label_ua_usg_description = parent.label_ua_usg_description
 
-        ubuntu_pro_logo = GdkPixbuf.Pixbuf.new_from_file_at_scale(os.path.join(parent.datadir, 'ubuntu-pro-logo.svg'), -1, 50, True)
+        if is_dark_theme(self.stack_ua_attach):
+            ubuntu_pro_logo = GdkPixbuf.Pixbuf.new_from_file_at_scale(os.path.join(parent.datadir, 'ubuntu-pro-logo-dark.svg'), -1, 50, True)
+        else:
+            ubuntu_pro_logo = GdkPixbuf.Pixbuf.new_from_file_at_scale(os.path.join(parent.datadir, 'ubuntu-pro-logo.svg'), -1, 50, True)
         parent.image_ubuntu_pro_logo.set_from_pixbuf(ubuntu_pro_logo)
 
         parent.button_ua_attach.connect('clicked', self.on_button_ua_attach_clicked)
@@ -207,7 +222,7 @@ class UbuntuProPage(object):
         dialog = DialogUaDetach(self._parent.window_main, self._parent.datadir, self.ua_object)
         dialog.run()
 
-    def set_service_enabled(self, service_name, enabled, error_label):
+    def set_service_enabled(self, service_name, enabled, error_label, error_label_messages):
         if error_label is not None:
             error_label.set_visible(False)
         service = self.get_service(service_name)
@@ -217,11 +232,13 @@ class UbuntuProPage(object):
             service.request_in_progress = False
             self.update_status()
         def on_error(error):
-            # FIXME
             print(error)
             if error_label is not None:
                 error_label.set_visible(True)
-                error_label.label = error
+                if enabled:
+                    error_label.set_label(error_label_messages["enable"])
+                else:
+                    error_label.set_label(error_label_messages["disable"])
             service.request_in_progress = False
             self.update_status()
         if enabled:
@@ -232,13 +249,13 @@ class UbuntuProPage(object):
         self.update_status()
 
     def on_ua_esm_infra_changed(self, switch, param):
-        self.set_service_enabled('esm-infra', self.switch_ua_esm_infra.get_active(), self.label_ua_esm_infra_error)
+        self.set_service_enabled('esm-infra', self.switch_ua_esm_infra.get_active(), self.label_ua_esm_infra_error, self.label_ua_esm_infra_error_messages)
 
     def on_ua_esm_apps_changed(self, switch, param):
-        self.set_service_enabled('esm-apps', self.switch_ua_esm_apps.get_active(), self.label_ua_esm_apps_error)
+        self.set_service_enabled('esm-apps', self.switch_ua_esm_apps.get_active(), self.label_ua_esm_apps_error, self.label_ua_esm_apps_error_messages)
 
     def on_ua_livepatch_changed(self, switch, param):
-        self.set_service_enabled('livepatch', self.switch_ua_livepatch.get_active(), self.label_ua_livepatch_error)
+        self.set_service_enabled('livepatch', self.switch_ua_livepatch.get_active(), self.label_ua_livepatch_error, self.label_ua_livepatch_error_messages)
 
     def on_checkbutton_livepatch_topbar_toggled(self, button):
         self.update_notifier_settings.handler_block(self.on_update_notifier_settings_changed_handler)
@@ -268,12 +285,12 @@ class UbuntuProPage(object):
         if result != Gtk.ResponseType.OK:
             return
 
-        self.set_service_enabled(service_name, True, None)
+        self.set_service_enabled(service_name, True, None, None)
 
     def on_button_ua_usg_clicked(self, button):
         service = self.get_service('usg')
         is_enabled = service is not None and service.status == 'enabled'
-        self.set_service_enabled('usg', not is_enabled, None)
+        self.set_service_enabled('usg', not is_enabled, None, None)
 
     def on_compliance_and_hardening_expand_changed(self, widget, param):
         self._parent.window_main.resize(1, 1)
diff --git a/softwareproperties/gtk/utils.py b/softwareproperties/gtk/utils.py
index 522faa0..e6eaff6 100644
--- a/softwareproperties/gtk/utils.py
+++ b/softwareproperties/gtk/utils.py
@@ -24,7 +24,7 @@ import distro_info
 from functools import wraps
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gio, Gtk
+from gi.repository import Gio, Gtk, GLib
 import json
 import os
 import subprocess
@@ -180,3 +180,14 @@ def retry(exceptions, tries=10, delay=0.1, backoff=2):
         return f_retry  # true decorator
 
     return deco_retry
+
+def is_dark_theme(widget):
+    env_gtk_theme = GLib.getenv("GTK_THEME")
+    if env_gtk_theme != None:
+        return GLib.str_has_suffix(env_gtk_theme, "dark")
+    screen = Gtk.Widget.get_screen(widget)
+    settings = Gtk.Settings.get_for_screen(screen)
+    theme_name = settings.get_property("gtk-theme-name")
+    if theme_name != None:
+        return GLib.str_has_suffix(theme_name, "dark")
+    return False