Use delegates + object storage instead of listener objects

1 files changed, 16 insertions, 29 deletions

diff --git a/xmpp-vala/src/module/xep/0049_private_xml_storage.vala b/xmpp-vala/src/module/xep/0049_private_xml_storage.vala
index f59d0bdd..a5d872b6 100644
--- a/xmpp-vala/src/module/xep/0049_private_xml_storage.vala
+++ b/xmpp-vala/src/module/xep/0049_private_xml_storage.vala
@@ -1,3 +1,5 @@
+using Gee;
+
 using Xmpp.Core;
 
 namespace Xmpp.Xep.PrivateXmlStorage {
@@ -7,35 +9,18 @@ namespace Xmpp.Xep.PrivateXmlStorage {
         public const string ID = "0049_private_xml_storage";
         public static ModuleIdentity<Module> IDENTITY = new ModuleIdentity<Module>(NS_URI, ID);
 
-        public void store(XmppStream stream, StanzaNode node, StoreResponseListener listener) {
+        [CCode (has_target = false)] public delegate void OnSuccess(XmppStream stream, Object? reference);
+        public void store(XmppStream stream, StanzaNode node, OnSuccess listener, Object? reference) {
             StanzaNode queryNode = new StanzaNode.build("query", NS_URI).add_self_xmlns().put_node(node);
             Iq.Stanza iq = new Iq.Stanza.set(queryNode);
-            stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, new IqStoreResponse(listener));
-        }
-
-        private class IqStoreResponse : Iq.ResponseListener, Object {
-            StoreResponseListener listener;
-            public IqStoreResponse(StoreResponseListener listener) {
-                this.listener = listener;
-            }
-            public void on_result(XmppStream stream, Iq.Stanza iq) {
-                listener.on_success(stream);
-            }
+            stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, on_store_response, Tuple.create(listener, reference));
         }
 
-        public void retrieve(XmppStream stream, StanzaNode node, RetrieveResponseListener responseListener) {
+        [CCode (has_target = false)] public delegate void OnResponse(XmppStream stream, StanzaNode node, Object? reference);
+        public void retrieve(XmppStream stream, StanzaNode node, OnResponse listener, Object? reference) {
             StanzaNode queryNode = new StanzaNode.build("query", NS_URI).add_self_xmlns().put_node(node);
             Iq.Stanza iq = new Iq.Stanza.get(queryNode);
-            stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, new IqRetrieveResponse(responseListener));
-        }
-
-        private class IqRetrieveResponse : Iq.ResponseListener, Object {
-            RetrieveResponseListener response_listener;
-            public IqRetrieveResponse(RetrieveResponseListener response_listener) { this.response_listener = response_listener; }
-
-            public void on_result(XmppStream stream, Iq.Stanza iq) {
-                response_listener.on_result(stream, iq.stanza.get_subnode("query", NS_URI));
-            }
+            stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, on_retrieve_response, Tuple.create(listener, reference));
         }
 
         public override void attach(XmppStream stream) {
@@ -50,13 +35,15 @@ namespace Xmpp.Xep.PrivateXmlStorage {
 
         public override string get_ns() { return NS_URI; }
         public override string get_id() { return ID; }
-    }
 
-    public interface StoreResponseListener : Object {
-        public abstract void on_success(XmppStream stream);
-    }
+        private static void on_store_response(XmppStream stream, Iq.Stanza iq, Object o) {
+            Tuple<OnSuccess, Object> tuple = o as Tuple<OnSuccess, Object>;
+            tuple.a(stream, tuple.b);
+        }
 
-    public interface RetrieveResponseListener : Object {
-        public abstract void on_result(XmppStream stream, StanzaNode stanzaNode);
+        private static void on_retrieve_response(XmppStream stream, Iq.Stanza iq, Object o) {
+            Tuple<OnResponse, Object> tuple = o as Tuple<OnResponse, Object>;
+            tuple.a(stream, iq.stanza.get_subnode("query", NS_URI), tuple.b);
+        }
     }
 }