Use GNotification instead of libnotify

1 files changed, 68 insertions, 48 deletions

diff --git a/main/src/ui/notifications.vala b/main/src/ui/notifications.vala
index 470f9d6d..313d0854 100644
--- a/main/src/ui/notifications.vala
+++ b/main/src/ui/notifications.vala
@@ -11,7 +11,8 @@ public class Notifications : Object {
 
     private StreamInteractor stream_interactor;
     private Gtk.Window window;
-    private HashMap<Conversation, Notify.Notification> notifications = new HashMap<Conversation, Notify.Notification>(Conversation.hash_func, Conversation.equals_func);
+    private HashMap<Conversation, Notification> notifications = new HashMap<Conversation, Notification>(Conversation.hash_func, Conversation.equals_func);
+    private Set<string>? active_notification_ids = null;
 
     private enum ClosedReason { // org.freedesktop.Notifications.NotificationClosed
         EXPIRED = 1,
@@ -23,6 +24,51 @@ public class Notifications : Object {
     public Notifications(StreamInteractor stream_interactor, Gtk.Window window) {
         this.stream_interactor = stream_interactor;
         this.window = window;
+
+        stream_interactor.get_module(ChatInteraction.IDENTITY).focused_in.connect(() => {
+            if (active_notification_ids == null) {
+                Gee.List<Conversation> conversations = stream_interactor.get_module(ConversationManager.IDENTITY).get_active_conversations();
+                foreach (Conversation conversation in conversations) {
+                    GLib.Application.get_default().withdraw_notification(conversation.id.to_string());
+                }
+                active_notification_ids = new HashSet<string>();
+            } else {
+                foreach (string id in active_notification_ids) {
+                    GLib.Application.get_default().withdraw_notification(id);
+                }
+                active_notification_ids.clear();
+            }
+        });
+
+        SimpleAction open_conversation_action = new SimpleAction("open-conversation", VariantType.INT32);
+        open_conversation_action.activate.connect((variant) => {
+            Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation_by_id(variant.get_int32());
+            if (conversation != null) conversation_selected(conversation);
+            window.present();
+        });
+        GLib.Application.get_default().add_action(open_conversation_action);
+
+        SimpleAction accept_subscription_action = new SimpleAction("accept-subscription", VariantType.INT32);
+        accept_subscription_action.activate.connect((variant) => {
+            Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation_by_id(variant.get_int32());
+            if (conversation == null) return;
+            stream_interactor.get_module(PresenceManager.IDENTITY).approve_subscription(conversation.account, conversation.counterpart);
+            if (stream_interactor.get_module(RosterManager.IDENTITY).get_roster_item(conversation.account, conversation.counterpart) == null) {
+                AddConversation.Chat.AddContactDialog dialog = new AddConversation.Chat.AddContactDialog(stream_interactor);
+                dialog.jid = conversation.counterpart.bare_jid.to_string();
+                dialog.account = conversation.account;
+                dialog.present();
+            }
+        });
+        GLib.Application.get_default().add_action(accept_subscription_action);
+
+        SimpleAction deny_subscription_action = new SimpleAction("deny-subscription", VariantType.INT32);
+        deny_subscription_action.activate.connect((variant) => {
+            Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation_by_id(variant.get_int32());
+            if (conversation == null) return;
+            stream_interactor.get_module(PresenceManager.IDENTITY).deny_subscription(conversation.account, conversation.counterpart);
+        });
+        GLib.Application.get_default().add_action(deny_subscription_action);
     }
 
     public void start() {
@@ -34,65 +80,33 @@ public class Notifications : Object {
         if  (!should_notify_message(message, conversation)) return;
 
         if (!notifications.has_key(conversation)) {
-            notifications[conversation] = new Notify.Notification("", null, null);
-            notifications[conversation].set_hint("persistent", true);
-            notifications[conversation].add_action("default", "Open", () => {
-                conversation_selected(conversation);
-#if GDK3_WITH_X11
-                Gdk.X11.Window x11window = window.get_window() as Gdk.X11.Window;
-                if (x11window != null) {
-                    window.present_with_time(Gdk.X11.get_server_time(x11window));
-                } else {
-                    window.present();
-                }
-#else
-                window.present();
-#endif
-            });
+            notifications[conversation] = new Notification("");
+            notifications[conversation].set_default_action_and_target_value("app.open-conversation", new Variant.int32(conversation.id));
         }
         if (!stream_interactor.get_module(ChatInteraction.IDENTITY).is_active_focus()) {
             string display_name = Util.get_conversation_display_name(stream_interactor, conversation);
             string text = message.body;
             if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat(conversation.counterpart, conversation.account)) {
                 string muc_occupant = Util.get_display_name(stream_interactor, message.from, conversation.account);
-                text = @"<b>$muc_occupant</b> $text";
+                text = @"$muc_occupant: $text";
             }
-            notifications[conversation].update(display_name, text, null);
-            notifications[conversation].set_image_from_pixbuf((new AvatarGenerator(40, 40)).draw_conversation(stream_interactor, conversation));
-            notifications[conversation].set_timeout(3);
-            try {
-                notifications[conversation].show();
-            } catch (Error error) { }
+            notifications[conversation].set_title(display_name);
+            notifications[conversation].set_body(text);
+            notifications[conversation].set_icon(get_pixbuf_icon((new AvatarGenerator(40, 40)).draw_conversation(stream_interactor, conversation)));
+            window.get_application().send_notification(conversation.id.to_string(), notifications[conversation]);
+            active_notification_ids.add(conversation.id.to_string());
             window.urgency_hint = true;
         }
     }
 
     private void on_received_subscription_request(Jid jid, Account account) {
-        Notify.Notification notification = new Notify.Notification(_("Subscription request"), jid.bare_jid.to_string(), null);
-        notification.set_image_from_pixbuf((new AvatarGenerator(40, 40)).draw_jid(stream_interactor, jid, account));
-        notification.set_hint("persistent", true);
-        notification.add_action("accept", _("Accept"), () => {
-            stream_interactor.get_module(PresenceManager.IDENTITY).approve_subscription(account, jid);
-
-            if (stream_interactor.get_module(RosterManager.IDENTITY).get_roster_item(account, jid) == null) {
-                AddConversation.Chat.AddContactDialog dialog = new AddConversation.Chat.AddContactDialog(stream_interactor);
-                dialog.jid = jid.bare_jid.to_string();
-                dialog.account = account;
-                dialog.present();
-            }
-            try {
-                notification.close();
-            } catch (Error error) { }
-        });
-        notification.add_action("deny", _("Deny"), () => {
-            stream_interactor.get_module(PresenceManager.IDENTITY).deny_subscription(account, jid);
-            try {
-                notification.close();
-            } catch (Error error) { }
-        });
-        try {
-            notification.show();
-        } catch (Error error) { }
+        Notification notification = new Notification(_("Subscription request"));
+        notification.set_body(jid.bare_jid.to_string());
+        notification.set_icon(get_pixbuf_icon((new AvatarGenerator(40, 40)).draw_jid(stream_interactor, jid, account)));
+        Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(jid, account, Conversation.Type.CHAT);
+        notification.add_button_with_target_value(_("Accept"), "app.accept-subscription", conversation.id);
+        notification.add_button_with_target_value(_("Deny"), "app.deny-subscription", conversation.id);
+        window.get_application().send_notification(null, notification);
     }
 
     private bool should_notify_message(Entities.Message message, Conversation conversation) {
@@ -102,6 +116,12 @@ public class Notifications : Object {
         if (notify == Conversation.NotifySetting.HIGHLIGHT && nick != null && !message.body.contains(nick.resourcepart)) return false;
         return true;
     }
+
+    private Icon get_pixbuf_icon(Gdk.Pixbuf avatar) {
+        uint8[] buffer;
+        avatar.save_to_buffer(out buffer, "png");
+        return new BytesIcon(new Bytes(buffer));
+    }
 }
 
 }