Implements XEP-0202 Entity Time, moves Software Version to xmpp package, moves namespace definitions for mam, carbons and avatar to xmpp package

1 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
index 8af05df5..35b41d61 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
@@ -31,11 +31,16 @@ import de.thedevstack.conversationsplus.services.avatar.AvatarCache;
 import de.thedevstack.conversationsplus.services.avatar.AvatarService;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.Xmlns;
+import de.thedevstack.conversationsplus.utils.XmppSendUtil;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
 import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist;
+import de.thedevstack.conversationsplus.xmpp.iqversion.IqVersionPacket;
+import de.thedevstack.conversationsplus.xmpp.iqversion.IqVersionPacketGenerator;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
+import de.thedevstack.conversationsplus.xmpp.time.TimePacket;
+import de.thedevstack.conversationsplus.xmpp.time.TimePacketGenerator;
 
 public class IqParser extends AbstractParser implements OnIqPacketReceived {
 
@@ -323,12 +328,13 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 		} else if (packet.hasChild("query", "http://jabber.org/protocol/disco#info")) {
 			final IqPacket response = mXmppConnectionService.getIqGenerator().discoResponse(packet);
 			mXmppConnectionService.sendIqPacket(account, response, null);
-		} else if (packet.hasChild("query","jabber:iq:version")) {
-			final IqPacket response = mXmppConnectionService.getIqGenerator().versionResponse(packet);
-			mXmppConnectionService.sendIqPacket(account,response,null);
+		} else if (packet.hasChild("query", IqVersionPacket.NAMESPACE)) {
+			XmppSendUtil.sendIqPacket(account, IqVersionPacketGenerator.generateResponse(packet), null);
 		} else if (packet.hasChild("ping", "urn:xmpp:ping")) {
 			final IqPacket response = packet.generateResponse(IqPacket.TYPE.RESULT);
 			mXmppConnectionService.sendIqPacket(account, response, null);
+		} else if (packet.hasChild("time", TimePacket.NAMESPACE)) {
+            XmppSendUtil.sendIqPacket(account, TimePacketGenerator.generateResponse(packet), null);
 		} else {
 			if (packet.getType() == IqPacket.TYPE.GET || packet.getType() == IqPacket.TYPE.SET) {
 				final IqPacket response = packet.generateResponse(IqPacket.TYPE.ERROR);