diff --git a/.classpath b/.classpath
index 2df25a2b6..63762c92a 100644
--- a/.classpath
+++ b/.classpath
@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="submodules/linphone/java/j2se"/>
 	<classpathentry kind="src" path="submodules/linphone/java/common"/>
 	<classpathentry kind="src" path="submodules/linphone/java/impl"/>
-	<classpathentry kind="src" path="submodules/externals/axmlrpc/src/main/java"/>
 	<classpathentry kind="src" path="submodules/linphone/coreapi/help/java"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
diff --git a/.gitmodules b/.gitmodules
index 6778bad1b..366481017 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,9 +55,6 @@
 [submodule "submodules/externals/libupnp"]
 	path = submodules/externals/libupnp
 	url = git://git.linphone.org/libupnp.git
-[submodule "submodules/externals/axmlrpc"]
-	path = submodules/externals/axmlrpc
-	url = git://git.linphone.org/axmlrpc.git
 [submodule "submodules/externals/opus"]
 	path = submodules/externals/opus
 	url = git://git.linphone.org/opus.git
diff --git a/ant.properties b/ant.properties
index 41ee35579..850216300 100644
--- a/ant.properties
+++ b/ant.properties
@@ -1,4 +1,4 @@
-source.dir=src:submodules/linphone/mediastreamer2/java/src:submodules/linphone/java/j2se:submodules/linphone/java/common:submodules/linphone/java/impl:submodules/linphone/coreapi/help/java:submodules/externals/axmlrpc/src/main/java
+source.dir=src:submodules/linphone/mediastreamer2/java/src:submodules/linphone/java/j2se:submodules/linphone/java/common:submodules/linphone/java/impl:submodules/linphone/coreapi/help/java
 key.store=bc-android.keystore
 key.alias=nw8000
 version.name=2.5.0
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 2994a8507..6c97b08a2 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -372,7 +372,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		if (lc == null) return;
 		
 		friend.edit();
-		friend.setFamillyName(lastName);
+		friend.setFamilyName(lastName);
 		friend.setGivenName(firstName);
 		
 		for (LinphoneAddress address : friend.getAddresses()) {
@@ -461,7 +461,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			}
 		} else if (isLinphoneFriend()) {
 			fullName = friend.getName();
-			lastName = friend.getFamillyName();
+			lastName = friend.getFamilyName();
 			firstName = friend.getGivenName();
 			thumbnailUri = null;
 			photoUri = null;
@@ -491,7 +491,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			createOrUpdateFriend();
 		} else if (isLinphoneFriend()) {
 			fullName = friend.getName();
-			lastName = friend.getFamillyName();
+			lastName = friend.getFamilyName();
 			firstName = friend.getGivenName();
 			thumbnailUri = null;
 			photoUri = null;
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 752ec431a..dd7699b61 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -25,16 +25,13 @@ import static android.media.AudioManager.STREAM_VOICE_CALL;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -81,14 +78,11 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
@@ -99,13 +93,10 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Environment;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.Vibrator;
-import android.provider.MediaStore;
-import android.provider.MediaStore.Images;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.telephony.TelephonyManager;
@@ -220,14 +211,19 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		routeAudioToSpeakerHelper(true);
 	}
 
