From 2e5977df966779c0ae7247b8ad5343425bea1690 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Mon, 30 Jul 2018 00:00:56 +0200 Subject: Fire signal on subscription approval --- libdino/src/service/presence_manager.vala | 4 ++++ xmpp-vala/src/module/presence/module.vala | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libdino/src/service/presence_manager.vala b/libdino/src/service/presence_manager.vala index 0525100b..e832687d 100644 --- a/libdino/src/service/presence_manager.vala +++ b/libdino/src/service/presence_manager.vala @@ -10,6 +10,7 @@ public class PresenceManager : StreamInteractionModule, Object { public signal void show_received(Show show, Jid jid, Account account); public signal void received_subscription_request(Jid jid, Account account); + public signal void received_subscription_approval(Jid jid, Account account); private StreamInteractor stream_interactor; private HashMap>> shows = new HashMap>>(Jid.hash_bare_func, Jid.equals_bare_func); @@ -94,6 +95,9 @@ public class PresenceManager : StreamInteractionModule, Object { } received_subscription_request(jid, account); }); + stream_interactor.module_manager.get_module(account, Presence.Module.IDENTITY).received_subscription_approval.connect((stream, jid) => { + received_subscription_approval(jid, account); + }); } private void on_received_available_show(Account account, Jid jid, string show) { diff --git a/xmpp-vala/src/module/presence/module.vala b/xmpp-vala/src/module/presence/module.vala index cbc7d365..12b40245 100644 --- a/xmpp-vala/src/module/presence/module.vala +++ b/xmpp-vala/src/module/presence/module.vala @@ -11,6 +11,7 @@ namespace Xmpp.Presence { public signal void received_available_show(XmppStream stream, Jid jid, string show); public signal void received_unavailable(XmppStream stream, Presence.Stanza presence); public signal void received_subscription_request(XmppStream stream, Jid jid); + public signal void received_subscription_approval(XmppStream stream, Jid jid); public signal void received_unsubscription(XmppStream stream, Jid jid); public bool available_resource = true; @@ -79,6 +80,9 @@ namespace Xmpp.Presence { case Presence.Stanza.TYPE_SUBSCRIBE: received_subscription_request(stream, presence.from); break; + case Presence.Stanza.TYPE_SUBSCRIBED: + received_subscription_approval(stream, presence.from); + break; case Presence.Stanza.TYPE_UNSUBSCRIBE: stream.get_flag(Flag.IDENTITY).remove_presence(presence.from); received_unsubscription(stream, presence.from); -- cgit v1.2.3-54-g00ecf