1 files changed, 5 insertions, 47 deletions

diff --git a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
index daacfe59..4e3025f0 100644
--- a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
@@ -15,13 +15,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.services.MessageArchiveService;
-import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.Xmlns;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.forms.Data;
@@ -31,10 +31,6 @@ import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 
 public class IqGenerator extends AbstractGenerator {
 
-	public IqGenerator(final XmppConnectionService service) {
-		super(service);
-	}
-
 	public IqPacket discoResponse(final IqPacket request) {
 		final IqPacket packet = new IqPacket(IqPacket.TYPE.RESULT);
 		packet.setId(request.getId());
@@ -45,7 +41,7 @@ public class IqGenerator extends AbstractGenerator {
 		final Element identity = query.addChild("identity");
 		identity.setAttribute("category", "client");
 		identity.setAttribute("type", IDENTITY_TYPE);
-		identity.setAttribute("name", getIdentityName());
+		identity.setAttribute("name", ConversationsPlusApplication.getNameAndVersion());
 		for (final String feature : getFeatures()) {
 			query.addChild("feature").setAttribute("var", feature);
 		}
@@ -55,8 +51,8 @@ public class IqGenerator extends AbstractGenerator {
 	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(IDENTITY_NAME);
-		query.addChild("version").setContent(getIdentityVersion());
+		query.addChild("name").setContent(ConversationsPlusApplication.getName());
+		query.addChild("version").setContent(ConversationsPlusApplication.getVersion());
 		return packet;
 	}
 
@@ -88,51 +84,13 @@ public class IqGenerator extends AbstractGenerator {
 		return publish("http://jabber.org/protocol/nick", item);
 	}
 
-	public IqPacket publishAvatar(Avatar avatar) {
-		final Element item = new Element("item");
-		item.setAttribute("id", avatar.sha1sum);
-		final Element data = item.addChild("data", "urn:xmpp:avatar:data");
-		data.setContent(avatar.image);
-		return publish("urn:xmpp:avatar:data", item);
-	}
-
-	public IqPacket publishAvatarMetadata(final Avatar avatar) {
-		final Element item = new Element("item");
-		item.setAttribute("id", avatar.sha1sum);
-		final Element metadata = item
-			.addChild("metadata", "urn:xmpp: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 publish("urn:xmpp:avatar:metadata", item);
-	}
-
-	public IqPacket retrievePepAvatar(final Avatar avatar) {
-		final Element item = new Element("item");
-		item.setAttribute("id", avatar.sha1sum);
-		final IqPacket packet = retrieve("urn:xmpp:avatar:data", item);
-		packet.setTo(avatar.owner);
-		return packet;
-	}
-
-	public IqPacket retrieveVcardAvatar(final Avatar avatar) {
+	public static IqPacket retrieveVcardAvatar(final Avatar avatar) {
 		final IqPacket packet = new IqPacket(IqPacket.TYPE.GET);
 		packet.setTo(avatar.owner);
 		packet.addChild("vCard", "vcard-temp");
 		return packet;
 	}
 
-	public IqPacket retrieveAvatarMetaData(final Jid to) {
-		final IqPacket packet = retrieve("urn:xmpp:avatar:metadata", null);
-		if (to != null) {
-			packet.setTo(to);
-		}
-		return packet;
-	}
-
 	public IqPacket retrieveDeviceIds(final Jid to) {
 		final IqPacket packet = retrieve(AxolotlService.PEP_DEVICE_LIST, null);
 		if(to != null) {