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, 7 insertions, 9 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketGenerator.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketGenerator.java
index 4534e870..f9e04122 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketGenerator.java
@@ -9,11 +9,9 @@ import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 /**
  * Generates the IQ Packets for handling Avatars
  * as defined in XEP-0084.
- * @see {@link http://xmpp.org/extensions/xep-0084.html}
+ * @see http://xmpp.org/extensions/xep-0084.html
  */
 public final class AvatarPacketGenerator {
-    public static final String NAMESPACE_AVATAR_DATA = "urn:xmpp:avatar:data";
-    public static final String NAMESPACE_AVATAR_METADATA = "urn:xmpp:avatar:metadata";
 
     /**
      * Generates an IqPacket for publishing avatar data.
@@ -37,9 +35,9 @@ public final class AvatarPacketGenerator {
     public static IqPacket generatePublishAvatarPacket(Avatar avatar) {
         final Element item = new Element("item");
         item.setAttribute("id", avatar.sha1sum);
-        final Element data = item.addChild("data", NAMESPACE_AVATAR_DATA);
+        final Element data = item.addChild("data", AvatarPacket.NAMESPACE_AVATAR_DATA);
         data.setContent(avatar.image);
-        return PubSubPacketGenerator.generatePubSubPublishPacket(NAMESPACE_AVATAR_DATA, item);
+        return PubSubPacketGenerator.generatePubSubPublishPacket(AvatarPacket.NAMESPACE_AVATAR_DATA, item);
     }
 
     /**
@@ -60,7 +58,7 @@ public final class AvatarPacketGenerator {
     public static IqPacket generateRetrieveAvatarPacket(Avatar avatar) {
         final Element item = new Element("item");
         item.setAttribute("id", avatar.sha1sum);
-        final IqPacket packet = PubSubPacketGenerator.generatePubSubRetrievePacket(NAMESPACE_AVATAR_DATA, item);
+        final IqPacket packet = PubSubPacketGenerator.generatePubSubRetrievePacket(AvatarPacket.NAMESPACE_AVATAR_DATA, item);
         packet.setTo(avatar.owner);
         return packet;
     }
@@ -91,14 +89,14 @@ public final class AvatarPacketGenerator {
     public static IqPacket generatePublishAvatarMetadataPacket(Avatar avatar) {
         final Element item = new Element("item");
         item.setAttribute("id", avatar.sha1sum);
-        final Element metadata = item.addChild("metadata", NAMESPACE_AVATAR_METADATA);
+        final Element metadata = item.addChild("metadata", AvatarPacket.NAMESPACE_AVATAR_METADATA);
         final Element info = metadata.addChild("info");
         info.setAttribute("bytes", avatar.size);
         info.setAttribute("id", avatar.sha1sum);
         info.setAttribute("height", avatar.height);
         info.setAttribute("width", avatar.height);
         info.setAttribute("type", avatar.type);
-        return PubSubPacketGenerator.generatePubSubPublishPacket(NAMESPACE_AVATAR_METADATA, item);
+        return PubSubPacketGenerator.generatePubSubPublishPacket(AvatarPacket.NAMESPACE_AVATAR_METADATA, item);
     }
 
     /**
@@ -108,7 +106,7 @@ public final class AvatarPacketGenerator {
      * @return the IqPacket
      */
     public static IqPacket generateRetrieveAvatarMetadataPacket(Jid to) {
-        final IqPacket packet = PubSubPacketGenerator.generatePubSubRetrievePacket(NAMESPACE_AVATAR_METADATA, null);
+        final IqPacket packet = PubSubPacketGenerator.generatePubSubRetrievePacket(AvatarPacket.NAMESPACE_AVATAR_METADATA, null);
         if (to != null) {
             packet.setTo(to);
         }