Merge branch 'development'1.4.0

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
index 6bc629b5..d7366daa 100644
--- a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
@@ -91,7 +91,7 @@ public class IqGenerator extends AbstractGenerator {
 		return publish("urn:xmpp:avatar:metadata", item);
 	}
 
-	public IqPacket retrieveAvatar(final Avatar avatar) {
+	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);
@@ -99,6 +99,13 @@ public class IqGenerator extends AbstractGenerator {
 		return packet;
 	}
 
+	public 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) {