From be1992ce897d3b0551e545646a3e0f45cc6dd8c2 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sun, 6 Aug 2017 14:28:00 +0200
Subject: Implements XEP-0202 Entity Time, moves Software Version to xmpp
 package, moves namespace definitions for mam, carbons and avatar to xmpp
 package

---
 .../conversationsplus/generator/AbstractGenerator.java      |  8 ++++++--
 .../conversationsplus/generator/IqGenerator.java            | 13 +++----------
 .../conversationsplus/generator/MessageGenerator.java       |  3 ++-
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/generator')

diff --git a/src/main/java/de/thedevstack/conversationsplus/generator/AbstractGenerator.java b/src/main/java/de/thedevstack/conversationsplus/generator/AbstractGenerator.java
index abe137cf..7302b2df 100644
--- a/src/main/java/de/thedevstack/conversationsplus/generator/AbstractGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/generator/AbstractGenerator.java
@@ -13,6 +13,9 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState;
+import de.thedevstack.conversationsplus.xmpp.iqversion.IqVersionPacket;
+import de.thedevstack.conversationsplus.xmpp.time.TimePacket;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.crypto.axolotl.AxolotlService;
 
@@ -29,8 +32,9 @@ public abstract class AbstractGenerator {
 			"urn:xmpp:avatar:metadata+notify",
 			"http://jabber.org/protocol/nick+notify",
 			"urn:xmpp:ping",
-			"jabber:iq:version",
-			"http://jabber.org/protocol/chatstates",
+			TimePacket.NAMESPACE,
+			IqVersionPacket.NAMESPACE,
+			ChatState.NAMESPACE,
 			AxolotlService.PEP_DEVICE_LIST+"+notify"};
 	private static final String[] MESSAGE_CONFIRMATION_FEATURES = {
 			"urn:xmpp:chat-markers:0",
diff --git a/src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java b/src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java
index e3e13328..aa279e40 100644
--- a/src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java
@@ -25,6 +25,7 @@ import de.thedevstack.conversationsplus.utils.Xmlns;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.forms.Data;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+import de.thedevstack.conversationsplus.xmpp.mam.Mam;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 public class IqGenerator extends AbstractGenerator {
@@ -46,14 +47,6 @@ public class IqGenerator extends AbstractGenerator {
 		return packet;
 	}
 
-	public IqPacket versionResponse(final IqPacket request) {
-		final IqPacket packet = request.generateResponse(IqPacket.TYPE.RESULT);
-		Element query = packet.query("jabber:iq:version");
-		query.addChild("name").setContent(ConversationsPlusApplication.getName());
-		query.addChild("version").setContent(ConversationsPlusApplication.getVersion());
-		return packet;
-	}
-
 	protected IqPacket publish(final String node, final Element item) {
 		final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
 		final Element pubsub = packet.addChild("pubsub",
@@ -155,10 +148,10 @@ public class IqGenerator extends AbstractGenerator {
 
 	public IqPacket queryMessageArchiveManagement(final MessageArchiveService.Query mam) {
 		final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
-		final Element query = packet.query("urn:xmpp:mam:0");
+		final Element query = packet.query(Mam.NAMESPACE);
 		query.setAttribute("queryid", mam.getQueryId());
 		final Data data = new Data();
-		data.setFormType("urn:xmpp:mam:0");
+		data.setFormType(Mam.NAMESPACE);
 		if (mam.muc()) {
 			packet.setTo(mam.getWith());
 		} else if (mam.getWith()!=null) {
diff --git a/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java b/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java
index 678f2c75..e76d25f6 100644
--- a/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java
@@ -16,6 +16,7 @@ import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.FileParams;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.carbons.Carbons;
 import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState;
 import de.thedevstack.conversationsplus.xmpp.httpuploadim.HttpUploadHint;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
@@ -81,7 +82,7 @@ public class MessageGenerator extends AbstractGenerator {
     }
 
 	public static void addMessageHints(MessagePacket packet) {
-		packet.addChild("private", "urn:xmpp:carbons:2");
+		packet.addChild("private", Carbons.NAMESPACE);
 		packet.addChild("no-copy", "urn:xmpp:hints");
 		packet.addChild("no-permanent-store", "urn:xmpp:hints");
 		packet.addChild("no-permanent-storage", "urn:xmpp:hints"); //do not copy this. this is wrong. it is *store*
-- 
cgit v1.2.3