More WA protocol classes.

Modified XMPP connection wrapping so we can implement a WhatsappConnection class under the Connection object.

src/com/xabber/android/data/connection/ConnectionItem.java

@@ -14,7 +14,7 @@
  */
 package com.xabber.android.data.connection;
 
-import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.Connection;
 
 import com.xabber.android.data.Application;
 import com.xabber.android.data.LogManager;
@@ -99,7 +99,7 @@ public String getRealJid() {
 		ConnectionThread connectionThread = getConnectionThread();
 		if (connectionThread == null)
 			return null;
-		XMPPConnection xmppConnection = connectionThread.getXMPPConnection();
+		Connection xmppConnection = connectionThread.getXMPPConnection();
 		if (xmppConnection == null)
 			return null;
 		String user = xmppConnection.getUser();
@@ -188,7 +188,7 @@ protected void disconnect(final ConnectionThread connectionThread) {
 		Thread thread = new Thread("Disconnection thread for " + this) {
 			@Override
 			public void run() {
-				XMPPConnection xmppConnection = connectionThread
+				Connection xmppConnection = connectionThread
 						.getXMPPConnection();
 				if (xmppConnection != null)
 					try {
@@ -261,7 +261,7 @@ protected void onAuthorized(ConnectionThread connectionThread) {
 	 * @return <code>true</code> if connection thread was managed.
 	 */
 	private boolean onDisconnect(ConnectionThread connectionThread) {
-		XMPPConnection xmppConnection = connectionThread.getXMPPConnection();
+		Connection xmppConnection = connectionThread.getXMPPConnection();
 		boolean acceptable = isManaged(connectionThread);
 		if (xmppConnection == null)
 			LogManager.i(this, "onClose " + acceptable);

src/com/xabber/android/data/connection/ConnectionManager.java

@@ -25,7 +25,7 @@
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.SASLAuthentication;
 import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.Packet;
@@ -181,7 +181,7 @@ public void sendPacket(String account, Packet packet)
 				|| !connectionThread.getConnectionItem().getState()
 						.isConnected())
 			throw new NetworkException(R.string.NOT_CONNECTED);
-		XMPPConnection xmppConnection = connectionThread.getXMPPConnection();
+		Connection xmppConnection = connectionThread.getXMPPConnection();
 		try {
 			xmppConnection.sendPacket(packet);
 		} catch (IllegalStateException e) {

src/com/xabber/android/data/connection/ConnectionThread.java

@@ -25,6 +25,7 @@
 import javax.net.ssl.SSLException;
 
 import org.jivesoftware.smack.ConnectionConfiguration;
+import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PacketFilter;
@@ -67,7 +68,7 @@ public class ConnectionThread implements
 	/**
 	 * SMACK connection.
 	 */
-	private XMPPConnection xmppConnection;
+	private Connection xmppConnection;
 
 	/**
 	 * Thread holder for this connection.
@@ -144,7 +145,7 @@ public Thread newThread(Runnable runnable) {
 		started = false;
 	}
 
-	public XMPPConnection getXMPPConnection() {
+	public Connection getXMPPConnection() {
 		return xmppConnection;
 	}
 

src/com/xabber/android/data/extension/attention/AttentionManager.java

@@ -18,7 +18,7 @@
 
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.ConnectionCreationListener;
-import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.PacketExtension;
@@ -112,7 +112,7 @@ public void onSettingsChanged() {
 						.getConnectionThread();
 				if (connectionThread == null)
 					continue;
-				XMPPConnection xmppConnection = connectionThread
+				Connection xmppConnection = connectionThread
 						.getXMPPConnection();
 				if (xmppConnection == null)
 					continue;

src/com/xabber/android/data/extension/muc/MUCManager.java

@@ -19,6 +19,7 @@
 import java.util.Collections;
 
 import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
@@ -279,7 +280,7 @@ public boolean inUse(final String account, final String room) {
 	 */
 	public void joinRoom(final String account, final String room,
 			boolean requested) {
-		final XMPPConnection xmppConnection;
+		final Connection xmppConnection;
 		final RoomChat roomChat;
 		final String nickname;
 		final String password;

src/net/davidgf/android/DataBuffer.java_ → src/net/davidgf/android/DataBuffer.java

@@ -40,22 +40,28 @@ DataBuffer addBuf(DataBuffer other) {
 		return ret;
 	}
 	DataBuffer decodedBuffer(RC4Decoder decoder, int clength, boolean dout) {
-		DataBuffer deco = new DataBuffer(copyOfRange(this.buffer,0,clength));
-		if (dout) decoder.cipher(&deco->buffer[0],clength-4);
-		else      decoder.cipher(&deco->buffer[4],clength-4);
+		DataBuffer deco = new DataBuffer(Arrays.copyOfRange(this.buffer,0,clength));
+		if (dout) decoder.cipher(Arrays.copyOfRange(deco.buffer,0,clength-4));
+		else      decoder.cipher(Arrays.copyOfRange(deco.buffer,4,clength-4));
 		return deco;
 	}
 	DataBuffer encodedBuffer(RC4Decoder decoder, byte [] key, boolean dout) {
-		DataBuffer deco = *this;
-		decoder->cipher(&deco.buffer[0],blen);
-		unsigned char hmacint[4]; DataBuffer hmac;
-		KeyGenerator::calc_hmac(deco.buffer,blen,key,(unsigned char*)&hmacint);
-		hmac.addData(hmacint,4);
+		DataBuffer deco = new DataBuffer(Arrays.copyOfRange(this.buffer,0,this.buffer.length));
 
-		if (dout) deco = deco + hmac;
-		else      deco = hmac + deco;
+		decoder.cipher(deco.buffer);
+		byte [] hmacint = KeyGenerator.calc_hmac(deco.buffer,key);
+		DataBuffer hmac = new DataBuffer(hmacint);
 
-		return deco;
+		DataBuffer res = new DataBuffer();
+		if (dout) {
+			res.addBuf(deco);
+			res.addBuf(hmac);
+		}else{
+			res.addBuf(hmac);
+			res.addBuf(deco);
+		}
+
+		return res;
 	}
 	byte [] getPtr() {
 		return buffer;
@@ -93,7 +99,7 @@ int getInt(int nbytes, int offset) {
 		int ret = 0;
 		for (int i = 0; i < nbytes; i++) {
 			ret <<= 8;
-			ret |= (int)(buffer[i+offset]0xFF);
+			ret |= (int)(buffer[i+offset] & 0xFF);
 		}
 		return ret;
 	}
@@ -102,7 +108,7 @@ void putInt(int value, int nbytes) {
 
 		byte [] out = new byte[nbytes];
 		for (int i = 0; i < nbytes; i++) {
-			out[nbytes-i-1] = (byte)(value>>(i<<3))&0xFF;
+			out[nbytes-i-1] = (byte)((value>>(i<<3)) & 0xFF);
 		}
 		this.addData(out);
 	}
@@ -157,7 +163,7 @@ String readString() {
 		//	throw 0;
 		int type = readInt(1);
 		if (type > 4 && type < 0xf5) {
-			return getDecoded(type);
+			return MiscUtil.getDecoded(type);
 		}
 		else if (type == 0) {
 			return "";
@@ -171,7 +177,7 @@ else if (type == 0xfd) {
 			return readRawString(slen);
 		}
 		else if (type == 0xfe) {
-			return getDecoded(readInt(1)+0xf5);
+			return MiscUtil.getDecoded(readInt(1)+0xf5);
 		}
 		else if (type == 0xfa) {
 			String u = readString();
@@ -198,7 +204,7 @@ void putRawString(byte [] s) {
 		}
 	}
 	void putString(String s) {
-		int lu = lookupDecoded(s);
+		int lu = MiscUtil.lookupDecoded(s);
 		if (lu > 4 && lu < 0xf5) {
 			putInt(lu,1);
 		}
@@ -226,7 +232,7 @@ boolean isList() {
 		return (buffer[0] == 248 || buffer[0] == 0 || buffer[0] == 249);
 	}
 	Vector <Tree> readList(WhatsappConnection c) {
-		Vector <Tree> l;
+		Vector <Tree> l = new Vector<Tree>();
 		int size = readListSize();
 		while (size-- > 0) {
 			l.add(c.read_tree(this));

src/net/davidgf/android/KeyGenerator.java_ → src/net/davidgf/android/KeyGenerator.java

@@ -1,9 +1,21 @@
 
 import java.security.*;
 import java.util.*;
+import javax.crypto.*;
+import javax.crypto.spec.*;
 
 public class KeyGenerator {
 
+	public static byte [] PKCS5_PBKDF2_HMAC_SHA1(byte [] pass, byte [] salt) throws Exception {
+		char [] password = new char[pass.length];
+		for (int i = 0; i < pass.length; i++)
+			password[i] = (char)(pass[i]&0xFF);
+		SecretKeyFactory f = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+		PBEKeySpec ks = new PBEKeySpec(password,salt,16,20);
+		SecretKey s = f.generateSecret(ks);
+		return s.getEncoded();
+	}
+
 	private static byte [] hexmap = new byte[]{ '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };
 
 	public static byte [] generateKeyImei(String imei, byte [] salt) {
@@ -18,7 +30,7 @@ public class KeyGenerator {
 				hashhex[2*i+1] = hexmap[hash[i]&0xF];
 			}
 
-			//PKCS5_PBKDF2_HMAC_SHA1 (hashhex,32,(unsigned char*)salt,saltlen,16,20,(unsigned char*)out);
+			return PKCS5_PBKDF2_HMAC_SHA1 (hashhex,salt);
 		}
 		catch (Exception e) {
 			return new byte[0];
@@ -28,7 +40,7 @@ public static byte[] generateKeyV2(String pw, byte [] salt) {
 		try {
 			byte [] decpass = MiscUtil.base64_decode(pw.getBytes());
 
-			//PKCS5_PBKDF2_HMAC_SHA1 (dec.c_str(),20,(unsigned char*)salt,saltlen,16,20,(unsigned char*)out);
+			return PKCS5_PBKDF2_HMAC_SHA1 (decpass,salt);
 		}
 		catch (Exception e) {
 			return new byte[0];
@@ -46,7 +58,7 @@ public static byte[] generateKeyV2(String pw, byte [] salt) {
 				hashhex[2*i+1] = hexmap[hash[i]&0xF];
 			}
 
-			//PKCS5_PBKDF2_HMAC_SHA1 (hashhex,32,(unsigned char*)salt,saltlen,16,20,(unsigned char*)out);
+			return PKCS5_PBKDF2_HMAC_SHA1 (hashhex,salt);
 		}
 		catch (Exception e) {
 			return new byte[0];

src/net/davidgf/android/MiscUtil.java

@@ -106,7 +106,7 @@ private static byte findarray(byte what) {
 	public static String getDecoded(int n) {
 		return new String(dictionary[n & 255]);
 	}
-	int lookupDecoded(String value) {
+	public static int lookupDecoded(String value) {
 		for (int i = 0; i < 256; i++) {
 			if (dictionary[i].equals(value))
 				return i;

src/net/davidgf/android/WhatsappConnection.java

@@ -0,0 +1,41 @@
+
+
+public class WhatsappConnection {
+
+	public Tree read_tree(DataBuffer data) {
+		Tree t = new Tree("");
+		return t;
+	}
+
+	/*int lsize = data->readListSize();
+	int type = data->getInt(1);
+	if (type == 1) {
+		data->popData(1);
+		Tree t;
+		t.readAttributes(data,lsize);
+		t.setTag("start");
+		return t;
+	}else if (type == 2) {
+		data->popData(1);
+		return Tree("treeerr"); // No data in this tree...
+	}
+
+	Tree t;
+	t.setTag(data->readString());
+	t.readAttributes(data,lsize);
+
+	if ((lsize & 1) == 1) {
+		return t;
+	}
+
+	if (data->isList()) {
+		t.setChildren(data->readList(this));
+	}else{
+		t.setData(data->readString());
+	}
+
+	return t;*/
+
+}
+
+

src/org/jivesoftware/smack/Connection.java

@@ -226,6 +226,10 @@ protected ConnectionConfiguration getConfiguration() {
     public String getServiceName() {
         return config.getServiceName();
     }
+
+    public boolean isAlive() {
+    	return true;
+    }
 
     /**
      * Returns the host name of the server where the XMPP server is running. This would be the

src/org/jivesoftware/smack/XMPPConnection.java

@@ -1095,6 +1095,7 @@ public void setRosterStorage(RosterStorage storage)
 	 * 
 	 * @return <code>false</code> if timeout occur.
 	 */
+	@Override
 	public boolean isAlive() {
 		PacketWriter packetWriter = this.packetWriter;
 		return packetWriter == null || packetWriter.isAlive();