Merge lp:~donadigo/wingpanel-indicator-notifications/close-notification-support into lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications

[Adam Bieńkowski]

* Add CloseNotification support.

This branch adds CloseNotification call support so apps can withdraw the notifications and they will get removed from the indicator.

Unmerged revisions

98. By Adam Bieńkowski on 2016-06-20

Added close notification support

97. By Adam Bieńkowski on 2016-06-20

Clicking a notification now opens / focuses the app; general code improvements

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-05-27 15:10:53 +0000
+++ src/CMakeLists.txt	2016-10-10 16:00:06 +0000
@@ -20,7 +20,7 @@
   Widgets/NotificationEntry.vala
   Widgets/AppEntry.vala
   Widgets/SeparatorEntry.vala
-  Services/NotificationsMonitor.vala
+  Services/NotificationMonitor.vala
   Services/Notification.vala
   Services/NotifySettings.vala
   Services/Session.vala

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-08-03 06:28:36 +0000
+++ src/Indicator.vala	2016-10-10 16:00:06 +0000
@@ -103,6 +103,7 @@
             nlist.close_popover.connect (() => close ());
             nlist.switch_stack.connect (on_switch_stack);
             NotificationMonitor.get_instance ().received.connect (on_notification_received);
+            NotificationMonitor.get_instance ().close_notification.connect (on_notification_closed);
 
             NotifySettings.get_instance ().changed[NotifySettings.DO_NOT_DISTURB_KEY].connect (() => {
                 not_disturb_switch.get_switch ().active = NotifySettings.get_instance ().do_not_disturb;
@@ -160,6 +161,15 @@
         dynamic_icon.set_main_icon_name (get_display_icon_name ());        
     }
 
+    private void on_notification_closed (uint32 id) {
+        foreach (var item in nlist.items) {
+            if (item.notification.id == id) {
+                item.notification.close ();
+                return;
+            }
+        }
+    }
+
     private void on_switch_stack (bool show_list) {
         clear_all_btn.sensitive = show_list;
         if (show_list) {
@@ -181,7 +191,11 @@
     private string get_display_icon_name () {
         if (NotifySettings.get_instance ().do_not_disturb) {
             return "notification-disabled-symbolic";
+<<<<<<< TREE
         } else if (nlist != null && nlist.get_entries_length () > 0) {
+=======
+        } else if (nlist != null && nlist.items.length () > 0) {
+>>>>>>> MERGE-SOURCE
             return "notification-new-symbolic";
         }
         

=== modified file 'src/Services/Notification.vala'
--- src/Services/Notification.vala	2016-08-03 06:28:36 +0000
+++ src/Services/Notification.vala	2016-10-10 16:00:06 +0000
@@ -37,6 +37,7 @@
     public string desktop_id;
     public AppInfo? app_info = null;
 
+    public signal void closed ();
     public signal bool time_changed (TimeSpan span);
 
     private enum Column {
@@ -126,6 +127,7 @@
     }
 
     public bool get_is_valid () {
+<<<<<<< TREE
         return app_info != null && hints.lookup_value (X_CANONICAL_PRIVATE_KEY, null) == null;
     }
 
@@ -150,6 +152,32 @@
         }
 
         return window;        
+=======
+        return app_name in OTHER_WHITELIST || appinfo != null;
+    }
+
+    public bool run_default_action () {
+        if (DEFAULT_ACTION in actions) {
+            INotifications? notifications_iface = NotificationMonitor.get_notifications_iface ();
+            if (notifications_iface != null) {
+                notifications_iface.action_invoked (DEFAULT_ACTION, id);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public void close () {
+        closed ();
+    }
+
+    private void set_properties () {
+        if (app_name in OTHER_WHITELIST) {
+            display_name = _("Other");
+            app_icon = "dialog-information";            
+        }
+>>>>>>> MERGE-SOURCE
     }
 
     private void setup_pid () {
@@ -167,7 +195,7 @@
         }
 
         try {
-            IDBus? dbus_iface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.DBus", "/");
+            IDBus? dbus_iface = NotificationMonitor.get_dbus_iface ();
             if (dbus_iface != null && dbus_iface.name_has_owner (sender)) {
                 pid = dbus_iface.get_connection_unix_process_id (sender);
             }

=== renamed file 'src/Services/NotificationsMonitor.vala' => 'src/Services/NotificationMonitor.vala'
--- src/Services/NotificationsMonitor.vala	2016-06-20 12:40:25 +0000
+++ src/Services/NotificationMonitor.vala	2016-10-10 16:00:06 +0000
@@ -23,17 +23,20 @@
 public class NotificationMonitor : Object {
     private const string NOTIFY_IFACE = "org.freedesktop.Notifications";
     private const string NOTIFY_PATH = "/org/freedesktop/Notifications";
-    private const string MATCH_STRING = "eavesdrop='true',type='method_call',interface='org.freedesktop.Notifications',member='Notify'";
+    private const string DBUS_IFACE = "org.freedesktop.DBus";
+    private const string DBUS_PATH = "/";
+    private const string MATCH_STRING = "eavesdrop='true',type='method_call',interface='org.freedesktop.Notifications'";
     private const uint32 REASON_DISMISSED = 2;
 
     private static NotificationMonitor? instance = null;
+    private static INotifications? notifications_iface = null;
+    private static IDBus? dbus_iface = null;
 
     private DBusConnection connection;
-    public INotifications? notifications_iface = null;
-    public IDBus? dbus_iface = null;
     private uint32 id_counter = 0;
 
     public signal void received (DBusMessage message, uint32 id);
+    public signal void close_notification (uint32 id);
 
     public static NotificationMonitor get_instance () {
         if (instance == null) {
@@ -43,6 +46,30 @@
         return instance;
     }
 
+    public static INotifications? get_notifications_iface () {
+        if (notifications_iface == null) {
+            try {
+                notifications_iface = Bus.get_proxy_sync (BusType.SESSION, NOTIFY_IFACE, NOTIFY_PATH); 
+            } catch (Error e) {
+                warning ("%s\n", e.message);
+            }
+        }
+        
+        return notifications_iface;
+    }
+
+    public static IDBus? get_dbus_iface () {
+        if (dbus_iface == null) {
+            try {
+                dbus_iface = Bus.get_proxy_sync (BusType.SESSION, DBUS_IFACE, DBUS_PATH);
+            } catch (Error e) {
+                warning ("%s\n", e.message);
+            }            
+        }
+
+        return dbus_iface;
+    }
+
     private NotificationMonitor () {
         try {
             connection = Bus.get_sync (BusType.SESSION);
@@ -61,12 +88,6 @@
         var body = new Variant.parsed ("(%s,)", MATCH_STRING);
         message.set_body (body);
         
-        try {
-            notifications_iface = Bus.get_proxy_sync (BusType.SESSION, NOTIFY_IFACE, NOTIFY_PATH); 
-        } catch (Error e) {
-            error ("%s\n", e.message);
-        }
-
         id_counter = get_current_notification_id ();
         try {
             connection.send_message (message, DBusSendMessageFlags.NONE, null);
@@ -78,24 +99,33 @@
     }
 
     private DBusMessage message_filter (DBusConnection con, owned DBusMessage message, bool incoming) {
-        if (incoming) {
-            if ((message.get_message_type () == DBusMessageType.METHOD_CALL) &&
-                (message.get_interface () == NOTIFY_IFACE) &&
-                (message.get_member () == "Notify")) {
-                uint32 replaces_id = message.get_body ().get_child_value (1).get_uint32 ();
-                uint32 current_id = replaces_id; 
-
-                if (replaces_id == 0) {
-                    id_counter++;
-                    current_id = id_counter;
+        if (incoming) { 
+            if (message.get_message_type () == DBusMessageType.METHOD_CALL &&
+                message.get_interface () == NOTIFY_IFACE) {
+                if (message.get_member () == "Notify") {
+                    uint32 replaces_id = message.get_body ().get_child_value (1).get_uint32 ();
+                    uint32 current_id = replaces_id; 
+
+                    if (replaces_id == 0) {
+                        id_counter++;
+                        current_id = id_counter;
+                    }
+
+                    Idle.add (() => {
+                        received (message, current_id);
+                        message = null;
+                        return false;
+                    });
+                } else if (message.get_member () == "CloseNotification") {
+                    uint32 id = message.get_body ().get_child_value (0).get_uint32 ();
+
+                    Idle.add (() => {
+                        close_notification (id);
+                        message = null;
+                        return false;
+                    });
                 }
 
-                Idle.add (() => {
-                    this.received (message, current_id);
-                    message = null;
-                    return false;
-                });
-
                 return null;
             }
         }
@@ -109,7 +139,7 @@
         hints.insert ("suppress-sound", new Variant.boolean (true));
         string[] actions = {};
         try {
-            return notifications_iface.notify ("", 0, "", "", "", actions, hints, 1);
+            return get_notifications_iface ().notify ("", 0, "", "", "", actions, hints, 1);
         } catch (Error e) {
             error ("%s\n", e.message);
         }

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-07-20 20:11:51 +0000
+++ src/Widgets/AppEntry.vala	2016-10-10 16:00:06 +0000
@@ -66,8 +66,22 @@
             return null;
         }
 
+<<<<<<< TREE
         var entry = app_notifications.first ().data;
         return entry.notification.get_app_window ();
+=======
+    public void update_app_window () {
+        if (app_notifications.length () == 0) {
+            return;
+        }
+
+        var notification_entry = app_notifications.nth_data (0);
+        app_window = notification_entry.get_app_window ();
+    }
+
+    public unowned List<NotificationEntry> get_notifications () {
+        return app_notifications;
+>>>>>>> MERGE-SOURCE
     }
 
     public void add_notification_entry (NotificationEntry entry) {

=== modified file 'src/Widgets/NotificationEntry.vala'
--- src/Widgets/NotificationEntry.vala	2016-07-20 20:36:57 +0000
+++ src/Widgets/NotificationEntry.vala	2016-10-10 16:00:06 +0000
@@ -53,8 +53,35 @@
             return active;
         });
 
+        notification.closed.connect (() => {
+            clear ();
+        });
+
         hexpand = true;
+<<<<<<< TREE
         
+=======
+        add_widgets ();
+
+        if (notification.data_session) {
+            notification.time_changed (notification.timestamp.difference (new DateTime.now_local ()));
+        }
+    }
+
+    public Wnck.Window? get_app_window () {
+        Wnck.Window? window = null;
+        Wnck.Screen.get_default ().get_windows ().@foreach ((_window) => {
+            if (_window.get_pid () == notification.pid) {
+                window = _window;
+                return;
+            }
+        });
+
+        return window;        
+    }
+
+    private void add_widgets () {
+>>>>>>> MERGE-SOURCE
         var grid = new Gtk.Grid ();
         grid.margin_start = 40;
         grid.margin_end = 6;

=== modified file 'src/Widgets/NotificationsList.vala'
--- src/Widgets/NotificationsList.vala	2016-07-21 12:52:41 +0000
+++ src/Widgets/NotificationsList.vala	2016-10-10 16:00:06 +0000
@@ -18,7 +18,11 @@
 public class NotificationsList : Gtk.ListBox {
     public signal void switch_stack (bool show_list);
     public signal void close_popover ();
+<<<<<<< TREE
 
+=======
+    public List<NotificationEntry> items;
+>>>>>>> MERGE-SOURCE
     private List<AppEntry> app_entries;
     private HashTable<string, int> table;
     private int counter = 0;
@@ -47,9 +51,24 @@
 
         switch_stack (true);
 
+<<<<<<< TREE
         app_entry.clear.connect (clear_app_entry);
 
         counter += 2;
+=======
+        app_entry.add_notification_entry (entry);
+        resort_app_entry (app_entry);
+
+        entry.clear.connect (() => {
+            destroy_notification_entry.begin (entry);
+        });
+
+        app_entry.destroy_entry.connect (() => {
+            destroy_app_entry (app_entry);
+        });
+
+        counter += 2;
+>>>>>>> MERGE-SOURCE
 
         Session.get_instance ().add_notification (entry.notification);
 
@@ -57,11 +76,14 @@
         show_all ();
     }
 
+<<<<<<< TREE
 
     public uint get_entries_length () {
         return app_entries.length ();
     }
 
+=======
+>>>>>>> MERGE-SOURCE
     public void clear_all () {
         app_entries.foreach ((app_entry) => {
             app_entry.clear ();
@@ -109,15 +131,30 @@
         AppEntry? app_entry = null;
         bool add = !(entry.notification.desktop_id in construct_desktop_id_list ());
         if (add) {
+<<<<<<< TREE
             app_entry = new AppEntry (entry);
+=======
+            var window = entry.get_app_window ();
+            app_entry = new AppEntry (entry, window);
+
+            screen.active_window_changed.connect (() => {
+                if (screen.get_active_window () == app_entry.app_window) {
+                    app_entry.clear_btn_entry.clicked ();
+                }
+            });
+>>>>>>> MERGE-SOURCE
 
             app_entries.append (app_entry);
             prepend (app_entry);
             insert (entry, 1);
             table.insert (app_entry.app_info.get_id (), 0);
         } else {
+<<<<<<< TREE
             app_entry = get_app_entry_from_desktop_id (entry.notification.desktop_id);
 
+=======
+            app_entry = get_from_app_name (entry.notification.app_name);
+>>>>>>> MERGE-SOURCE
             if (app_entry != null) {
                 resort_app_entry (app_entry);
                 app_entry.add_notification_entry (entry);
@@ -130,6 +167,7 @@
         return app_entry;
     }
 
+<<<<<<< TREE
     private void monitor_active_window () {
         var screen = Wnck.Screen.get_default ();
         screen.active_window_changed.connect (() => {
@@ -142,6 +180,22 @@
     }
 
     private void clear_app_entry (AppEntry app_entry) {
+=======
+    private async void destroy_notification_entry (NotificationEntry entry) {
+        entry.destroy ();
+        items.remove (entry);
+        entry.active = false;
+
+        Session.get_instance ().remove_notification (entry.notification);
+        if (items.length () == 0) {
+            clear_all ();
+        }
+
+        update_separators ();
+    }
+
+    private void destroy_app_entry (AppEntry app_entry) {
+>>>>>>> MERGE-SOURCE
         app_entries.remove (app_entry);
 
         app_entry.app_notifications.foreach ((notification_entry) => {
@@ -154,6 +208,7 @@
         if (get_entries_length () == 0) {
             clear_all ();
         }
+<<<<<<< TREE
     }
 
     private AppEntry? get_app_entry_from_desktop_id (string desktop_id) {
@@ -161,6 +216,31 @@
         app_entries.foreach ((_app_entry) => {
             if (_app_entry.app_info.get_id () == desktop_id && app_entry == null) {
                 app_entry = _app_entry;
+=======
+
+        update_separators ();
+    }
+
+    private void resort_app_entry (AppEntry app_entry) {
+        if (get_row_at_index (0) != app_entry) {
+            remove (app_entry);
+            prepend (app_entry);
+            int counter = 1;
+            app_entry.get_notifications ().@foreach ((notification_entry) => {
+                remove (notification_entry);
+                add_item (notification_entry);
+                counter++;
+            });
+        }
+    }
+
+    private AppEntry? get_from_app_name (string app_name) {
+        AppEntry? entry = null;
+        app_entries.@foreach ((_entry) => {
+            if (_entry.app_name == app_name) {
+                entry = _entry;
+                return;
+>>>>>>> MERGE-SOURCE
             }
         });
 
@@ -177,6 +257,7 @@
     }
 
     private void on_row_activated (Gtk.ListBoxRow row) {
+<<<<<<< TREE
         bool close = true;
 
         if (row is AppEntry) {
@@ -200,10 +281,34 @@
 
         if (close) {
             close_popover ();
+=======
+        if (row is AppEntry) {
+            var app_entry = (AppEntry)row;
+            if (app_entry.app_window == null) {
+                app_entry.update_app_window ();
+            }
+
+            focus_notification_app (app_entry.app_window,
+                                    app_entry.appinfo);
+
+            app_entry.clear_btn_entry.clicked ();
+            close_popover ();
+        } else if (row is NotificationEntry) {
+            var notification_entry = (NotificationEntry)row;
+            if (!notification_entry.notification.run_default_action ()) {
+                focus_notification_app (notification_entry.get_app_window (),
+                                        notification_entry.notification.appinfo);
+            }
+            
+            notification_entry.clear ();
+            notification_entry.active = false;
+            close_popover ();            
+>>>>>>> MERGE-SOURCE
         }
 
         update_separators ();
     }
+<<<<<<< TREE
 
     private bool focus_notification_app (Wnck.Window? app_window, AppInfo? app_info) {
         if (app_window != null) {
@@ -220,4 +325,18 @@
 
         return false;
     }
+=======
+
+    private void focus_notification_app (Wnck.Window? app_window, AppInfo? appinfo) {
+        if (app_window != null) {
+            app_window.unminimize (Gtk.get_current_event_time ());
+        } else if (appinfo != null) {
+            try {
+                appinfo.launch (null, null);
+            } catch (Error e) {
+                warning ("%s\n", e.message);
+            }
+        }
+    }
+>>>>>>> MERGE-SOURCE
 }