Add WhatsApp protocol support in Xabber

.gitignore

@@ -3,3 +3,4 @@ gen/*
 *.orig
 .pydevproject
 .settings
+*~

Makefile

@@ -0,0 +1,5 @@
+
+all:
+	android update project --path . --target android-10 --name Xabber
+	ant release
+

project.properties

@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-9
+target=android-10

res/values/account_editor.xml

@@ -25,6 +25,8 @@
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
     <string name="account_type_hints_gtalk">username for gmail.com or Google Apps domain</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
+    <string name="account_type_hints_wapp">Telephone number (with prefix)</string>
+    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
     <string name="account_type_hints_livejournal">username for livejournal.com</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
     <string name="account_type_hints_qip">username for qip.ru</string>
@@ -39,6 +41,8 @@
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
     <string name="account_type_helps_gtalk">If you don\'t have Google account you may create one at http://mail.google.com\nAlso you can use your_user_name@your_google_domain</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
+    <string name="account_type_helps_wapp">You need an already existing WhatsApp account. TODO: Add references on how to create/get password</string>
+    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
     <string name="account_type_helps_livejournal">If you don\'t have Livejournal account you may create one at http://livejournal.com</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
     <string name="account_type_helps_qip">If you don\'t have QIP account you may create one at http://qip.ru</string>
@@ -53,6 +57,8 @@
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
     <string name="account_type_names_gtalk">Google Talk</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
+    <string name="account_type_names_wapp">WhatsApp</string>
+    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
     <string name="account_type_names_livejournal">LiveJournal</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
     <string name="account_type_names_qip">QIP</string>
@@ -101,6 +107,8 @@
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_gtalk.png -->
     <string name="account_protocol_gtalk_title">Google Talk</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_wlm.png -->
+    <string name="account_protocol_wapp_title">WhatsApp</string>
+    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_wlm.png -->
     <string name="account_protocol_wlm_title">WLM</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_01.png -->
     <string name="account_protocol_xmpp_title">XMPP</string>
@@ -159,4 +167,4 @@
     <string name="confirm_cancellation">Are you sure you want to discard all the changes?</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_error.png -->
     <string name="INCORRECT_USER_NAME">Incorrect user name. Check help text below for details.</string>
-</resources>
+</resources>

res/values/connections.xml

@@ -16,6 +16,7 @@
     <string name="account_protocol_xmpp">xmpp</string>
     <string name="account_protocol_gtalk">gtalk</string>
     <string name="account_protocol_wlm">wlm</string>
+    <string name="account_protocol_wapp">wapp</string>
 
     <!--
     <array name="account_type_name">
@@ -73,6 +74,19 @@
         <item>True</item>
         <item>messenger.live.com</item>
     </array>
+
+    <array name="account_type_wapp">
+        <item>@string/account_protocol_wapp</item>
+        <item>@string/account_type_names_wapp</item>
+        <item>@string/account_type_hints_wapp</item>
+        <item>@string/account_type_helps_wapp</item>
+        <item>@drawable/ic_type_wlm</item>
+        <item>True</item>
+        <item>c3.whatsapp.net</item>
+        <item>443</item>
+        <item>False</item>
+        <item>c3.whatsapp.net</item>
+    </array>
 
     <array name="account_type_facebook">
         <item>@string/account_protocol_xmpp</item>
@@ -157,6 +171,7 @@
         <item>@array/account_type_xmpp</item>
         <item>@array/account_type_gtalk</item>
         <item>@array/account_type_wlm</item>
+        <item>@array/account_type_wapp</item>
         <item>@array/account_type_facebook</item>
         <item>@array/account_type_vkontakte</item>
         <item>@array/account_type_qip</item>

res/xml/account_editor_wapp.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
+
+     This file is part of Xabber project; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License, Version 3.
+
+     Xabber is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License,
+     along with this program. If not, see http://www.gnu.org/licenses/.
+-->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference
+        android:title="@string/account_enabled"
+        android:summary="@string/account_enabled_summary"
+        android:key="@string/account_enabled_key"
+        />
+    <CheckBoxPreference
+        android:title="@string/account_syncable"
+        android:summary="@string/account_syncable_summary"
+        android:key="@string/account_syncable_key"
+        />
+    <EditTextPreference
+        android:key="@string/account_username_key"
+        android:title="@string/account_user_name"
+        android:dialogTitle="@string/account_user_name"
+        android:singleLine="true"
+        />
+    <CheckBoxPreference
+        android:title="@string/account_store_password"
+        android:summary="@string/account_store_password_summary"
+        android:key="@string/account_store_password_key"
+        />
+    <EditTextPreference
+        android:key="@string/account_password_key"
+        android:title="@string/account_password"
+        android:dialogTitle="@string/account_password"
+        android:password="true"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:key="@string/account_resource_key"
+        android:title="@string/account_resource"
+        android:dialogTitle="@string/account_resource"
+        android:singleLine="true"
+        />
+    <ListPreference
+        android:title="@string/account_archive_mode"
+        android:key="@string/account_archive_mode_key"
+        android:entries="@array/account_archive_mode_entries"
+        android:entryValues="@array/account_archive_mode_entryvalues"
+        />
+</PreferenceScreen>

src/com/xabber/android/data/account/AccountProtocol.java

@@ -33,6 +33,11 @@ public enum AccountProtocol {
 	 * GTalk.
 	 */
 	gtalk,
