Merge lp:~donadigo/appcenter/install-notify-canceled-new into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

Don't send notifications when installation is canceled

Fixes bug #1592291: "Application installed Notification even if you canceled".

This is a follow up to the old branch, it should fix the issue correctly now.

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2016-06-28 21:47:23 +0000
+++ src/Core/Client.vala	2016-07-01 22:03:31 +0000
@@ -107,7 +107,8 @@
         return null;
     }
 
-    public async void install_package (Package package, Pk.ProgressCallback cb, GLib.Cancellable cancellable) throws GLib.Error {
+    public async Pk.Exit install_package (Package package, Pk.ProgressCallback cb, GLib.Cancellable cancellable) throws GLib.Error {
+        Pk.Exit exit_status = Pk.Exit.UNKNOWN;
         AppCenter.Task install_task = request_task ();
         AppCenter.Task search_task = request_task ();
         string[] packages_ids = {};
@@ -125,7 +126,8 @@
             packages_ids += null;
 
             results = yield install_task.install_packages_async (packages_ids, cancellable, cb);
-            if (results.get_exit_code () != Pk.Exit.SUCCESS) {
+            exit_status = results.get_exit_code ();
+            if (exit_status != Pk.Exit.SUCCESS) {
                 release_task (search_task);
                 release_task (install_task);
                 throw new GLib.IOError.FAILED (Pk.Exit.enum_to_string (results.get_exit_code ()));
@@ -138,6 +140,7 @@
 
         release_task (search_task);
         release_task (install_task);
+        return exit_status;
     }
 
     public async void update_package (Package package, Pk.ProgressCallback cb, GLib.Cancellable cancellable) throws GLib.Error {
 
=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-06-29 21:40:17 +0000
+++ src/Core/Package.vala	2016-07-01 22:03:31 +0000
@@ -75,18 +75,15 @@
             var application = (Gtk.Application)Application.get_default ();
             var window = application.get_active_window ().get_window ();
 
-            yield AppCenterCore.Client.get_default ().install_package (this, (progress, type) => { 
-                if (type == Pk.ProgressType.STATUS && progress.status == Pk.Status.FINISHED && (window.get_state () & Gdk.WindowState.FOCUSED) == 0) {
-                    var notification = new Notification (_("Application installed"));
-                    notification.set_body (_("%s has been successfully installed").printf (get_name ()));
-                    notification.set_icon (new ThemedIcon ("system-software-install"));
-                    notification.set_default_action ("app.open-application");
-
-                    application.send_notification ("installed", notification);
-                }
-
-                change_information.ProgressCallback (progress, type);
-            }, action_cancellable);
+            var exit_status = yield AppCenterCore.Client.get_default ().install_package (this, (progress, type) => {change_information.ProgressCallback (progress, type);}, action_cancellable);
+            if (exit_status == Pk.Exit.SUCCESS && (window.get_state () & Gdk.WindowState.FOCUSED) == 0) {
+                var notification = new Notification (_("Application installed"));
+                notification.set_body (_("%s has been successfully installed").printf (get_name ()));
+                notification.set_icon (new ThemedIcon ("system-software-install"));
+                notification.set_default_action ("app.open-application");
+
+                application.send_notification ("installed", notification);
+            }
 
             installed_packages.add_all (change_information.changes);
             change_information.clear ();