Fix #77: allow the user to access IqManager

vitalyster · Oct 4, 2020 · 5d9afe0 · 5d9afe0
1 parent 448f4bc
commit 5d9afe0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 53 deletions.
diff --git a/SharpXMPP.Shared/XMPP/Client/IqManager.cs b/SharpXMPP.Shared/XMPP/Client/IqManager.cs
@@ -10,37 +10,23 @@ public abstract class PayloadHandler
 
     public class IqManager
     {
-        protected readonly XmppConnection Connection;
-        public IqManager(XmppConnection connection)
-        {
-            Connection = connection;
-        }
-
-        public List<PayloadHandler> PayloadHandlers { get; set; }
+        public List<PayloadHandler> PayloadHandlers { get; } = new List<PayloadHandler>();
 
-        public void Handle(XMPPIq element)
+        public void Handle(XmppConnection sender, XMPPIq element)
         {
-            if (PayloadHandlers != null)
-            {
-                bool handled = false;
-                PayloadHandlers.ForEach( (h) =>
-                                             {
-                                                 handled |= h.Handle(Connection, element);
-                                             });
-                if (!handled)
-                    HandleError(element);
-                else
-                {
-                    return;
-                }
-            }
-            HandleError(element);
+            bool handled = false;
+            PayloadHandlers.ForEach( (h) =>
+                                         {
+                                             handled |= h.Handle(sender, element);
+                                         });
+            if (!handled)
+                HandleError(sender, element);
         }
 
-        public void HandleError(XMPPIq element)
+        public void HandleError(XmppConnection connection, XMPPIq element)
         {
             if (element.IqType == XMPPIq.IqTypes.get || element.IqType == XMPPIq.IqTypes.set)
-                Connection.Send(element.Error());
+                connection.Send(element.Error());
         }
     }
 }
diff --git a/SharpXMPP.Shared/XmppConnection.cs b/SharpXMPP.Shared/XmppConnection.cs
@@ -4,7 +4,9 @@
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using SharpXMPP.XMPP;
+using SharpXMPP.XMPP.Client;
 using SharpXMPP.XMPP.Client.Capabities;
+using SharpXMPP.XMPP.Client.Disco;
 using SharpXMPP.XMPP.Client.Disco.Elements;
 using SharpXMPP.XMPP.Client.Elements;
 using SharpXMPP.XMPP.Stream.Elements;
@@ -63,6 +65,16 @@ protected XmppConnection(string ns)
                     Namespaces.DiscoItems
                 }
             };
+
+            IqManager = new IqManager
+            {
+                PayloadHandlers =
+                {
+                    new InfoHandler(Capabilities),
+                    new ItemsHandler()
+                }
+            };
+            Iq += IqManager.Handle;
         }
 
         public Features Features { get; set; }
@@ -153,6 +165,8 @@ public CapabilitiesManager Capabilities
             set { _caps = value; }
         }
 
+        public IqManager IqManager { get; }
+
         public abstract XElement NextElement();
 
         public virtual void Send(XElement data)

diff --git a/SharpXMPP.Shared/XmppTcpConnection.cs b/SharpXMPP.Shared/XmppTcpConnection.cs
@@ -11,9 +11,6 @@
 using SharpXMPP.Errors;
 using SharpXMPP.XMPP;
 using SharpXMPP.XMPP.Bind;
-using SharpXMPP.XMPP.Client;
-using SharpXMPP.XMPP.Client.Disco;
-using SharpXMPP.XMPP.Client.Disco.Elements;
 using SharpXMPP.XMPP.Client.Elements;
 using SharpXMPP.XMPP.SASL;
 using SharpXMPP.XMPP.Stream.Elements;
@@ -112,7 +109,6 @@ public override void Dispose()
                 Reader = null;
                 ConnectionStream?.Dispose();
                 ConnectionStream = null;
-                Iq -= OnIqHandler;
             }
             base.Dispose();
         }
@@ -149,7 +145,6 @@ public override async Task ConnectAsync(CancellationToken token)
         {
             List<IPAddress> HostAddresses = await ResolveHostAddresses();
             await ConnectOverTcp(HostAddresses);
-            Iq += OnIqHandler;
 
             RestartXmlStreams();
 
@@ -289,18 +284,5 @@ private async Task<bool> InitTlsIfSupported(Features features)
             RestartXmlStreams();
             return true;
         }
-
-
-        private void OnIqHandler(XmppConnection sender, XMPPIq iq)
-        {
-            new IqManager(this)
-            {
-                PayloadHandlers = new List<PayloadHandler>
-                          {
-                              new InfoHandler(Capabilities),
-                              new ItemsHandler()
-                          }
-            }.Handle(iq);
-        }
     }
 }
diff --git a/SharpXMPP.WebSocket/XmppWebSocketConnection.cs b/SharpXMPP.WebSocket/XmppWebSocketConnection.cs
@@ -10,9 +10,7 @@
 using DnsClient;
 using SharpXMPP.XMPP;
 using SharpXMPP.XMPP.Bind.Elements;
-using SharpXMPP.XMPP.Client;
 using SharpXMPP.XMPP.Client.Capabities;
-using SharpXMPP.XMPP.Client.Disco;
 using SharpXMPP.XMPP.Client.Disco.Elements;
 using SharpXMPP.XMPP.Client.Elements;
 using SharpXMPP.XMPP.Framing.Elements;
@@ -70,14 +68,6 @@ public XmppWebSocketConnection(JID jid, string password, string websocketUri)
                     Namespaces.DiscoItems
                 }
             };
-            Iq += (sender, iq) => new IqManager(this)
-            {
-                PayloadHandlers = new List<PayloadHandler>
-                          {
-                              new InfoHandler(Capabilities),
-                              new ItemsHandler()
-                          }
-            }.Handle(iq);
         }
         public override XElement NextElement()
         {