+
+	/**
+	 * WhatsApp.
+	 */
+	wapp,
 
 	/**
 	 * Windows Live Messenger.
@@ -54,6 +59,8 @@ public int getNameResource() {
 			return R.string.account_type_names_xmpp;
 		else if (this == gtalk)
 			return R.string.account_type_names_gtalk;
+		else if (this == wapp)
+			return R.string.account_type_names_wapp;
 		else if (this == wlm)
 			return R.string.account_type_names_wlm;
 		else
@@ -68,6 +75,8 @@ public int getShortResource() {
 			return R.string.account_protocol_xmpp_title;
 		else if (this == gtalk)
 			return R.string.account_protocol_gtalk_title;
+		else if (this == wapp)
+			return R.string.account_protocol_wapp_title;
 		else if (this == wlm)
 			return R.string.account_protocol_wlm_title;
 		else

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

@@ -22,9 +22,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.jivesoftware.smack.WAConnection;
+
 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 +70,7 @@ public class ConnectionThread implements
 	/**
 	 * SMACK connection.
 	 */
-	private XMPPConnection xmppConnection;
+	private Connection xmppConnection;
 
 	/**
 	 * Thread holder for this connection.
@@ -144,7 +147,7 @@ public Thread newThread(Runnable runnable) {
 		started = false;
 	}
 
-	public XMPPConnection getXMPPConnection() {
+	public Connection getXMPPConnection() {
 		return xmppConnection;
 	}
 
@@ -318,7 +321,13 @@ private void onReady(final InetAddress address, final int port) {
 		connectionConfiguration.setSecurityMode(tlsMode.getSecurityMode());
 		connectionConfiguration.setCompressionEnabled(compression);
 
-		xmppConnection = new XMPPConnection(connectionConfiguration);
+		// Create different underlying classes depending on the protocol
+		AccountProtocol proto = connectionItem.getConnectionSettings().getProtocol();
+		if (proto == AccountProtocol.wapp) {
+			xmppConnection = new WAConnection(this, connectionConfiguration);
+		}else{
+			xmppConnection = new XMPPConnection(connectionConfiguration);
+		}
 		xmppConnection.addPacketListener(this, ACCEPT_ALL);
 		xmppConnection.forceAddConnectionListener(this);
 		connectionItem.onSRVResolved(this);
@@ -416,7 +425,8 @@ public void run() {
 	 */
 	private void connect(final String password) {
 		try {
-			xmppConnection.connect();
+			ConnectionSettings connectionSettings = connectionItem.getConnectionSettings();
+			xmppConnection.connect(connectionSettings.getUserName(), password, connectionSettings.getResource());
 		} catch (XMPPException e) {
 			checkForCertificateError(e);
 			if (!checkForSeeOtherHost(e)) {

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;
@@ -129,7 +130,7 @@ private void onLoaded(Collection<RoomChat> roomChats,
 	 * @param room
 	 * @return <code>null</code> if does not exists.
 	 */
-	private RoomChat getRoomChat(String account, String room) {
+	public RoomChat getRoomChat(String account, String room) {
 		AbstractChat chat = MessageManager.getInstance().getChat(account, room);
 		if (chat != null && chat instanceof RoomChat)
 			return (RoomChat) chat;
@@ -219,19 +220,20 @@ public void run() {
 	 * @param password
 	 */
 	public void createRoom(String account, String room, String nickname,
-			String password, boolean join) {
+			String password, boolean join, String subject) {
 		removeInvite(getInvite(account, room));
 		AbstractChat chat = MessageManager.getInstance().getChat(account, room);
 		RoomChat roomChat;
 		if (chat == null || !(chat instanceof RoomChat)) {
 			if (chat != null)
 				MessageManager.getInstance().removeChat(chat);
-			roomChat = new RoomChat(account, room, nickname, password);
+			roomChat = new RoomChat(account, room, nickname, password, subject);
 			MessageManager.getInstance().addChat(roomChat);
 		} else {
 			roomChat = (RoomChat) chat;
 			roomChat.setNickname(nickname);
 			roomChat.setPassword(password);
+			roomChat.setSubject(subject);
 		}
 		requestToWriteRoom(account, room, nickname, password, join);
 		if (join)
@@ -279,7 +281,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/com/xabber/android/data/extension/muc/RoomChat.java

@@ -82,6 +82,18 @@ public class RoomChat extends AbstractChat {
 	 * Invited user for the sent packet ID.
 	 */
 	private final Map<String, String> invites;
+
+	RoomChat(String account, String user, String nickname, String password, String subject) {
+		super(account, user);
+		this.nickname = nickname;
+		this.password = password;
+		requested = false;
+		state = RoomState.unavailable;
+		this.subject = subject;
+		multiUserChat = null;
+		occupants = new HashMap<String, Occupant>();
+		invites = new HashMap<String, String>();
+	}
 
 	RoomChat(String account, String user, String nickname, String password) {
 		super(account, user);
@@ -156,6 +168,10 @@ String getSubject() {
 		return subject;
 	}
 
+	void setSubject(String s) {
+		this.subject = s;
+	}
+
 	MultiUserChat getMultiUserChat() {
 		return multiUserChat;
 	}
@@ -486,4 +502,4 @@ protected void onDisconnect() {
 			setState(RoomState.waiting);
 	}
 
-}
+}