Message sending works.

Contacts are not retained across sessions and connection drops frequently.
Receiving messages does not work yet :(

src/net/davidgf/android/MiscUtil.java

@@ -115,6 +115,15 @@ public static int lookupDecoded(String value) {
 		}
 		return 0;
 	}
+
+	public static String bytesToUTF8(byte [] ba) {
+		try {
+			return new String(ba, "UTF-8");
+		}
+		catch (Exception e) {
+			return new String();
+		}
+	}
 
 }
 

src/net/davidgf/android/WAConnection.java

@@ -19,6 +19,7 @@
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Registration;
 import org.jivesoftware.smack.packet.RosterPacket;
+import org.jivesoftware.smack.packet.IQ;
 import com.xabber.android.data.connection.ConnectionThread;
 
 import net.davidgf.android.WhatsappConnection;
@@ -36,7 +37,7 @@
 import java.security.SecureRandom;
 import java.security.Security;
 import java.util.*;
-import java.util.concurrent.Semaphore;
+import java.util.concurrent.*;
 
 /**
  * Creates a socket connection to a WA server.
@@ -70,9 +71,10 @@ public class WAConnection extends Connection {
     byte [] outbuffer;
     byte [] outbuffer_mutex;
     WhatsappConnection waconnection;
-
     Semaphore readwait,writewait;
 
+    private ExecutorService listenerExecutor;
+
     int msgid;
 
     private static final String waUA = "WhatsApp/2.10.750 Android/4.2.1 Device/GalaxyS3";
@@ -106,6 +108,16 @@ public WAConnection(ConnectionThread ct, String serviceName, CallbackHandler cal
         readwait = new Semaphore(0);
         writewait = new Semaphore(0);
         this.cthread = ct;
+
+	listenerExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+		public Thread newThread(Runnable runnable) {
+			Thread thread = new Thread(runnable,
+			"WA Listener Processor");
+			thread.setDaemon(true);
+			return thread;
+		}
+	});
+
     }
 
     /**
@@ -360,6 +372,21 @@ public void sendPacket(Packet packet) {
 	}
 	if (packet instanceof RosterPacket) {
 		RosterPacket r = (RosterPacket)packet;
+		// Check Add/Remove Contact/Group:
+		if (r.getType() == IQ.Type.SET) {
+			Collection<RosterPacket.Item> items = r.getRosterItems();
+			if (items.size() == 1) {
+				RosterPacket.Item it = ((RosterPacket.Item)(items.toArray()[0]));
+				if (it.getItemType() == RosterPacket.ItemType.remove) {
+					System.out.println("Remove contact!\n");
+				}else{
+					// Adding contact, notify underlying connection for status query
+					//waconnection.addContact(it.getUser());
+					System.out.println("Add contact!\n");
+				}
+			}
+		}
+
 		System.out.println(r.toXML());
 	}
 
@@ -571,11 +598,22 @@ private void readPackets(Thread thisThread, InputStream istream) {
 		    		}
 		    	}
 
+		    	// Process stuff
 		    	this.popWriteData();  // Ready data might be waiting ...
+
 		    	if (waconnection.isConnected() && !waconnected) {
 		    		connectionOK();  // Notify the connection status
 		    		waconnected = true;
 		    	}
+
+		    	Packet p = waconnection.getNextPacket();
+			while (p != null) {
+				for (PacketCollector collector: getPacketCollectors()) {
+					collector.processPacket(p);
+				}
+				listenerExecutor.submit(new ListenerNotification(p));
+				p = waconnection.getNextPacket();
+			}
 	    	} while (r >= 0);
 	}catch (IOException e) {
 		System.out.println("Error!\n" + e.toString());
@@ -711,5 +749,30 @@ public void reset() throws IOException {
 			wrappedReader.reset();
 		}
 	}
+
+
+
+	    /**
+     * A runnable to notify all listeners of a packet.
+     */
+    private class ListenerNotification implements Runnable {
+
+        private Packet packet;
+
+        public ListenerNotification(Packet packet) {
+            this.packet = packet;
+        }
+
+        public void run() {
+            for (ListenerWrapper listenerWrapper : recvListeners.values()) {
+                try {
+                    listenerWrapper.notifyListener(packet);
+                } catch (RuntimeException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
 }
 

src/net/davidgf/android/WhatsappConnection.java

@@ -10,6 +10,8 @@
  */
 
 package net.davidgf.android;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Packet;
 
 import java.util.*;
 
@@ -28,6 +30,8 @@ private enum SessionStatus { SessionNone, SessionConnecting, SessionWaitingChall
 
 	private String account_type, account_status, account_expiration, account_creation;
 	private String mypresence;
+
+	private Vector <Packet> received_packets;
 
 	public WhatsappConnection(String phone, String pass, String nick) {
 		session_key = new byte[20];
@@ -38,6 +42,7 @@ public WhatsappConnection(String phone, String pass, String nick) {
 		this.nickname = nick;
 		this.mypresence = "available";
 		outbuffer = new DataBuffer();
+		received_packets = new Vector <Packet>();
 	}
 
 	public Tree read_tree(DataBuffer data) {
@@ -169,6 +174,31 @@ else if (t.getTag().equals("iq")) {
 				this.doPong(t.getAttribute("id"),t.getAttribute("from"));
 			}
 		}
+		else if (t.getTag().equals("message")) {
+			if (t.hasAttributeValue("type","chat") && t.hasAttribute("from")) {
+				long time = 0;
+				if (t.hasAttribute("t"))
+					time = Integer.parseInt(t.getAttribute("t"));
+				String from = t.getAttribute("from");
+				String id = t.getAttribute("id");
+				String author = t.getAttribute("author");
+
+				Tree tb = t.getChild("body");
+				if (tb != null) {
+					this.receiveMessage(
+					 	new ChatMessage(from,time,id,MiscUtil.bytesToUTF8(tb.getData()),author));
+				}
+			}
+
+			// Received ACK
+			if (t.hasAttribute("type") && t.hasAttribute("from") && !t.hasChild("received")) {
+				DataBuffer reply = generateResponse(t.getAttribute("from"),
+									t.getAttribute("type"),
+									t.getAttribute("id"));
+				outbuffer = outbuffer.addBuf(reply);
+
+			}
+		}
 		/*else if (treelist[i].getTag() == "failure") {
 			if (conn_status == SessionWaitingAuthOK)
 				this->notifyError(errorAuth);
@@ -177,6 +207,28 @@ else if (t.getTag().equals("iq")) {
 		}*/
 	}
 
+	private DataBuffer generateResponse(final String from, final String type, final String id) {
+		Tree received = new Tree("received",new HashMap < String,String >() {{ put("xmlns","urn:xmpp:receipts"); }} );
+		Tree mes = new Tree("message",new HashMap < String,String >() {{ 
+			put("to",from); put("type",type); put("id",id); }} );
+		mes.addChild(received);
+		return serialize_tree(mes,true);
+	}
+
+
+	private void receiveMessage(AbstractMessage msg) {
+		received_packets.add(msg.serializePacket());
+	}
+
+	public Packet getNextPacket() {
+		if (received_packets.size() == 0)
+			return null;
+		Packet r = received_packets.get(0);
+		received_packets.remove(0);
+
+		return r;
+	}
+
 	private void notifyMyPresence() {
 		// Send the nickname and the current status
 		Tree pres = new Tree("presence", new HashMap < String,String >() {{ put("name",nickname); put("type",mypresence); }} );
@@ -319,6 +371,38 @@ void sendAuthResponse() {
 		return new byte[0];
 		}
 	}
+
+	public abstract class AbstractMessage {
+		protected String from, id, author;
+		protected long time;
+
+		public AbstractMessage(String from, long time, String id, String author) {
+			this.from = from;
+			this.id = id;
+			this.author = author;
+			this.time = time;
+		}
+
+		public abstract Packet serializePacket();
+	}
+
+	public class ChatMessage extends AbstractMessage {
+		private String message;
+		public ChatMessage(String from, long time, String id, String message, String author) {
+			super(from, time, id, author);
+			this.message = message;
+		}
+
+		public Packet serializePacket() {
+			Message message = new Message();
+			message.setTo(this.from);
+			message.setFrom("");
+			message.setType(Message.Type.chat);
+			message.setBody(this.message);
+
+			return message;
+		}
+	}
 }