Merge lp:~azzar1/update-manager/fix-lp-1807900 into lp:update-manager

[Andrea Azzarone]

Check if software-properties-livepatch.desktop is available to show (or not to show) the Livepatch settings button.

[Sebastien Bacher (seb128)]

The changes include some refactoring, you change the behaviour of the button in case livepatch is included in the label right (opening now on the livepatch tab while it was not doing it before) ? Is that described in the specification?

review: Needs Information

[Andrea Azzarone (azzar1)]

I asked mpt and that button should not open the Livepatch page. I'll update the MP ASAP.

[Brian Murray (brian-murray)]

Will somebody else be picking this up?

[Sebastien Bacher (seb128)]

Brian, yes, we will reassign to someone in desktop

[Sebastien Bacher (seb128)]

Resubmitted a simplified version now there
https://code.launchpad.net/~seb128/update-manager/livepatch-settings-installed/+merge/377294

[Sebastien Bacher (seb128)]

Resubmitted a simplified version now there
https://code.launchpad.net/~seb128/update-manager/livepatch-settings-installed/+merge/377294

Unmerged revisions

2851. By Andrea Azzarone on 2019-04-15

Check if software-properties-livepatch.desktop is available to show (or not to show) the Livepatch settings button.

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2019-04-08 17:00:30 +0000
+++ UpdateManager/Dialogs.py	2019-04-15 11:41:13 +0000
@@ -44,6 +44,7 @@
 from gettext import gettext as _
 from gettext import ngettext
 
+LIVEPATCH_DESKTOP_FILE = "software-properties-livepatch.desktop"
 
 class Dialog(object):
     def __init__(self, window_main):
@@ -129,9 +130,20 @@
         else:
             return None
 
+    def add_livepatch_settings_button(self):
+        if self._has_livepatch_settings_ui():
+            return self.add_button(_("Settings & Livepatch…"),
+                                   self.on_livepatch_settings_button_clicked,
+                                   secondary=True)
+        else:
+            return None
+
     def on_settings_button_clicked(self):
         self.window_main.show_settings()
 
+    def on_livepatch_settings_button_clicked(self):
+        self.window_main.show_livepatch_settings()
+
     def set_header(self, label):
         if label:
             self.label_header.set_markup(
@@ -153,18 +165,28 @@
         codename = get_dist()
         return di.is_lts(codename)
 
+    def _has_livepatch_settings_ui(self):
+        try:
+            return Gio.DesktopAppInfo.new(LIVEPATCH_DESKTOP_FILE)
+        except:
+            return None
+
     def on_livepatch_status_ready(self, active, cs, ps, fixes):
         self.set_desc(None)
 
         if not active:
             if self._is_livepatch_supported() and \
-               self.settings_button and \
+               self._has_livepatch_settings_ui() and \
                self.settings.get_int('launch-count') >= 4:
                 self.set_desc(_("<b>Tip:</b> You can use Livepatch to "
                                 "keep your computer more secure between "
                                 "restarts."))
-                self.settings_button.set_label(_("Settings & Livepatch…"))
+                self.add_livepatch_settings_button()
+            else:
+                self.add_settings_button()
             return
+        else:
+            self.add_settings_button()
 
         needs_reschedule = False
 
@@ -224,7 +246,6 @@
             self.set_header(_("No software updates are available."))
         else:
             self.set_header(_("The software on this computer is up to date."))
-        self.settings_button = self.add_settings_button()
         self.focus_button = self.add_button(Gtk.STOCK_OK,
                                             self.window_main.close)
         self.check_livepatch_status()

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2019-04-08 17:00:30 +0000
+++ UpdateManager/UpdateManager.py	2019-04-15 11:41:13 +0000
@@ -68,6 +68,7 @@
 
 # file that signals if we need to reboot
 REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
+LIVEPATCH_DESKTOP_FILE = "software-properties-livepatch.desktop"
 
 
 class UpdateManager(Gtk.Window):
@@ -210,6 +211,12 @@
         finally:
             self.start_available()
 
+    def show_livepatch_settings(self):
+        info = Gio.DesktopAppInfo.new(LIVEPATCH_DESKTOP_FILE)
+
+        if info is not None:
+            info.launch()
+
     def start_update(self):
         if self.options.no_update:
             self.start_available()