Merge lp:~azzar1/software-properties/fix-1768797 into lp:software-properties

[Andrea Azzarone]

Allow the user to disable livepatch if the gnome-online-account expired.

[lp:~azzar1/software-properties/fix-1768797]

1042. By Andrea Azzarone on 2018-06-25

Allow the user to disable livepatch if the gnome-online-account expired.

[Brian Murray (brian-murray)]

review: Approve

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2018-05-02 14:08:37 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2018-06-25 14:56:23 +0000
@@ -1530,13 +1530,21 @@
                 text = "<span color='red'>" +  text + "</span>"
                 self.label_livepatch_login.set_markup(text)
         else:
-            self.checkbutton_livepatch.set_sensitive(False)
+            if self.is_livepatch_enabled() and not self.waiting_livepatch_response:
+                # Allow the user to disable livepatch even if
+                # the account expired (see LP: #1768797)
+                self.checkbutton_livepatch.set_sensitive(True)
+                self.label_livepatch_login.set_label(_('Livepatch is active.'))
+            else:
+                self.checkbutton_livepatch.set_sensitive(False)
+                self.label_livepatch_login.set_label(_('To use Livepatch you need to sign in.'))
+
             self.button_ubuntuone.set_label(_('Sign In…'))
-            self.label_livepatch_login.set_label(_('To use Livepatch you need to sign in.'))
 
     def on_livepatch_status_changed(self, file_monitor, file, other_file, event_type):
         if not self.waiting_livepatch_response:
             self.checkbutton_livepatch.set_active(self.is_livepatch_enabled())
+            self.on_goa_auth_changed()
 
     def on_button_ubuntuone_clicked(self, button):
         if self.goa_auth.logged:
@@ -1561,8 +1569,8 @@
                     self.checkbutton_livepatch.set_active(True)
 
     def do_logout(self):
+        self.checkbutton_livepatch.set_active(False)
         self.goa_auth.logout()
-        self.checkbutton_livepatch.set_active(False)
 
     def on_checkbutton_livepatch_toggled(self, checkbutton):
         if self.waiting_livepatch_response:
@@ -1622,5 +1630,7 @@
                                                  error_handler=self.livepatch_enabled_error_handler,
                                                  timeout=LIVEPATCH_TIMEOUT)
 
+        self.on_goa_auth_changed()
+
         if self.quit_when_livepatch_responds:
             self.on_close_button(self.button_close)