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

[Adam Bieńkowski]

Check if the action was canceled if yes, do not send the notification

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

Check if the action was canceled if yes, do not send the notification.

[Cody Garver (codygarver)]

I'm unable to review this because I can't get any installation to cancel, they just keep installing...

review: Abstain

[Danielle Foré (danrabbit)]

Following the steps from the bug report, I can still reproduce this issue. I didn't notice the first time around, but the report says to cancel *from the auth dialog*

review: Needs Fixing

[Danielle Foré (danrabbit)]

Can confirm this now addressed the issue :)

review: Approve

[Danielle Foré (danrabbit)]

Hm it looks like I get no installation notifications now though haha

[lp:~donadigo/appcenter/install-notify-canceled]

211. By Adam Bieńkowski on 2016-07-01

Actually fix the issue

Unmerged revisions

211. By Adam Bieńkowski on 2016-07-01

Actually fix the issue

210. By Adam Bieńkowski on 2016-06-30

Do not send notification when not installed

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2016-06-28 21:47:23 +0000
+++ src/Core/Client.vala	2016-07-01 21:55:42 +0000
@@ -97,6 +97,7 @@
         }
     }
 
+<<<<<<< TREE
     public AppStream.Component? get_extension (string extension) throws GLib.Error {
         try {
             return appstream_database.get_component_by_id (extension); 
@@ -108,6 +109,10 @@
     }
 
     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;
+>>>>>>> MERGE-SOURCE
         AppCenter.Task install_task = request_task ();
         AppCenter.Task search_task = request_task ();
         string[] packages_ids = {};
@@ -130,6 +135,8 @@
                 release_task (install_task);
                 throw new GLib.IOError.FAILED (Pk.Exit.enum_to_string (results.get_exit_code ()));
             }
+
+            exit_status = results.get_exit_code ();
         } catch (Error e) {
             release_task (search_task);
             release_task (install_task);
@@ -138,6 +145,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 21:55:42 +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 ();