-	public String getUserAgent() throws NameNotFoundException {
-		StringBuilder userAgent = new StringBuilder();
-		userAgent.append("LinphoneAndroid/" + mServiceContext.getPackageManager().getPackageInfo(mServiceContext.getPackageName(),0).versionCode);
-		userAgent.append(" (");
-		userAgent.append("Linphone/" + LinphoneManager.getLc().getVersion() + "; ");
-		userAgent.append(Build.DEVICE + " " + Build.MODEL + " Android/" + Build.VERSION.SDK_INT);
-		userAgent.append(")");
-		return userAgent.toString();
+	public String getUserAgent() {
+		try {
+			StringBuilder userAgent = new StringBuilder();
+			userAgent.append("LinphoneAndroid/" + mServiceContext.getPackageManager().getPackageInfo(mServiceContext.getPackageName(),0).versionCode);
+			userAgent.append(" (");
+			userAgent.append("Linphone/" + LinphoneManager.getLc().getVersion() + "; ");
+			userAgent.append(Build.DEVICE + " " + Build.MODEL + " Android/" + Build.VERSION.SDK_INT);
+			userAgent.append(")");
+			return userAgent.toString();
+		} catch (NameNotFoundException nnfe) {
+			Log.e(nnfe);
+		}
+		return null;
 	}
 
 	public void routeAudioToReceiver() {
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index be5b447b8..695284546 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -17,20 +17,22 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-import java.net.URL;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.linphone.LinphoneManager;
-import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.core.LinphoneProxyConfig;
+import org.linphone.core.LinphoneXmlRpcRequest;
+import org.linphone.core.LinphoneXmlRpcRequest.LinphoneXmlRpcRequestListener;
+import org.linphone.core.LinphoneXmlRpcRequestImpl;
+import org.linphone.core.LinphoneXmlRpcSession;
+import org.linphone.core.LinphoneXmlRpcSessionImpl;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Fragment;
-import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.Editable;
@@ -45,10 +47,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import de.timroes.axmlrpc.XMLRPCCallback;
-import de.timroes.axmlrpc.XMLRPCClient;
-import de.timroes.axmlrpc.XMLRPCException;
-import de.timroes.axmlrpc.XMLRPCServerException;
 /**
  * @author Sylvain Berfini
  */
@@ -63,6 +61,7 @@ public class CreateAccountFragment extends Fragment {
 	private boolean confirmPasswordOk = false;
 	private Button createAccount;
 	private final Pattern UPPER_CASE_REGEX = Pattern.compile("[A-Z]");
+	private LinphoneXmlRpcSession xmlRpcSession;
 	
 	private String getUsername() {
 		String username = usernameEdit.getText().toString();
@@ -119,6 +118,8 @@ public class CreateAccountFragment extends Fragment {
     	        }
     	    }
     	}
+		
+		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), getString(R.string.wizard_url));
     	
 		return view;
 	}
