fetch missing avatars from server

3 files changed, 42 insertions, 1 deletions

diff --git a/src/eu/siacs/conversations/parser/AbstractParser.java b/src/eu/siacs/conversations/parser/AbstractParser.java
index c4c6720aa..e06f16e92 100644
--- a/src/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/eu/siacs/conversations/parser/AbstractParser.java
@@ -73,4 +73,16 @@ public abstract class AbstractParser {
 			}
 		}
 	}
+	
+	protected String avatarData(Element items) {
+		Element item = items.findChild("item");
+		if (item==null) {
+			return null;
+		}
+		Element data = item.findChild("data","urn:xmpp:avatar:data");
+		if (data==null) {
+			return null;
+		}
+		return data.getContent();
+	}
 }
diff --git a/src/eu/siacs/conversations/parser/IqParser.java b/src/eu/siacs/conversations/parser/IqParser.java
index 023fb4df3..492684503 100644
--- a/src/eu/siacs/conversations/parser/IqParser.java
+++ b/src/eu/siacs/conversations/parser/IqParser.java
@@ -40,6 +40,18 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 		}
 		mXmppConnectionService.updateRosterUi();
 	}
+	
+	public String avatarData(IqPacket packet) {
+		Element pubsub = packet.findChild("pubsub", "http://jabber.org/protocol/pubsub");
+		if (pubsub==null) {
+			return null;
+		}
+		Element items = pubsub.findChild("items");
+		if (items==null) {
+			return null;
+		}
+		return super.avatarData(items);
+	}
 
 	@Override
 	public void onIqPacketReceived(Account account, IqPacket packet) {
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index 0a812669e..b54f6b989 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -5,12 +5,14 @@ import android.util.Log;
 import net.java.otr4j.session.Session;
 import net.java.otr4j.session.SessionStatus;
 import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnMessagePacketReceived;
+import eu.siacs.conversations.xmpp.pep.Avatar;
 import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
 
 public class MessageParser extends AbstractParser implements
@@ -263,7 +265,22 @@ public class MessageParser extends AbstractParser implements
 		Element items = event.findChild("items");
 		String node = items.getAttribute("node");
 		if (node!=null) {
-			Log.d("xmppService",account.getJid()+": "+node+" from "+from);
+			if (node.equals("urn:xmpp:avatar:metadata")) {
+				Avatar avatar = Avatar.parseMetadata(items);
+				avatar.owner = from;
+				if (mXmppConnectionService.getFileBackend().isAvatarCached(avatar)) {
+					if (account.getJid().equals(from)) {
+						account.setAvatar(avatar.getFilename());
+					} else {
+						Contact contact = account.getRoster().getContact(from);
+						contact.setAvatar(avatar.getFilename());
+					}
+				} else {
+					mXmppConnectionService.fetchAvatar(account, avatar);
+				}
+			} else {
+				Log.d("xmppService",account.getJid()+": "+node+" from "+from);
+			}
 		} else {
 			Log.d("xmppService",event.toString());
 		}