Added avatar support.

Also fixed a small bug with user status.

src/net/davidgf/android/MiscUtil.java

@@ -1,6 +1,9 @@
 
 package net.davidgf.android;
 
+import java.security.MessageDigest;
+import java.math.BigInteger;
+
 public class MiscUtil {
 
 	private static byte [] base64_chars = new byte []{'A','B','C','D','E','F','G','H','I','J','K','L',
@@ -129,6 +132,16 @@ public static String getUser(String user) {
 		return user.split("@")[0];
 	}
 
+	public static String getEncodedSha1Sum( byte [] data ) {
+		try {
+			MessageDigest md = MessageDigest.getInstance("SHA1");
+			md.update(data);
+			return new BigInteger(1, md.digest()).toString(16);
+		}
+		catch (Exception e) {
+			return new String("");
+		}
+	}
 }
 
 

src/net/davidgf/android/WAConnection.java

@@ -20,6 +20,8 @@
 import org.jivesoftware.smack.packet.Registration;
 import org.jivesoftware.smack.packet.RosterPacket;
 import org.jivesoftware.smack.packet.IQ;
+import com.xabber.xmpp.vcard.VCard;
+import com.xabber.xmpp.vcard.BinaryPhoto;
 import com.xabber.android.data.connection.ConnectionThread;
 
 import net.davidgf.android.WhatsappConnection;
@@ -367,6 +369,16 @@ public void sendPacket(Packet packet) {
 		Registration r = (Registration)packet;
 		System.out.println(r.getChildElementXML());
 	}
+	if (packet instanceof VCard) {
+		// The request for a VCard has been queued,  now we should provide the Avatar!
+		packet.setFrom(packet.getTo());
+		VCard vc = (VCard)packet;
+
+		BinaryPhoto bp = new BinaryPhoto();
+		bp.setData(waconnection.getUserAvatar(packet.getFrom()));
+		vc.getPhotos().add(bp);
+		submitPacket(packet);
+	}
 	if (packet instanceof RosterPacket) {
 		RosterPacket r = (RosterPacket)packet;
 		// Check Add/Remove Contact/Group:
@@ -412,6 +424,9 @@ public void sendPacket(Packet packet) {
 
 	// Notify others
 	this.firePacketSendingListeners(packet);
+
+	// DO stuff again
+	processLoop();
     }
 
     private void popWriteData() {
@@ -618,31 +633,7 @@ private void readPackets(Thread thisThread, InputStream istream) {
 		    		}
 		    	}
 
-		    	// Proceed to push data to underlying connection class
-		    	synchronized ( waconnection ) {
-		    		synchronized (inbuffer) {
-		    			int used = waconnection.pushIncomingData(inbuffer);
-		    			inbuffer = Arrays.copyOfRange(inbuffer, used, inbuffer.length);
-		    		}
-		    	}
-
-		    	// Process stuff
-		    	this.popWriteData();  // Ready data might be waiting ...
-
-		    	if (waconnection.isConnected() && !waconnected) {
-		    		connectionOK();  // Notify the connection status
-		    		waconnected = true;
-		    	}
-
-			if (listenerExecutor == null) {
-				System.out.println("Null!!! Shit\n");
-			}
-
-		    	Packet p = waconnection.getNextPacket();
-			while (p != null) {
-				submitPacket(p);
-				p = waconnection.getNextPacket();
-			}
+		    	processLoop();
 	    	} while (r >= 0);
 	}catch (IOException e) {
 		System.out.println("Error!\n" + e.toString());
@@ -653,6 +644,34 @@ private void readPackets(Thread thisThread, InputStream istream) {
 	// Signal the writer thread so it can also end
 	writewait.release();
     }
+
+    private void processLoop() {
+    	// Proceed to push data to underlying connection class
+    	synchronized ( waconnection ) {
+    		synchronized (inbuffer) {
+    			int used = waconnection.pushIncomingData(inbuffer);
+    			inbuffer = Arrays.copyOfRange(inbuffer, used, inbuffer.length);
+    		}
+    	}
+
+    	// Process stuff
+    	this.popWriteData();  // Ready data might be waiting ...
+
+    	if (waconnection.isConnected() && !waconnected) {
+    		connectionOK();  // Notify the connection status
+    		waconnected = true;
+    	}
+
+	if (listenerExecutor == null) {
+		System.out.println("Null!!! Shit\n");
+	}
+
+    	Packet p = waconnection.getNextPacket();
+	while (p != null) {
+		submitPacket(p);
+		p = waconnection.getNextPacket();
+	}
+	}
 
     /**
      * Establishes a connection to the XMPP server and performs an automatic login

src/net/davidgf/android/WhatsappConnection.java

@@ -13,7 +13,10 @@
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.Presence;
+import org.jivesoftware.smack.packet.RosterPacket;
 import org.jivesoftware.smackx.packet.MessageEvent;
+import com.xabber.xmpp.vcard.VCard;
+import com.xabber.xmpp.avatar.VCardUpdate;
 
 import java.util.*;
 
@@ -35,6 +38,8 @@ private enum SessionStatus { SessionNone, SessionConnecting, SessionWaitingChall
 
 	private Vector <Packet> received_packets;
 	private Vector <Contact> contacts;
+
+	private int iqid;
 
 	public WhatsappConnection(String phone, String pass, String nick) {
 		session_key = new byte[20];
@@ -47,6 +52,7 @@ public WhatsappConnection(String phone, String pass, String nick) {
 		outbuffer = new DataBuffer();
 		received_packets = new Vector <Packet>();
 		contacts = new Vector <Contact> ();
+		iqid = 0;
 	}
 
 	public Tree read_tree(DataBuffer data) {
@@ -168,8 +174,11 @@ else if (t.getTag().equals("success")) {
 			//this->updateGroups();
 
 			// Resend contact status query (for already added contacts)
-			for (int i = 0; i < contacts.size(); i++)
+			System.out.println("SUbscribe delayed\n");
+			for (int i = 0; i < contacts.size(); i++) {
 				subscribePresence(contacts.get(i).phone);
+				queryPreview(contacts.get(i).phone);
+			}
 
 			//std::cout << "Logged in!!!" << std::endl;
 			//std::cout << "Account " << phone << " status: " << account_status << " kind: " << account_type <<
@@ -193,6 +202,14 @@ else if (t.getTag().equals("iq")) {
 			if (t.hasAttribute("from") && t.hasAttribute("id") && t.hasChild("ping")) {
 				this.doPong(t.getAttribute("id"),t.getAttribute("from"));
 			}
+
+			if (t.hasAttributeValue("type","result") && t.hasAttribute("from")) {
+				Tree tb = t.getChild("picture");
+				if (tb != null) {
+					if (tb.hasAttributeValue("type","preview"))
+						this.addPreviewPicture(t.getAttribute("from"),tb.getData());
+				}
+			}
 		}
 		else if (t.getTag().equals("message")) {
 			if (t.hasAttributeValue("type","chat") && t.hasAttribute("from")) {
@@ -257,6 +274,51 @@ private DataBuffer generateResponse(final String from, final String type, final
 		return serialize_tree(mes,true);
 	}
 
+	private void queryPreview(final String user) {
+		final String fuser = user+"@"+whatsappserver;
+		final String reqid = String.valueOf(++iqid);
+		Tree pic = new Tree ("picture", 
+			new HashMap < String,String >() {{ put("xmlns","w:profile:picture"); put("type","preview"); }} );
+		Tree req = new Tree("iq", 
+			new HashMap < String,String >() {{ put("id",reqid); put("type","get"); put("to",fuser); }} );
+
+		req.addChild(pic);
+
+		outbuffer = outbuffer.addBuf(new DataBuffer(serialize_tree(req,true)));
+	}
+
+	public byte[] getUserAvatar(String user) {
+		// Look for preview 
+		user = MiscUtil.getUser(user);
+		for (int i = 0; i < contacts.size(); i++) {
+			if (contacts.get(i).phone.equals(user)) {
+				return contacts.get(i).ppprev;
+			}
+		}
+		return new byte[0];
+	}
+
+	private void addPreviewPicture(String user, byte [] picture) {
+		System.out.println("Received preview...\n");
+		user = MiscUtil.getUser(user);
+
+		// Save preview 
+		for (int i = 0; i < contacts.size(); i++) {
+			if (contacts.get(i).phone.equals(user)) {
+				contacts.get(i).ppprev = picture;
+				break;
+			}
+		}
+
+		VCardUpdate vc = new VCardUpdate();
+		vc.setPhotoHash(MiscUtil.getEncodedSha1Sum(picture));
+		Presence p = new Presence(Presence.Type.subscribed);
+		p.setTo(phone);
+		p.setFrom(user);
+		p.addExtension(vc);
+		received_packets.add(p);
+	}
+
 	private void receiveMessage(AbstractMessage msg) {
 		received_packets.add(msg.serializePacket());
 	}
@@ -407,11 +469,12 @@ public void addContact(String user, boolean user_request) {
 
 		if (conn_status == SessionStatus.SessionConnected) {
 			subscribePresence(user);
+			queryPreview(user);
 		}
 	}
 
 	public void subscribePresence(String user) {
-		final String username = MiscUtil.getUser(user);
+		final String username = MiscUtil.getUser(user)+"@"+whatsappserver;
 		Tree request = new Tree("presence",
 			new HashMap < String,String >() {{ put("type","subscribe"); put("to",username); }} );
 
@@ -520,7 +583,7 @@ public class Contact {
 		String status;
 		long last_seen, last_status;
 		boolean mycontact;
-		String ppprev, pppicture;
+		byte[] ppprev, pppicture;
 		boolean subscribed;
 
 		Contact(String phone, boolean myc) {