@@ -145,58 +146,46 @@ public class CreateAccountFragment extends Fragment {
 	}
 	
 	private void isUsernameRegistred(final String username, final ImageView icon) {
+		final Runnable runNotOk = new Runnable() {
+			public void run() {
+				usernameOk = false;
+				displayError(usernameOk, usernameError, usernameEdit, LinphoneManager.getInstance().getContext().getString(R.string.wizard_username_unavailable));
+				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
+			}
+		};
+		final Runnable runOk = new Runnable() {
+			public void run() {
+				usernameOk = true;
+				displayError(usernameOk, usernameError, usernameEdit, "");
+				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
+			}
+		};
 		final Runnable runNotReachable = new Runnable() {
 			public void run() {
 				usernameOk = false;
-				displayError(usernameOk, usernameError, usernameEdit, getResources().getString(R.string.wizard_server_unavailable));
+				displayError(usernameOk, usernameError, usernameEdit, LinphoneManager.getInstance().getContext().getString(R.string.wizard_server_unavailable));
 				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
 			}
 		};
 		
-		try {
-			XMLRPCClient client = new XMLRPCClient(new URL(getString(R.string.wizard_url)));
-			
-			XMLRPCCallback listener = new XMLRPCCallback() {
-				Runnable runNotOk = new Runnable() {
-    				public void run() {
-    					usernameOk = false;
-						displayError(usernameOk, usernameError, usernameEdit, getResources().getString(R.string.wizard_username_unavailable));
-						createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
-					}
-	    		};
-	    		
-	    		Runnable runOk = new Runnable() {
-    				public void run() {
-						usernameOk = true;
-						displayError(usernameOk, usernameError, usernameEdit, "");
-						createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
-					}
-	    		};
-				
-			    public void onResponse(long id, Object result) {
-			    	int answer = (Integer) result;
-			    	if (answer != 0) {
-			    		mHandler.post(runNotOk);
-					}
-					else {
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("check_account", LinphoneXmlRpcRequest.ArgType.Int);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
+					int response = request.getIntResponse();
+					if (response != 0) {
+						mHandler.post(runNotOk);
+					} else {
 						mHandler.post(runOk);
 					}
-			    }
-			    
-			    public void onError(long id, XMLRPCException error) {
-			    	mHandler.post(runNotReachable);
-			    }
-			   
-			    public void onServerError(long id, XMLRPCServerException error) {
-			    	mHandler.post(runNotReachable);
-			    }
-			};
-
-		    client.callAsync(listener, "check_account", username);
-		} 
-		catch(Exception ex) {
-			mHandler.post(runNotReachable);
-		}
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
+					mHandler.post(runNotReachable);
+				}
+			}
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	private boolean isEmailCorrect(String email) {
@@ -209,53 +198,43 @@ public class CreateAccountFragment extends Fragment {
 	}
 	
 	private void createAccount(final String username, final String password, String email, boolean suscribe) {
+		final Runnable runNotOk = new Runnable() {
+			public void run() {
+				//TODO errorMessage.setText(R.string.wizard_failed);
+			}
+		};
+		final Runnable runOk = new Runnable() {
+			public void run() {
+				AssistantActivity.instance().displayAssistantConfirm(username, password);
+			}
+		};
 		final Runnable runNotReachable = new Runnable() {
 			public void run() {
-				//TODO errorMessage.setText(R.string.wizard_server_unavailable);
+				//TODO errorMessage.setText(R.string.wizard_not_reachable);
 			}
 		};
 		
-		final Context context = AssistantActivity.instance() == null ? LinphoneService.instance().getApplicationContext() : AssistantActivity.instance();
-		
-		try {
-			XMLRPCClient client = new XMLRPCClient(new URL(context.getString(R.string.wizard_url)));
-			
-			XMLRPCCallback listener = new XMLRPCCallback() {
-				Runnable runNotOk = new Runnable() {
-    				public void run() {
-    					//TODO errorMessage.setText(R.string.wizard_failed);
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("create_account_with_useragent", LinphoneXmlRpcRequest.ArgType.Int);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
+					int response = request.getIntResponse();
+					if (response != 0) {
+						mHandler.post(runNotOk);
+					} else {
+						mHandler.post(runOk);
 					}
-	    		};
-	    		
-	    		Runnable runOk = new Runnable() {
-    				public void run() {
-						AssistantActivity.instance().displayAssistantConfirm(username, password);
-					}
-	    		};
-	    		
-			    public void onResponse(long id, Object result) {
-			    	int answer = (Integer) result;
-			    	if (answer != 0) {
-			    		mHandler.post(runNotOk);
-			    	} else {
-			    		mHandler.post(runOk);
-			    	}
-			    }
-			    
-			    public void onError(long id, XMLRPCException error) {
-			    	mHandler.post(runNotReachable);
-			    }
-			   
-			    public void onServerError(long id, XMLRPCServerException error) {
-			    	mHandler.post(runNotReachable);
-			    }
-			};
-
-		    client.callAsync(listener, "create_account_with_useragent", username, password, email, LinphoneManager.getInstance().getUserAgent());
-		} 
-		catch(Exception ex) {
-			mHandler.post(runNotReachable);
-		}
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
+					mHandler.post(runNotReachable);
+				}
+			}
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(password);
+		xmlRpcRequest.addStringArg(email);
+		xmlRpcRequest.addStringArg(LinphoneManager.getInstance().getUserAgent());
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	private void addXMLRPCUsernameHandler(final EditText field, final ImageView icon) {
diff --git a/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java b/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
index c35a5d487..528733d61 100644
--- a/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
+++ b/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
@@ -19,35 +19,37 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-import java.net.URL;
-
 import org.linphone.LinphoneManager;
 import org.linphone.R;
-import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreListenerBase;
+import org.linphone.core.LinphoneXmlRpcRequest;
+import org.linphone.core.LinphoneXmlRpcRequest.LinphoneXmlRpcRequestListener;
+import org.linphone.core.LinphoneXmlRpcRequestImpl;
+import org.linphone.core.LinphoneXmlRpcSession;
+import org.linphone.core.LinphoneXmlRpcSessionImpl;
 import org.linphone.mediastream.Log;
 
+import android.app.Fragment;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import de.timroes.axmlrpc.XMLRPCCallback;
-import de.timroes.axmlrpc.XMLRPCClient;
-import de.timroes.axmlrpc.XMLRPCException;
-import de.timroes.axmlrpc.XMLRPCServerException;
 
 /**
  * @author Ghislain MARY
  */
-public class EchoCancellerCalibrationFragment extends Fragment {
+public class EchoCancellerCalibrationFragment extends Fragment implements LinphoneXmlRpcRequestListener {
 	private Handler mHandler = new Handler();
 	private boolean mSendEcCalibrationResult = false;
 	private LinphoneCoreListenerBase mListener;
+	private LinphoneXmlRpcSession xmlRpcSession;
+	private LinphoneXmlRpcRequest xmlRpcRequest;
+	private Runnable runFinished;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -56,7 +58,7 @@ public class EchoCancellerCalibrationFragment extends Fragment {
 		
 		mListener = new LinphoneCoreListenerBase(){
 			@Override
-			public void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data) {
+			public void ecCalibrationStatus(LinphoneCore lc, LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data) {
 				LinphoneManager.getInstance().routeAudioToReceiver();
 				if (mSendEcCalibrationResult) {
 					sendEcCalibrationResult(status, delay_ms);
@@ -65,6 +67,15 @@ public class EchoCancellerCalibrationFragment extends Fragment {
 				}
 			}
 		};
+		runFinished = new Runnable() {
+			public void run() {
+				AssistantActivity.instance().isEchoCalibrationFinished();
+			}
+		};
+		
+		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), getString(R.string.wizard_url));
+		xmlRpcRequest = new LinphoneXmlRpcRequestImpl("add_ec_calibration_result", LinphoneXmlRpcRequest.ArgType.None);
+		xmlRpcRequest.setListener(this);
 
 		try {
 			LinphoneManager.getInstance().startEcCalibration(mListener);
@@ -79,34 +90,19 @@ public class EchoCancellerCalibrationFragment extends Fragment {
 		mSendEcCalibrationResult = enabled;
 	}
 
+	@Override
+	public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+		mHandler.post(runFinished);
+	}
+
 	private void sendEcCalibrationResult(EcCalibratorStatus status, int delayMs) {
-		try {
-			XMLRPCClient client = new XMLRPCClient(new URL(getString(R.string.wizard_url)));
-
-			XMLRPCCallback listener = new XMLRPCCallback() {
-				Runnable runFinished = new Runnable() {
-    				public void run() {
-    					AssistantActivity.instance().isEchoCalibrationFinished();
-					}
-	    		};
-
-			    public void onResponse(long id, Object result) {
-		    		mHandler.post(runFinished);
-			    }
-
-			    public void onError(long id, XMLRPCException error) {
-			    	mHandler.post(runFinished);
-			    }
-
-			    public void onServerError(long id, XMLRPCServerException error) {
-			    	mHandler.post(runFinished);
-			    }
-			};
-
-			Boolean hasBuiltInEchoCanceler = LinphoneManager.getLc().hasBuiltInEchoCanceler();
-			Log.i("Add echo canceller calibration result: manufacturer=" + Build.MANUFACTURER + " model=" + Build.MODEL + " status=" + status + " delay=" + delayMs + "ms" + " hasBuiltInEchoCanceler " + hasBuiltInEchoCanceler);
-		    client.callAsync(listener, "add_ec_calibration_result", Build.MANUFACTURER, Build.MODEL, status.toString(), delayMs, hasBuiltInEchoCanceler);
-		}
-		catch(Exception ex) {}
+		Boolean hasBuiltInEchoCanceler = LinphoneManager.getLc().hasBuiltInEchoCanceler();
+		Log.i("Add echo canceller calibration result: manufacturer=" + Build.MANUFACTURER + " model=" + Build.MODEL + " status=" + status + " delay=" + delayMs + "ms" + " hasBuiltInEchoCanceler " + hasBuiltInEchoCanceler);
+		xmlRpcRequest.addStringArg(Build.MANUFACTURER);
+		xmlRpcRequest.addStringArg(Build.MODEL);
+		xmlRpcRequest.addStringArg(status.toString());
+		xmlRpcRequest.addIntArg(delayMs);
+		xmlRpcRequest.addIntArg(hasBuiltInEchoCanceler ? 1 : 0);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 }
diff --git a/src/org/linphone/purchase/InAppPurchaseHelper.java b/src/org/linphone/purchase/InAppPurchaseHelper.java
index 729aabb25..5174d2063 100644
--- a/src/org/linphone/purchase/InAppPurchaseHelper.java
+++ b/src/org/linphone/purchase/InAppPurchaseHelper.java
@@ -339,7 +339,8 @@ public class InAppPurchaseHelper {
 	}
 	
 	private Purchasable verifySignature(String payload, String signature) {
-		XmlRpcHelper helper = new XmlRpcHelper();
+		// TODO FIXME rework to be async
+		/*XmlRpcHelper helper = new XmlRpcHelper();
 		if (helper.verifySignature(payload, signature)) {
 			try {
 				JSONObject json = new JSONObject(payload);
@@ -350,7 +351,7 @@ public class InAppPurchaseHelper {
 			} catch (JSONException e) {
 				Log.e(e);
 			}
-		}
+		}*/
 		return null;
 	}
 	
diff --git a/src/org/linphone/xmlrpc/XmlRpcHelper.java b/src/org/linphone/xmlrpc/XmlRpcHelper.java
index 25d543b8b..3cecd89eb 100644
--- a/src/org/linphone/xmlrpc/XmlRpcHelper.java
+++ b/src/org/linphone/xmlrpc/XmlRpcHelper.java
@@ -1,16 +1,14 @@
 package org.linphone.xmlrpc;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-
+import org.linphone.LinphoneManager;
 import org.linphone.LinphonePreferences;
+import org.linphone.core.LinphoneXmlRpcRequest;
+import org.linphone.core.LinphoneXmlRpcRequest.LinphoneXmlRpcRequestListener;
+import org.linphone.core.LinphoneXmlRpcRequestImpl;
+import org.linphone.core.LinphoneXmlRpcSession;
+import org.linphone.core.LinphoneXmlRpcSessionImpl;
 import org.linphone.mediastream.Log;
 
-import de.timroes.axmlrpc.XMLRPCCallback;
-import de.timroes.axmlrpc.XMLRPCClient;
-import de.timroes.axmlrpc.XMLRPCException;
-import de.timroes.axmlrpc.XMLRPCServerException;
-
 public class XmlRpcHelper {
     public static final String SERVER_ERROR_INVALID_ACCOUNT = "ERROR_INVALID_ACCOUNT";
     public static final String SERVER_ERROR_PURCHASE_CANCELLED = "ERROR_PURCHASE_CANCELLED";
@@ -22,259 +20,119 @@ public class XmlRpcHelper {
     
     public static final String CLIENT_ERROR_INVALID_SERVER_URL = "INVALID_SERVER_URL";
     public static final String CLIENT_ERROR_SERVER_NOT_REACHABLE = "SERVER_NOT_REACHABLE";
-    
-    private XMLRPCClient mXmlRpcClient;
+
+	private LinphoneXmlRpcSession xmlRpcSession;
 
     public XmlRpcHelper() {
-    	try {
-    		mXmlRpcClient = new XMLRPCClient(new URL(LinphonePreferences.instance().getInAppPurchaseValidatingServerUrl()));
-		} catch (MalformedURLException e) {
-			Log.e(e);
-		}
+		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), LinphonePreferences.instance().getInAppPurchaseValidatingServerUrl());
     }
 	
 	public void createAccountAsync(final XmlRpcListener listener, String username, String email, String password) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("createAccountAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("create_account", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
 						return;
 					}
-					
 					listener.onAccountCreated(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "create_account", username, email, password == null ? "" : password);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String createAccount(String username, String email, String password) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("create_account", username, email, password == null ? "" : password);
-				String result = (String)object;
-				Log.d("createAccount: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(email);
+		xmlRpcRequest.addStringArg(password == null ? "" : password);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void getAccountExpireAsync(final XmlRpcListener listener, String username, String password) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("getAccountExpireAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("get_expiration_for_account", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
 						return;
 					}
-					
 					listener.onAccountExpireFetched(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "get_expiration_for_account", username, password);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String getAccountExpire(String username, String password) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("get_expiration_for_account", username, password);
-				String result = (String)object;
-				Log.d("getAccountExpire: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(password);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void updateAccountExpireAsync(final XmlRpcListener listener, String username, String password, String payload, String signature) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("updateAccountExpireAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("update_expiration_date", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
 						return;
 					}
-					
 					listener.onAccountExpireUpdated(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "update_expiration_date", username, password, payload, signature);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String updateAccountExpire(String username, String password, String payload, String signature) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("update_expiration_date", username, password, payload, signature);
-				String result = (String)object;
-				Log.d("updateAccountExpire: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(password);
+		xmlRpcRequest.addStringArg(payload);
+		xmlRpcRequest.addStringArg(signature);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void activateAccountAsync(final XmlRpcListener listener, String username, String password) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("activateAccountAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("activate_account", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
 						return;
 					}
-					
 					listener.onAccountActivated(result);
-			    	return;
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "activate_account", username, password);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String activateAccount(String gmailAccount, String username, String password) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("activate_account", username, password);
-				String result = (String)object;
-				Log.d("activateAccount: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(password);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void isAccountActivatedAsync(final XmlRpcListener listener, String username) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("isAccountActivatedAsync: " + result);
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("check_account_activated", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if ("OK".equals(result)) {
 						listener.onAccountActivatedFetched(true);
 						return;
@@ -283,100 +141,45 @@ public class XmlRpcHelper {
 						listener.onError(result);
 					}
 					listener.onAccountActivatedFetched(false);
-				}
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "check_account_activated", username);
-		}
-	}
-	
-	public boolean isAccountActivated(String username) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("check_account_activated", username);
-				String result = (String)object;
-				Log.d("isAccountActivated: " + result);
-				
-				if ("OK".equals(result)) {
-					return true;
-				} else if (!"ERROR_ACCOUNT_NOT_ACTIVATED".equals(result)) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
+					listener.onError(result);
 				}
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return false;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void isTrialAccountAsync(final XmlRpcListener listener, String username, String password) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("isTrialAccountAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("check_account_trial", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (!"NOK".equals(result) && !"OK".equals(result)) {
 						listener.onError(result);
 					}
 					listener.onAccountFetched("OK".equals(result));
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
+					Log.e(result);
+					listener.onError(result);
 				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "check_account_trial", username, password);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public boolean isTrialAccount(String username, String password) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("check_account_trial", username, password);
-				String result = (String)object;
-				Log.d("isTrialAccount: " + result);
-				
-				return "OK".equals(result);
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return false;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(password);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void isAccountAsync(final XmlRpcListener listener, String username) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("isAccountAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("check_account_activated", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if ("OK".equals(result)) {
 						listener.onAccountFetched(true);
 						return;
@@ -385,55 +188,23 @@ public class XmlRpcHelper {
 						listener.onError(result);
 					}
 					listener.onAccountFetched(false);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "check_account_activated", username);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public boolean isAccount(String username) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("check_account_activated", username);
-				String result = (String)object;
-				Log.d("isAccount: " + result);
-				
-				if ("OK".equals(result)) {
-					return true;
-				} else if (!"ERROR_ACCOUNT_DOESNT_EXIST".equals(result)) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
+					listener.onError(result);
 				}
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return false;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void changeAccountEmailAsync(final XmlRpcListener listener, String username, String password, String newEmail) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("changeAccountEmailAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("change_email", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
@@ -441,56 +212,25 @@ public class XmlRpcHelper {
 					}
 					
 					listener.onAccountEmailChanged(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "change_email", username, password, newEmail);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String changeAccountEmail(String username, String password, String newEmail) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("change_email", username, password, newEmail);
-				String result = (String)object;
-				Log.d("changeAccountEmail: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(password);
+		xmlRpcRequest.addStringArg(newEmail);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void changeAccountPasswordAsync(final XmlRpcListener listener, String username, String oldPassword, String newPassword) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("changeAccountPasswordAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("change_password", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
@@ -498,56 +238,25 @@ public class XmlRpcHelper {
 					}
 					
 					listener.onAccountPasswordChanged(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "change_password", username, oldPassword, newPassword);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String changeAccountPassword(String username, String oldPassword, String newPassword) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("change_password", username, oldPassword, newPassword);
-				String result = (String)object;
-				Log.d("changeAccountPassword: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(oldPassword);
+		xmlRpcRequest.addStringArg(newPassword);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void changeAccountHashPasswordAsync(final XmlRpcListener listener, String username, String oldPassword, String newPassword) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("changeAccountHashPasswordAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("change_hash", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
@@ -555,56 +264,25 @@ public class XmlRpcHelper {
 					}
 					
 					listener.onAccountPasswordChanged(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "change_hash", username, oldPassword, newPassword);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String changeAccountHashPassword(String username, String oldPassword, String newPassword) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("change_hash", username, oldPassword, newPassword);
-				String result = (String)object;
-				Log.d("changeAccountHashPassword: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(oldPassword);
+		xmlRpcRequest.addStringArg(newPassword);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void sendRecoverPasswordLinkByEmailAsync(final XmlRpcListener listener, String usernameOrEmail) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("sendRecoverPasswordLinkByEmailAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("send_reset_account_password_email", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
@@ -612,56 +290,23 @@ public class XmlRpcHelper {
 					}
 					
 					listener.onRecoverPasswordLinkSent(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "send_reset_account_password_email", usernameOrEmail);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String sendRecoverPasswordLinkByEmail(String usernameOrEmail) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("send_reset_account_password_email", usernameOrEmail);
-				String result = (String)object;
-				Log.d("sendRecoverPasswordLinkByEmail: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(usernameOrEmail);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void sendActivateAccountLinkByEmailAsync(final XmlRpcListener listener, String usernameOrEmail) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("sendActivateAccountLinkByEmailAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("resend_activation_email", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
@@ -669,56 +314,23 @@ public class XmlRpcHelper {
 					}
 					
 					listener.onActivateAccountLinkSent(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "resend_activation_email", usernameOrEmail);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String sendActivateAccountLinkByEmail(String usernameOrEmail) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("resend_activation_email", usernameOrEmail);
-				String result = (String)object;
-				Log.d("sendActivateAccountLinkByEmail: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(usernameOrEmail);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void sendUsernameByEmailAsync(final XmlRpcListener listener, String email) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("sendUsernameByEmailAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("recover_username_from_email", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
@@ -726,56 +338,23 @@ public class XmlRpcHelper {
 					}
 					
 					listener.onUsernameSent(result);
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "recover_username_from_email", email);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public String sendUsernameByEmail(String email) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("recover_username_from_email", email);
-				String result = (String)object;
-				Log.d("sendUsernameByEmail: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return null;
+					listener.onError(result);
 				}
-				return result;
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return null;
+		});
+		xmlRpcRequest.addStringArg(email);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
 	public void verifySignatureAsync(final XmlRpcListener listener, String payload, String signature) {
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-				
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("verifySignatureAsync: " + result);
-					
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("verify_payload_signature", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
@@ -783,56 +362,24 @@ public class XmlRpcHelper {
 					}
 					
 					listener.onSignatureVerified("OK".equals(result));
-				}
-				
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "verify_payload_signature", payload, signature);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-	}
-	
-	public boolean verifySignature(String payload, String signature) {
-		if (mXmlRpcClient != null) {
-			try {
-				Object object = mXmlRpcClient.call("verify_payload_signature", payload, signature);
-				String result = (String)object;
-				Log.d("verifySignature: " + result);
-				
-				if (result.startsWith("ERROR_")) {
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
-					return false;
+					listener.onError(result);
 				}
-				return "OK".equals(result);
-				
-			} catch (XMLRPCException e) {
-				Log.e(e);
 			}
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
-		return false;
+		});
+		xmlRpcRequest.addStringArg(payload);
+		xmlRpcRequest.addStringArg(signature);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 
-	public void getRemoteProvisioningFilenameAsync(final XmlRpcListener listener,String username, String domain, String password){
-		if (mXmlRpcClient != null) {
-			mXmlRpcClient.callAsync(new XMLRPCCallback() {
-				@Override
-				public void onServerError(long id, XMLRPCServerException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-
-				@Override
-				public void onResponse(long id, Object object) {
-					String result = (String)object;
-					Log.d("getRemoteProvisioningFilenameAsync: " + result);
-
+	public void getRemoteProvisioningFilenameAsync(final XmlRpcListener listener,String username, String domain, String password) {
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("get_remote_provisioning_filename", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				String result = request.getStringResponse();
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);
@@ -840,17 +387,15 @@ public class XmlRpcHelper {
 					}
 
 					listener.onRemoteProvisioningFilenameSent(result);
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
+					Log.e(result);
+					listener.onError(result);
 				}
-
-				@Override
-				public void onError(long id, XMLRPCException error) {
-					Log.e(error);
-					listener.onError(error.toString());
-				}
-			}, "get_remote_provisioning_filename", username, domain, password);
-		} else {
-			Log.e(CLIENT_ERROR_INVALID_SERVER_URL);
-			listener.onError(CLIENT_ERROR_INVALID_SERVER_URL);
-		}
+			}
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(domain);
+		xmlRpcRequest.addStringArg(password);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 }
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 856a7ce3d..9daabd3db 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 856a7ce3dc94e61c4c1d5796b1bdb8dbaaee10b4
+Subproject commit 9daabd3dbfc72d6799f6bd54474a8f262e6716f2
diff --git a/submodules/externals/axmlrpc b/submodules/externals/axmlrpc
deleted file mode 160000
index c47eaa453..000000000
--- a/submodules/externals/axmlrpc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c47eaa453fb75d55d32304413672c16706af85e0
diff --git a/submodules/linphone b/submodules/linphone
index eb17eca54..7bd469baa 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit eb17eca54aba68112788af79d81bd2614c3ef6f6
+Subproject commit 7bd469baa080f657cfe3fd015f58ae32f57dbafc