From 22eed4eb6f92c7f51d484689743b76557bfb263c Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 27 Jul 2016 16:00:21 +0200
Subject: [PATCH 01/36] Add phone number in account creation

---
 res/layout/assistant_account_creation.xml     | 274 +++++++++-----
 ...stant_account_creation_code_activation.xml |  61 +++
 ...ant_account_creation_email_activation.xml} |   0
 res/layout/assistant_country_list.xml         |  59 +++
 res/layout/country_cell.xml                   |  23 ++
 res/raw/countries.json                        | 246 ++++++++++++
 res/raw/linphonerc_factory                    |   3 +
 res/values/non_localizable_custom.xml         |   1 +
 res/values/strings.xml                        |  13 +-
 src/org/linphone/LinphoneActivity.java        |   2 +
 src/org/linphone/LinphonePreferences.java     |  19 +-
 .../linphone/assistant/AssistantActivity.java |  80 +++-
 .../assistant/AssistantFragmentsEnum.java     |   2 +
 .../assistant/CountryListFragment.java        | 213 +++++++++++
 .../CreateAccountActivationFragment.java      |   4 +-
 .../CreateAccountCodeActivationFragment.java  | 145 +++++++
 .../assistant/CreateAccountFragment.java      | 358 +++++++++++++++---
 src/org/linphone/xmlrpc/XmlRpcHelper.java     |   5 +-
 18 files changed, 1346 insertions(+), 162 deletions(-)
 create mode 100644 res/layout/assistant_account_creation_code_activation.xml
 rename res/layout/{assistant_account_creation_activation.xml => assistant_account_creation_email_activation.xml} (100%)
 create mode 100644 res/layout/assistant_country_list.xml
 create mode 100644 res/layout/country_cell.xml
 create mode 100755 res/raw/countries.json
 create mode 100644 src/org/linphone/assistant/CountryListFragment.java
 create mode 100644 src/org/linphone/assistant/CreateAccountCodeActivationFragment.java

diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index 336b117a4..ea6bb13ea 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -26,13 +26,96 @@
 			android:layout_height="wrap_content"/>
 
 		<LinearLayout
+			android:id="@+id/phone_number_layout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:gravity="center"
 			android:layout_marginTop="30dp"
 			android:orientation="vertical">
 
+			<Button
+				android:id="@+id/select_country"
+				style="@style/font8"
+				android:text="@string/select_your_country"
+				android:background="@drawable/resizable_assistant_button"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"/>
+
 			<LinearLayout
+				android:orientation="vertical"
+				android:layout_marginTop="10dp"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:id="@+id/phone_number_label"
+					android:text="@string/phone_number"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<LinearLayout
+					android:orientation="horizontal"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<EditText
+						android:id="@+id/dial_code"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="phone"
+						android:layout_marginRight="10dp"
+						android:layout_width="50dp"
+						android:layout_height="40dp"
+						android:singleLine="true"/>
+
+					<EditText
+						android:id="@+id/phone_number"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:contentDescription="@string/content_description_phone_number_field"
+						android:inputType="phone"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:singleLine="true"/>
+
+				</LinearLayout>
+
+				<TextView
+					android:id="@+id/phone_number_error"
+					android:text="@string/error"
+					style="@style/font20"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"/>
+
+				<TextView
+					android:id="@+id/sip_uri"
+					style="@style/font9"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+			</LinearLayout>
+
+			<CheckBox
+				android:id="@+id/use_username"
+				android:visibility="gone"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="Don't use phone number as username"/>
+
+			<CheckBox
+				android:id="@+id/use_email"
+				android:visibility="gone"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="Don't use phone number for account activation"/>
+
+
+			<LinearLayout
+				android:id="@+id/username_layout"
+				android:visibility="gone"
 				android:orientation="vertical"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
@@ -66,115 +149,124 @@
 			</LinearLayout>
 
 			<LinearLayout
+				android:id="@+id/email_layout"
+				android:visibility="gone"
 				android:orientation="vertical"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
 
-				<TextView
-					android:id="@+id/password_label"
-					style="@style/font13"
-					android:text="@string/password"
-					android:textAllCaps="true"
+				<LinearLayout
+					android:orientation="vertical"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"/>
+					android:layout_height="wrap_content">
 
-				<EditText
-					android:id="@+id/password"
-					android:background="@drawable/resizable_textfield"
-					android:textColor="@color/colorB"
-					android:inputType="textPassword"
-					android:textCursorDrawable="@null"
+					<TextView
+						android:id="@+id/password_label"
+						style="@style/font13"
+						android:text="@string/password"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<EditText
+						android:id="@+id/password"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="textPassword"
+						android:textCursorDrawable="@null"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:paddingLeft="10dp"
+						android:paddingRight="10dp"
+						android:singleLine="true"/>
+
+					<TextView
+						android:id="@+id/password_error"
+						android:text="@string/error"
+						style="@style/font20"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:visibility="invisible"/>
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:orientation="vertical"
 					android:layout_width="match_parent"
-					android:layout_height="40dp"
-					android:paddingLeft="10dp"
-					android:paddingRight="10dp"
-					android:singleLine="true"/>
+					android:layout_height="wrap_content">
 
-				<TextView
-					android:id="@+id/password_error"
-					android:text="@string/error"
-					style="@style/font20"
+					<TextView
+						android:id="@+id/confirm_password_label"
+						android:text="@string/confirm_password"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<EditText
+						android:id="@+id/confirm_password"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="textPassword"
+						android:contentDescription="@string/content_description_confirm_password_field"
+						android:textCursorDrawable="@null"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:paddingLeft="10dp"
+						android:paddingRight="10dp"
+						android:singleLine="true"/>
+
+					<TextView
+						android:id="@+id/confirm_password_error"
+						android:text="@string/error"
+						style="@style/font20"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:visibility="invisible"/>
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:orientation="vertical"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"/>
+					android:layout_height="wrap_content">
 
-			</LinearLayout>
+					<TextView
+						android:id="@+id/email_label"
+						android:text="@string/email"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
 
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
+					<EditText
+						android:id="@+id/email"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="textEmailAddress"
+						android:contentDescription="@string/content_description_email_field"
+						android:textCursorDrawable="@null"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:paddingLeft="10dp"
+						android:paddingRight="10dp"
+						android:singleLine="true"/>
 
-				<TextView
-					android:id="@+id/confirm_password_label"
-					android:text="@string/confirm_password"
-					style="@style/font13"
-					android:textAllCaps="true"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"/>
+					<TextView
+						android:id="@+id/email_error"
+						android:text="@string/error"
+						style="@style/font20"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:visibility="invisible"/>
 
-				<EditText
-					android:id="@+id/confirm_password"
-					android:background="@drawable/resizable_textfield"
-					android:textColor="@color/colorB"
-					android:inputType="textPassword"
-					android:contentDescription="@string/content_description_confirm_password_field"
-					android:textCursorDrawable="@null"
-					android:layout_width="match_parent"
-					android:layout_height="40dp"
-					android:paddingLeft="10dp"
-					android:paddingRight="10dp"
-					android:singleLine="true"/>
-
-				<TextView
-					android:id="@+id/confirm_password_error"
-					android:text="@string/error"
-					style="@style/font20"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<TextView
-					android:id="@+id/email_label"
-					android:text="@string/email"
-					style="@style/font13"
-					android:textAllCaps="true"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"/>
-
-				<EditText
-					android:id="@+id/email"
-					android:background="@drawable/resizable_textfield"
-					android:textColor="@color/colorB"
-					android:inputType="textEmailAddress"
-					android:contentDescription="@string/content_description_email_field"
-					android:textCursorDrawable="@null"
-					android:layout_width="match_parent"
-					android:layout_height="40dp"
-					android:paddingLeft="10dp"
-					android:paddingRight="10dp"
-					android:singleLine="true"/>
-
-				<TextView
-					android:id="@+id/email_error"
-					android:text="@string/error"
-					style="@style/font20"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"/>
+				</LinearLayout>
 
 			</LinearLayout>
 
 			<Button
 				android:id="@+id/assistant_create"
-				android:text="@string/assistant_create_account"
+				android:text="@string/assistant_continue"
 				android:background="@drawable/assistant_button"
 				android:textColor="@drawable/assistant_button_text_color"
 				style="@style/font8"
diff --git a/res/layout/assistant_account_creation_code_activation.xml b/res/layout/assistant_account_creation_code_activation.xml
new file mode 100644
index 000000000..47a8a13f1
--- /dev/null
+++ b/res/layout/assistant_account_creation_code_activation.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="30dp"
+		android:gravity="center_horizontal"
+		android:orientation="vertical" >
+
+		<TextView
+			android:text="@string/assistant_create_account"
+			style="@style/font6"
+			android:textAllCaps="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+
+		<TextView
+			android:text="@string/assistant_create_account_part_2"
+			style="@style/font11"
+			android:paddingTop="10dp"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+
+		<TextView
+			android:text="@string/assistant_validate_code"
+			style="@style/font11"
+			android:paddingTop="10dp"
+			android:gravity="center"
+			android:layout_gravity="center"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_code"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorB"
+			android:contentDescription="@string/content_description_activation_code_field"
+			android:inputType="text|textNoSuggestions"
+			android:gravity="center_vertical|center_horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:singleLine="true"/>
+
+		<Button
+			android:id="@+id/assistant_check"
+			android:text="@string/assistant_activate"
+			android:background="@drawable/assistant_button"
+			android:textColor="@drawable/assistant_button_text_color"
+			style="@style/font8"
+			android:layout_width="wrap_content"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:layout_marginTop="20dp"/>
+
+	</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/assistant_account_creation_activation.xml b/res/layout/assistant_account_creation_email_activation.xml
similarity index 100%
rename from res/layout/assistant_account_creation_activation.xml
rename to res/layout/assistant_account_creation_email_activation.xml
diff --git a/res/layout/assistant_country_list.xml b/res/layout/assistant_country_list.xml
new file mode 100644
index 000000000..21d1f431b
--- /dev/null
+++ b/res/layout/assistant_country_list.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/assistant_choose_country"
+            style="@style/font6"
+            android:singleLine="true"
+            android:gravity="center_vertical|center" />
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp">
+
+        <EditText
+            android:id="@+id/search_country"
+            android:textCursorDrawable="@null"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:textColor="@android:color/black"
+            android:background="@drawable/resizable_textfield"
+            android:gravity="center"
+            android:inputType="textPersonName"/>
+
+        <ImageView
+            android:id="@+id/clearSearchField"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:src="@drawable/clean_field_default"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"/>
+
+    </RelativeLayout>
+
+    <ListView
+        android:id="@+id/countryList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@color/colorE"
+        android:cacheColorHint="@color/transparent"
+        android:dividerHeight="1dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/country_cell.xml b/res/layout/country_cell.xml
new file mode 100644
index 000000000..1c3aa4502
--- /dev/null
+++ b/res/layout/country_cell.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_gravity="center"
+    android:layout_height="40dp"
+    android:padding="5dp">
+
+    <TextView
+        android:id="@+id/country_name"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        style="@style/font6"/>
+
+    <TextView
+        android:id="@+id/country_prefix"
+        style="@style/font6"
+        android:paddingLeft="5dp"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/raw/countries.json b/res/raw/countries.json
new file mode 100755
index 000000000..534135a4c
--- /dev/null
+++ b/res/raw/countries.json
@@ -0,0 +1,246 @@
+[
+ {"name":"Afghanistan","dial_code":"+93","code":"AF","maxNum":"9"},
+ {"name":"Albania","dial_code":"+355","code":"AL","maxNum":"9"},
+ {"name":"Algeria","dial_code":"+213","code":"DZ","maxNum":"9"},
+ {"name":"AmericanSamoa","dial_code":"+1 684","code":"AS","maxNum":"10"},
+ {"name":"Andorra","dial_code":"+376","code":"AD","maxNum":"6"},
+ {"name":"Angola","dial_code":"+244","code":"AO","maxNum":"9"},
+ {"name":"Anguilla","dial_code":"+1 264","code":"AI","maxNum":"10"},
+ {"name":"Antigua and Barbuda","dial_code":"+1268","code":"AG","maxNum":"10"},
+ {"name":"Argentina","dial_code":"+54","code":"AR","maxNum":"10"},
+ {"name":"Armenia","dial_code":"+374","code":"AM","maxNum":"8"},
+ {"name":"Aruba","dial_code":"+297","code":"AW","maxNum":"7"},
+ {"name":"Australia","dial_code":"+61","code":"AU","maxNum":"9"},
+ {"name":"Austria","dial_code":"+43","code":"AT","maxNum":"10"},
+ {"name":"Azerbaijan","dial_code":"+994","code":"AZ","maxNum":"9"},
+ {"name":"Bahamas","dial_code":"+1 242","code":"BS","maxNum":"10"},
+ {"name":"Bahrain","dial_code":"+973","code":"BH","maxNum":"8"},
+ {"name":"Bangladesh","dial_code":"+880","code":"BD","maxNum":"10"},
+ {"name":"Barbados","dial_code":"+1 246","code":"BB","maxNum":"10"},
+ {"name":"Belarus","dial_code":"+375","code":"BY","maxNum":"9"},
+ {"name":"Belgium","dial_code":"+32","code":"BE","maxNum":"9"},
+ {"name":"Belize","dial_code":"+501","code":"BZ","maxNum":"7"},
+ {"name":"Benin","dial_code":"+229","code":"BJ","maxNum":"8"},
+ {"name":"Bermuda","dial_code":"+1 441","code":"BM","maxNum":"10"},
+ {"name":"Bhutan","dial_code":"+975","code":"BT","maxNum":"8"},
+ {"name":"Bolivia","dial_code":"+591","code":"BO","maxNum":"8"},
+ {"name":"Bosnia and Herzegovina","dial_code":"+387","code":"BA","maxNum":"8"},
+ {"name":"Botswana","dial_code":"+267","code":"BW","maxNum":"8"},
+ {"name":"Brazil","dial_code":"+55","code":"BR","maxNum":"10"},
+ {"name":"Brunei Darussalam","dial_code":"+673","code":"BN","maxNum":"7"},
+ {"name":"British Indian Ocean Territory","dial_code":"+246","code":"IO","maxNum":"0"},
+ {"name":"Bulgaria","dial_code":"+359","code":"BG","maxNum":"9"},
+ {"name":"Burkina Faso","dial_code":"+226","code":"BF","maxNum":"8"},
+ {"name":"Burundi","dial_code":"+257","code":"BI","maxNum":"8"},
+ {"name":"Cambodia","dial_code":"+855","code":"KH","maxNum":"9"},
+ {"name":"Cameroon","dial_code":"+237","code":"CM","maxNum":"8"},
+ {"name":"Canada","dial_code":"+1","code":"CA","maxNum":"10"},
+ {"name":"Cape Verde","dial_code":"+238","code":"CV","maxNum":"7"},
+ {"name":"Cayman Islands","dial_code":"+ 345","code":"KY","maxNum":"10"},
+ {"name":"Central African Republic","dial_code":"+236","code":"CF","maxNum":"8"},
+ {"name":"Chad","dial_code":"+235","code":"TD","maxNum":"8"},
+ {"name":"Chile","dial_code":"+56","code":"CL","maxNum":"9"},
+ {"name":"China","dial_code":"+86","code":"CN","maxNum":"11"},
+ {"name":"Christmas Island","dial_code":"+61","code":"CX","maxNum":"0"},
+ {"name":"Colombia","dial_code":"+57","code":"CO","maxNum":"10"},
+ {"name":"Comoros","dial_code":"+269","code":"KM","maxNum":"7"},
+ {"name":"Congo","dial_code":"+242","code":"CG","maxNum":"9"},
+ {"name":"Congo,Democratic Republic","dial_code":"+243","code":"CD","maxNum":"9"},
+ {"name":"Cook Islands","dial_code":"+682","code":"CK","maxNum":"5"},
+ {"name":"Costa Rica","dial_code":"+506","code":"CR","maxNum":"8"},
+ {"name":"Cote d'Ivoire","dial_code":"+225","code":"CI","maxNum":"8"},
+ {"name":"Croatia","dial_code":"+385","code":"HR","maxNum":"9"},
+ {"name":"Cuba","dial_code":"+53","code":"CU","maxNum":"8"},
+ {"name":"Cyprus","dial_code":"+537","code":"CY","maxNum":"8"},
+ {"name":"Czech Republic","dial_code":"+420","code":"CZ","maxNum":"9"},
+ {"name":"Denmark","dial_code":"+45","code":"DK","maxNum":"8"},
+ {"name":"Djibouti","dial_code":"+253","code":"DJ","maxNum":"8"},
+ {"name":"Dominica","dial_code":"+1 767","code":"DM","maxNum":"10"},
+ {"name":"Dominican Republic","dial_code":"+1 849","code":"DO","maxNum":"10"},
+ {"name":"Ecuador","dial_code":"+593","code":"EC","maxNum":"9"},
+ {"name":"Egypt","dial_code":"+20","code":"EG","maxNum":"10"},
+ {"name":"El Salvador","dial_code":"+503","code":"SV","maxNum":"8"},
+ {"name":"Equatorial Guinea","dial_code":"+240","code":"GQ","maxNum":"9"},
+ {"name":"Eritrea","dial_code":"+291","code":"ER","maxNum":"7"},
+ {"name":"Estonia","dial_code":"+372","code":"EE","maxNum":"8"},
+ {"name":"Ethiopia","dial_code":"+251","code":"ET","maxNum":"9"},
+ {"name":"Falkland Islands","dial_code":"+500","code":"FK","maxNum":"5"},
+ {"name":"Faroe Islands","dial_code":"+298","code":"FO","maxNum":"6"},
+ {"name":"Fiji","dial_code":"+679","code":"FJ","maxNum":"7"},
+ {"name":"Finland","dial_code":"+358","code":"FI","maxNum":"9"},
+ {"name":"France","dial_code":"+33","code":"FR","maxNum":"9"},
+ {"name":"French Guiana","dial_code":"+594","code":"GF","maxNum":"9"},
+ {"name":"French Polynesia","dial_code":"+689","code":"PF","maxNum":"6"},
+ {"name":"Gabon","dial_code":"+241","code":"GA","maxNum":"8"},
+ {"name":"Gambia","dial_code":"+220","code":"GM","maxNum":"7"},
+ {"name":"Georgia","dial_code":"+995","code":"GE","maxNum":"9"},
+ {"name":"Germany","dial_code":"+49","code":"DE","maxNum":"11"},
+ {"name":"Ghana","dial_code":"+233","code":"GH","maxNum":"9"},
+ {"name":"Gibraltar","dial_code":"+350","code":"GI","maxNum":"8"},
+ {"name":"Greece","dial_code":"+30","code":"GR","maxNum":"10"},
+ {"name":"Greenland","dial_code":"+299","code":"GL","maxNum":"6"},
+ {"name":"Grenada","dial_code":"+1 473","code":"GD","maxNum":"10"},
+ {"name":"Guadeloupe","dial_code":"+590","code":"GP","maxNum":"9"},
+ {"name":"Guam","dial_code":"+1 671","code":"GU","maxNum":"10"},
+ {"name":"Guatemala","dial_code":"+502","code":"GT","maxNum":"8"},
+ {"name":"Guinea","dial_code":"+224","code":"GN","maxNum":"8"},
+ {"name":"Guinea-Bissau","dial_code":"+245","code":"GW","maxNum":"7"},
+ {"name":"Guyana","dial_code":"+595","code":"GY","maxNum":"7"},
+ {"name":"Haiti","dial_code":"+509","code":"HT","maxNum":"8"},
+ {"name":"Honduras","dial_code":"+504","code":"HN","maxNum":"8"},
+ {"name":"Hong Kong","dial_code":"+852","code":"HK","maxNum":"8"},
+ {"name":"Hungary","dial_code":"+36","code":"HU","maxNum":"9"},
+ {"name":"Iceland","dial_code":"+354","code":"IS","maxNum":"9"},
+ {"name":"India","dial_code":"+91","code":"IN","maxNum":"10"},
+ {"name":"Indonesia","dial_code":"+62","code":"ID","maxNum":"10"},
+ {"name":"Iran, Islamic Republic of","dial_code":"+98","code":"IR","maxNum":"10"},
+ {"name":"Iraq","dial_code":"+964","code":"IQ","maxNum":"10"},
+ {"name":"Ireland","dial_code":"+353","code":"IE","maxNum":"9"},
+ {"name":"Israel","dial_code":"+972","code":"IL","maxNum":"9"},
+ {"name":"Italy","dial_code":"+39","code":"IT","maxNum":"10"},
+ {"name":"Jamaica","dial_code":"+1 876","code":"JM","maxNum":"10"},
+ {"name":"Japan","dial_code":"+81","code":"JP","maxNum":"10"},
+ {"name":"Jordan","dial_code":"+962","code":"JO","maxNum":"9"},
+ {"name":"Kazakhstan","dial_code":"+7 7","code":"KZ","maxNum":"10"},
+ {"name":"Kenya","dial_code":"+254","code":"KE","maxNum":"9"},
+ {"name":"Kiribati","dial_code":"+686","code":"KI","maxNum":"5"},
+ {"name":"Korea, People's Rep.","dial_code":"+850","code":"KP","maxNum":"12"},
+ {"name":"Korea, Republic of","dial_code":"+82","code":"KR","maxNum":"12"},
+ {"name":"Kuwait","dial_code":"+965","code":"KW","maxNum":"8"},
+ {"name":"Kyrgyzstan","dial_code":"+996","code":"KG","maxNum":"9"},
+ {"name":"Lao People's Democratic Rep.","dial_code":"+856","code":"LA","maxNum":"10"},
+ {"name":"Latvia","dial_code":"+371","code":"LV","maxNum":"8"},
+ {"name":"Lebanon","dial_code":"+961","code":"LB","maxNum":"7"},
+ {"name":"Lesotho","dial_code":"+266","code":"LS","maxNum":"8"},
+ {"name":"Libyan Arab Jamahiriya","dial_code":"+218","code":"LY","maxNum":"8"},
+ {"name":"Liberia","dial_code":"+231","code":"LR","maxNum":"8"},
+ {"name":"Liechtenstein","dial_code":"+423","code":"LI","maxNum":"7"},
+ {"name":"Lithuania","dial_code":"+370","code":"LT","maxNum":"8"},
+ {"name":"Luxembourg","dial_code":"+352","code":"LU","maxNum":"9"},
+ {"name":"Macao","dial_code":"+853","code":"MO","maxNum":"8"},
+ {"name":"Macedonia","dial_code":"+389","code":"MK","maxNum":"8"},
+ {"name":"Micronesia","dial_code":"+691","code":"FM","maxNum":"7"},
+ {"name":"Madagascar","dial_code":"+261","code":"MG","maxNum":"9"},
+ {"name":"Malawi","dial_code":"+265","code":"MW","maxNum":"9"},
+ {"name":"Malaysia","dial_code":"+60","code":"MY","maxNum":"9"},
+ {"name":"Maldives","dial_code":"+960","code":"MV","maxNum":"7"},
+ {"name":"Mali","dial_code":"+223","code":"ML","maxNum":"8"},
+ {"name":"Malta","dial_code":"+356","code":"MT","maxNum":"8"},
+ {"name":"Marshall Islands","dial_code":"+692","code":"MH","maxNum":"7"},
+ {"name":"Martinique","dial_code":"+596","code":"MQ","maxNum":"9"},
+ {"name":"Mauritania","dial_code":"+222","code":"MR","maxNum":"8"},
+ {"name":"Mauritius","dial_code":"+230","code":"MU","maxNum":"7"},
+ {"name":"Mayotte","dial_code":"+262","code":"YT","maxNum":"9"},
+ {"name":"Mexico","dial_code":"+52","code":"MX","maxNum":"10"},
+ {"name":"Moldova, Republic of","dial_code":"+373","code":"MD","maxNum":"8"},
+ {"name":"Monaco","dial_code":"+377","code":"MC","maxNum":"8"},
+ {"name":"Mongolia","dial_code":"+976","code":"MN","maxNum":"8"},
+ {"name":"Montenegro","dial_code":"+382","code":"ME","maxNum":"8"},
+ {"name":"Montserrat","dial_code":"+1664","code":"MS","maxNum":"10"},
+ {"name":"Morocco","dial_code":"+212","code":"MA","maxNum":"9"},
+ {"name":"Mozambique","dial_code":"+258","code":"MZ","maxNum":"9"},
+ {"name":"Myanmar","dial_code":"+95","code":"MM","maxNum":"8"},
+ {"name":"Namibia","dial_code":"+264","code":"NA","maxNum":"9"},
+ {"name":"Nauru","dial_code":"+674","code":"NR","maxNum":"7"},
+ {"name":"Nepal","dial_code":"+977","code":"NP","maxNum":"10"},
+ {"name":"Netherlands","dial_code":"+31","code":"NL","maxNum":"9"},
+ {"name":"Netherlands Antilles","dial_code":"+599","code":"AN","maxNum":"0"},
+ {"name":"New Caledonia","dial_code":"+687","code":"NC","maxNum":"6"},
+ {"name":"New Zealand","dial_code":"+64","code":"NZ","maxNum":"10"},
+ {"name":"Nicaragua","dial_code":"+505","code":"NI","maxNum":"8"},
+ {"name":"Niger","dial_code":"+227","code":"NE","maxNum":"8"},
+ {"name":"Nigeria","dial_code":"+234","code":"NG","maxNum":"10"},
+ {"name":"Niue","dial_code":"+683","code":"NU","maxNum":"4"},
+ {"name":"Norfolk Island","dial_code":"+672","code":"NF","maxNum":"5"},
+ {"name":"Northern Mariana Islands","dial_code":"+1 670","code":"MP","maxNum":"10"},
+ {"name":"Norway","dial_code":"+47","code":"NO","maxNum":"8"},
+ {"name":"Oman","dial_code":"+968","code":"OM","maxNum":"8"},
+ {"name":"Pakistan","dial_code":"+92","code":"PK","maxNum":"10"},
+ {"name":"Palau","dial_code":"+680","code":"PW","maxNum":"7"},
+ {"name":"Palestine","dial_code":"+970","code":"PS","maxNum":"9"},
+ {"name":"Panama","dial_code":"+507","code":"PA","maxNum":"8"},
+ {"name":"Papua New Guinea","dial_code":"+675","code":"PG","maxNum":"8"},
+ {"name":"Paraguay","dial_code":"+595","code":"PY","maxNum":"9"},
+ {"name":"Peru","dial_code":"+51","code":"PE","maxNum":"9"},
+ {"name":"Philippines","dial_code":"+63","code":"PH","maxNum":"10"},
+ {"name":"Poland","dial_code":"+48","code":"PL","maxNum":"9"},
+ {"name":"Portugal","dial_code":"+351","code":"PT","maxNum":"9"},
+ {"name":"Puerto Rico","dial_code":"+1 939","code":"PR","maxNum":"10"},
+ {"name":"Qatar","dial_code":"+974","code":"QA","maxNum":"8"},
+ {"name":"Romania","dial_code":"+40","code":"RO","maxNum":"9"},
+ {"name":"Russian Federation","dial_code":"+7","code":"RU","maxNum":"10"},
+ {"name":"Rwanda","dial_code":"+250","code":"RW","maxNum":"9"},
+ {"name":"Réunion Island","dial_code":"+262","code":"RE","maxNum":"9"},
+ {"name":"Saint Barthélemy","dial_code":"+590","code":"BL","maxNum":"0"},
+ {"name":"Saint Helena","dial_code":"+290","code":"SH","maxNum":"4"},
+ {"name":"Saint Kitts and Nevis","dial_code":"+1 869","code":"KN","maxNum":"10"},
+ {"name":"Saint Lucia","dial_code":"+1 758","code":"LC","maxNum":"10"},
+ {"name":"Saint Martin","dial_code":"+590","code":"MF","maxNum":"0"},
+ {"name":"Saint Pierre and Miquelon","dial_code":"+508","code":"PM","maxNum":"6"},
+ {"name":"Saint Vincent","dial_code":"+1 784","code":"VC","maxNum":"10"},
+ {"name":"Sao Tome and Principe","dial_code":"+239","code":"ST","maxNum":"7"},
+ {"name":"Somalia","dial_code":"+252","code":"SO","maxNum":"8"},
+ {"name":"Svalbard and Jan Mayen","dial_code":"+47","code":"SJ","maxNum":"0"},
+ {"name":"Syrian Arab Republic","dial_code":"+963","code":"SY","maxNum":"9"},
+ {"name":"Samoa","dial_code":"+685","code":"WS","maxNum":"7"},
+ {"name":"San Marino","dial_code":"+378","code":"SM","maxNum":"10"},
+ {"name":"Saudi Arabia","dial_code":"+966","code":"SA","maxNum":"9"},
+ {"name":"Senegal","dial_code":"+221","code":"SN","maxNum":"9"},
+ {"name":"Serbia","dial_code":"+381","code":"RS","maxNum":"9"},
+ {"name":"Seychelles","dial_code":"+248","code":"SC","maxNum":"7"},
+ {"name":"Sierra Leone","dial_code":"+232","code":"SL","maxNum":"8"},
+ {"name":"Singapore","dial_code":"+65","code":"SG","maxNum":"8"},
+ {"name":"Slovakia","dial_code":"+421","code":"SK","maxNum":"9"},
+ {"name":"Slovenia","dial_code":"+386","code":"SI","maxNum":"8"},
+ {"name":"Solomon Islands","dial_code":"+677","code":"SB","maxNum":"7"},
+ {"name":"South Africa","dial_code":"+27","code":"ZA","maxNum":"9"},
+ {"name":"South Georgia Islands","dial_code":"+500","code":"GS","maxNum":"0"},
+ {"name":"Spain","dial_code":"+34","code":"ES","maxNum":"9"},
+ {"name":"Sri Lanka","dial_code":"+94","code":"LK","maxNum":"9"},
+ {"name":"Sudan","dial_code":"+249","code":"SD","maxNum":"9"},
+ {"name":"Suriname","dial_code":"+597","code":"SR","maxNum":"7"},
+ {"name":"Swaziland","dial_code":"+268","code":"SZ","maxNum":"8"},
+ {"name":"Sweden","dial_code":"+46","code":"SE","maxNum":"9"},
+ {"name":"Switzerland","dial_code":"+41","code":"CH","maxNum":"9"},
+ {"name":"Taiwan","dial_code":"+886","code":"TW","maxNum":"9"},
+ {"name":"Tajikistan","dial_code":"+992","code":"TJ","maxNum":"9"},
+ {"name":"Tanzania, United Republic of","dial_code":"+255","code":"TZ","maxNum":"9"},
+ {"name":"Thailand","dial_code":"+66","code":"TH","maxNum":"9"},
+ {"name":"Togo","dial_code":"+228","code":"TG","maxNum":"8"},
+ {"name":"Tokelau","dial_code":"+690","code":"TK","maxNum":"4"},
+ {"name":"Tonga","dial_code":"+676","code":"TO","maxNum":"5"},
+ {"name":"Trinidad and Tobago","dial_code":"+1 868","code":"TT","maxNum":"10"},
+ {"name":"Tunisia","dial_code":"+216","code":"TN","maxNum":"8"},
+ {"name":"Turkey","dial_code":"+90","code":"TR","maxNum":"10"},
+ {"name":"Turkmenistan","dial_code":"+993","code":"TM","maxNum":"8"},
+ {"name":"Turks and Caicos Islands","dial_code":"+1 649","code":"TC","maxNum":"7"},
+ {"name":"Tuvalu","dial_code":"+688","code":"TV","maxNum":"5"},
+ {"name":"Uganda","dial_code":"+256","code":"UG","maxNum":"9"},
+ {"name":"Ukraine","dial_code":"+380","code":"UA","maxNum":"9"},
+ {"name":"United Arab Emirates","dial_code":"+971","code":"AE","maxNum":"9"},
+ {"name":"United Kingdom","dial_code":"+44","code":"GB","maxNum":"10"},
+ {"name":"United States","dial_code":"+1","code":"US","maxNum":"10"},
+ {"name":"Uruguay","dial_code":"+598","code":"UY","maxNum":"8"},
+ {"name":"Uzbekistan","dial_code":"+998","code":"UZ","maxNum":"9"},
+ {"name":"Vanuatu","dial_code":"+678","code":"VU","maxNum":"7"},
+ {"name":"Venezuela","dial_code":"+58","code":"VE","maxNum":"10"},
+ {"name":"VietNam","dial_code":"+84","code":"VN","maxNum":"9"},
+ {"name":"Wallis and Futuna","dial_code":"+681","code":"WF","maxNum":"5"},
+ {"name":"Yemen","dial_code":"+967","code":"YE","maxNum":"9"},
+ {"name":"Zambia","dial_code":"+260","code":"ZM","maxNum":"9"},
+ {"name":"Zimbabwe","dial_code":"+263","code":"ZW","maxNum":"9"},
+ {"name":"Cocos (Keeling) Islands","dial_code":"+61","code":"CC","maxNum":"0"},
+ {"name":"Guernsey","dial_code":"+44","code":"GG","maxNum":"0"},
+ {"name":"Holy See (Vatican City State)","dial_code":"+379","code":"VA","maxNum":"0"},
+ {"name":"Isle of Man","dial_code":"+44","code":"IM","maxNum":"0"},
+ {"name":"Jersey","dial_code":"+44","code":"JE","maxNum":"0"},
+ {"name":"Pitcairn","dial_code":"+872","code":"PN","maxNum":"0"},
+ {"name":"Timor-Leste","dial_code":"+670","code":"TL","maxNum":"0"},
+ {"name":"Virgin Islands, British","dial_code":"+1 284","code":"VG","maxNum":"0"},
+ {"name":"Virgin Islands, U.S.","dial_code":"+1 340","code":"VI","maxNum":"0"}]
+
+
+
+
+
+
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 648a0ab83..dbad902d8 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -33,6 +33,9 @@ ec_calibrator_cool_tones=1
 [misc]
 max_calls=10
 
+[app]
+activation_code_length=4
+
 [in-app-purchase]
 server_url=https://www.linphone.org/xmlrpc.php
 purchasable_items_ids=test_account_subscription
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index d3931db50..5906afea7 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -9,6 +9,7 @@
 	<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! -->
 
 	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool>
+	<bool name="assistant_allow_username">true</bool> <!-- Allow to use an username instead of the phone number for account creation -->
 	<bool name="hide_in_call_stats">false</bool>
 	<bool name="orientation_portrait_only">false</bool>
 	<bool name="show_statusbar_only_on_dialer">false</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7d6534af1..cac212ef7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,6 +23,7 @@
 
 	<!-- Common -->
 	<string name="username">Username</string>
+	<string name="phone_number">Phone number</string>
 	<string name="display_name">Display name</string>
 	<string name="password">Password</string>
 	<string name="confirm_password">Password confirmation</string>
@@ -54,8 +55,11 @@
 	<string name="welcome">Welcome</string>
 	<string name="assistant">Assistant</string>
 	<string name="assistant_create_account">Create account</string>
+	<string name="assistant_continue">Continue</string>
+	<string name="assistant_activate">Activate account</string>
 	<string name="assistant_finish">Finish configuration</string>
 	<string name="assistant_validate_account">Your account is created. Please check your mails to validate your account. Once it is done, come back here and click on the button.</string>
+	<string name="assistant_validate_code">Enter your activation code</string>
 	<string name="assistant_welcome_desc">This assistant will help you to use a SIP account for your calls.</string>
 	<string name="assistant_linphone_login_desc">Enter your username and password of Linphone account</string>
 	<string name="assistant_login_desc">Enter your username and password with your SIP domain</string>
@@ -83,13 +87,18 @@
 	<string name="wizard_failed">An error occurred, try again later.</string>
 	<string name="wizard_server_unavailable">Server unreachable, verify your network connection.</string>
 	<string name="wizard_username_unavailable">This username is already in use.</string>
+	<string name="assistant_phone_number_unavailable">This phone number is already in use.</string>
 	<string name="wizard_username_incorrect">Your username is invalid.</string>
+	<string name="assistant_phone_number_incorrect">Your phone number is invalid.</string>
 	<string name="wizard_email_incorrect">Your email is invalid.</string>
 	<string name="wizard_password_incorrect">Your password is invalid</string>
 	<string name="wizard_passwords_unmatched">Passwords do not match.</string>
 	<string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from your input to match requirements.\r\nDo you accept?</string>
 	<string name="first_launch_no_login_password">Please enter your login and password</string>
 	<string name="forgot_password">Forgot password ?</string>
+	<string name="assistant_choose_country">Choose a country</string>
+	<string name="select_your_country">Select your Country</string>
+	<string name="country_code">(%s)</string>
 
 	<!-- Dailer -->
 	<string name="address_bar_hint">Enter a number or an address</string>
@@ -107,7 +116,6 @@
 	<string name="delete_contacts">Do you want to delete selected contacts?</string>
 	<string name="delete_contact">Do you want to delete selected contact?</string>
 	<string name="sip_address">SIP address</string>
-	<string name="phone_number">Phone number</string>
 	<string name="contact_first_name">First name</string>
 	<string name="contact_last_name">Last name</string>
 	<string name="contact_organization">Organization</string>
@@ -350,6 +358,7 @@
 	<string name="content_description_new_discussion">New discussion</string>
 	<string name="content_description_search">Search</string>
 	<string name="content_description_search_contact">Search contact</string>
+	<string name="content_description_search_country">Search country</string>
 	<string name="content_description_all_contacts">All contacts</string>
 	<string name="content_description_linphone_contacts">Linphone contacts</string>
 	<string name="content_description_call_direction">Call direction</string>
@@ -369,6 +378,8 @@
 	<string name="content_description_message_status">Message status</string>
 	<string name="content_description_conference">Conference</string>
 	<string name="content_description_username_field">Username field</string>
+	<string name="content_description_activation_code_field">Username field</string>
+	<string name="content_description_phone_number_field">Phone number field</string>
 	<string name="content_description_display_field">Display name field</string>
 	<string name="content_description_domain_field">Domain field</string>
 	<string name="content_description_url_field">Remote provisioning field</string>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 0fb419a5f..8d29ac598 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -968,6 +968,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 	private int mAlwaysChangingPhoneAngle = -1;
 
+
+
 	private class LocalOrientationEventListener extends OrientationEventListener {
 		public LocalOrientationEventListener(Context context) {
 			super(context);
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 1c806a06c..6bf3ab9ab 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -198,6 +198,7 @@ public class LinphonePreferences {
 		private String tempDisplayName;
 		private String tempUserId;
 		private String tempPassword;
+		private String tempHa1;
 		private String tempDomain;
 		private String tempProxy;
 		private String tempRealm;
@@ -238,6 +239,11 @@ public class LinphonePreferences {
 			return this;
 		}
 
+		public AccountBuilder setHa1(String ha1) {
+			tempHa1 = ha1;
+			return this;
+		}
+
 		public AccountBuilder setDomain(String domain) {
 			tempDomain = domain;
 			return this;
@@ -363,7 +369,7 @@ public class LinphonePreferences {
 			if(tempRealm != null)
 				prxCfg.setRealm(tempRealm);
 
-			LinphoneAuthInfo authInfo = LinphoneCoreFactory.instance().createAuthInfo(tempUsername, tempUserId, tempPassword, null, null, tempDomain);
+			LinphoneAuthInfo authInfo = LinphoneCoreFactory.instance().createAuthInfo(tempUsername, tempUserId, tempPassword, tempHa1, tempRealm, tempDomain);
 
 			lc.addProxyConfig(prxCfg);
 			lc.addAuthInfo(authInfo);
@@ -520,6 +526,13 @@ public class LinphonePreferences {
 		}
 	}
 
+	public void setAccountHa1(int n, String ha1) {
+		if(getAccountDomain(n) != null && getAccountUsername(n) != null) {
+			LinphoneAuthInfo authInfo = LinphoneCoreFactory.instance().createAuthInfo(getAccountUsername(n), null, null, ha1, null, getAccountDomain(n));
+			LinphoneManager.getLc().addAuthInfo(authInfo);
+		}
+	}
+
 	public String getAccountPassword(int n) {
 		LinphoneAuthInfo authInfo = getAuthInfo(n);
 		return authInfo == null ? null : authInfo.getPassword();
@@ -1357,4 +1370,8 @@ public class LinphonePreferences {
 	public void enableAutoAnswer(boolean enable) {
 		getConfig().setBool("app", "auto_answer", enable);
 	}
+
+	public int getCodeLength(){
+		return getConfig().getInt("app", "activation_code_length", 0);
+	}
 }
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 810587812..d4090a3e0 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -17,6 +17,7 @@ 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 org.linphone.LinphoneActivity;
 import org.linphone.LinphoneManager;
 import org.linphone.LinphonePreferences;
@@ -79,6 +80,12 @@ private static AssistantActivity instance;
 	private boolean remoteProvisioningInProgress;
 	private boolean echoCancellerAlreadyDone;
 	private static final int PERMISSIONS_REQUEST_RECORD_AUDIO = 201;
+	private static final int PERMISSIONS_READ_PHONE_STATE = 202;
+
+	public CountryListFragment.Country country;
+	public String phone_number;
+	public String email;
+	public String activation_code;
 	
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -104,9 +111,9 @@ private static AssistantActivity instance;
 			echoCancellerAlreadyDone = false;
 		}
         mPrefs = LinphonePreferences.instance();
-		//if(mPrefs.isFirstLaunch()) {
-			status.enableSideMenu(false);
-		//}
+		status.enableSideMenu(false);
+
+		checkAndRequestReadPhoneState();
         
         mListener = new LinphoneCoreListenerBase() {
         	@Override
@@ -234,6 +241,8 @@ private static AssistantActivity instance;
 			back.setVisibility(View.INVISIBLE);
 		} else if (currentFragment == AssistantFragmentsEnum.WELCOME) {
 			finish();
+		} else if (currentFragment == AssistantFragmentsEnum.COUNTRY_CHOOSER){
+			displayCreateAccount();
 		}
 	}
 
@@ -245,14 +254,22 @@ private static AssistantActivity instance;
 		}
 	}
 
+	public void checkAndRequestReadPhoneState() {
+		checkAndRequestPermission(Manifest.permission.READ_PHONE_STATE, 0);
+	}
+
 	public void checkAndRequestAudioPermission() {
-		int recordAudio = getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName());
-		Log.i("[Permission] Record audio permission is " + (recordAudio == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
-		
-		if (recordAudio != PackageManager.PERMISSION_GRANTED) {
-			if (LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.RECORD_AUDIO) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.RECORD_AUDIO)) {
-				Log.i("[Permission] Asking for record audio");
-				ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.RECORD_AUDIO}, PERMISSIONS_REQUEST_RECORD_AUDIO);
+		checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, 0);
+	}
+
+	public void checkAndRequestPermission(String permission, int result) {
+		int permissionGranted = getPackageManager().checkPermission(permission, getPackageName());
+		Log.i("[Permission] " + permission + " is " + (permissionGranted == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
+
+		if (permissionGranted != PackageManager.PERMISSION_GRANTED) {
+			if (LinphonePreferences.instance().firstTimeAskingForPermission(permission) || ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {
+				Log.i("[Permission] Asking for " + permission);
+				ActivityCompat.requestPermissions(this, new String[] { permission }, result);
 			}
 		}
 	}
@@ -262,15 +279,13 @@ private static AssistantActivity instance;
 		for (int i = 0; i < permissions.length; i++) {
 			Log.i("[Permission] " + permissions[i] + " is " + (grantResults[i] == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
 		}
-		
+
 		if (requestCode == PERMISSIONS_REQUEST_RECORD_AUDIO) {
 			if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
 				launchEchoCancellerCalibration(true);
 			} else {
 				isEchoCalibrationFinished();
 			}
-		} else {
-			isEchoCalibrationFinished();
 		}
 	}
 
@@ -291,11 +306,11 @@ private static AssistantActivity instance;
 	}
 
 	private void logIn(String username, String password, String displayName, String domain, TransportType transport, boolean sendEcCalibrationResult) {
-        saveCreatedAccount(username, password, displayName, domain, transport);
+		saveCreatedAccount(username, password, displayName, null, domain, transport);
 	}
 
 	public void checkAccount(String username, String password, String displayName, String domain) {
-		saveCreatedAccount(username, password, displayName, domain, null);
+		saveCreatedAccount(username, password, displayName, null, domain, null);
 	}
 
 	public void linphoneLogIn(String username, String password, String displayName, boolean validate) {
@@ -311,7 +326,7 @@ private static AssistantActivity instance;
 	}
 
 	public void genericLogIn(String username, String password, String displayName, String domain, TransportType transport) {
-		if(accountCreated) {
+		if (accountCreated) {
 			retryLogin(username, password, displayName, domain, transport);
 		} else {
 			logIn(username, password, displayName, domain, transport, false);
@@ -366,9 +381,16 @@ private static AssistantActivity instance;
 		back.setVisibility(View.VISIBLE);
 	}
 
+	public void displayCountryChooser() {
+		fragment = new CountryListFragment();
+		changeFragment(fragment);
+		currentFragment = AssistantFragmentsEnum.COUNTRY_CHOOSER;
+		back.setVisibility(View.VISIBLE);
+	}
+
 	public void retryLogin(String username, String password, String displayName, String domain, TransportType transport) {
 		accountCreated = false;
-		saveCreatedAccount(username, password, displayName, domain, transport);
+		saveCreatedAccount(username, password, displayName, null, domain, transport);
 	}
 
 	public void loadLinphoneConfig(){
@@ -392,7 +414,13 @@ private static AssistantActivity instance;
 		goToLinphoneActivity();
 	}
 
-	public void saveCreatedAccount(String username, String password, String displayName, String domain, TransportType transport) {
+	public String getPhoneWithCountry() {
+		if(country == null || phone_number == null) return "";
+		String phoneNumberWithCountry = country.dial_code + phone_number.replace("\\D", "");
+		return phoneNumberWithCountry;
+	}
+
+	public void saveCreatedAccount(String username, String password, String displayName, String ha1, String domain, TransportType transport) {
 		if (accountCreated)
 			return;
 
@@ -415,6 +443,7 @@ private static AssistantActivity instance;
 		.setUsername(username)
 		.setDomain(domain)
 		.setDisplayName(displayName)
+		.setHa1(ha1)
 		.setPassword(password);
 		
 		if (isMainAccountLinphoneDotOrg) {
@@ -461,6 +490,8 @@ private static AssistantActivity instance;
 			}
 		}
 
+
+
 		try {
 			builder.saveNewAccount();
 			if(!newAccount) {
@@ -508,6 +539,19 @@ private static AssistantActivity instance;
 		currentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT_ACTIVATION;
 		back.setVisibility(View.INVISIBLE);
 	}
+
+	public void displayAssistantCodeConfirm(String username, String phone) {
+		CreateAccountCodeActivationFragment fragment = new CreateAccountCodeActivationFragment();
+		newAccount = true;
+		Bundle extras = new Bundle();
+		extras.putString("Username", username);
+		extras.putString("Phone", phone);
+		fragment.setArguments(extras);
+		changeFragment(fragment);
+
+		currentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT_CODE_ACTIVATION;
+		back.setVisibility(View.INVISIBLE);
+	}
 	
 	public void isAccountVerified(String username) {
 		Toast.makeText(this, getString(R.string.assistant_account_validated), Toast.LENGTH_LONG).show();
diff --git a/src/org/linphone/assistant/AssistantFragmentsEnum.java b/src/org/linphone/assistant/AssistantFragmentsEnum.java
index 3f6cb5735..494ea5a21 100644
--- a/src/org/linphone/assistant/AssistantFragmentsEnum.java
+++ b/src/org/linphone/assistant/AssistantFragmentsEnum.java
@@ -24,7 +24,9 @@ public enum AssistantFragmentsEnum {
 	WELCOME,
 	CREATE_ACCOUNT,
 	CREATE_ACCOUNT_ACTIVATION,
+	CREATE_ACCOUNT_CODE_ACTIVATION,
 	LINPHONE_LOGIN,
+	COUNTRY_CHOOSER,
 	LOGIN,
 	REMOTE_PROVISIONING,
 	ECHO_CANCELLER_CALIBRATION,
diff --git a/src/org/linphone/assistant/CountryListFragment.java b/src/org/linphone/assistant/CountryListFragment.java
new file mode 100644
index 000000000..3c49dfdb5
--- /dev/null
+++ b/src/org/linphone/assistant/CountryListFragment.java
@@ -0,0 +1,213 @@
+package org.linphone.assistant;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.linphone.R;
+import org.linphone.mediastream.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CountryListFragment extends Fragment implements AdapterView.OnItemClickListener, View.OnClickListener {
+	private LayoutInflater mInflater;
+	private ListView list;
+	private EditText search;
+	private ImageView clearSearchField;
+	private CountryListAdapter adapter;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+							 Bundle savedInstanceState) {
+		mInflater = inflater;
+
+		View view = inflater.inflate(R.layout.assistant_country_list, container, false);
+		adapter = new CountryListAdapter(R.raw.countries, getActivity().getApplicationContext());
+
+		search = (EditText)view.findViewById(R.id.search_country);
+		clearSearchField = (ImageView) view.findViewById(R.id.clearSearchField);
+		clearSearchField.setOnClickListener(this);
+
+		list = (ListView)view.findViewById(R.id.countryList);
+		list.setAdapter(adapter);
+		list.setOnItemClickListener(this);
+
+		search.addTextChangedListener(new TextWatcher() {
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+			}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count) {
+				adapter.getFilter().filter(s);
+			}
+
+			@Override
+			public void afterTextChanged(Editable s) {
+
+			}
+		});
+
+		return view;
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		Country c = (Country)view.getTag();
+		AssistantActivity.instance().country = c;
+		AssistantActivity.instance().displayCreateAccount();
+	}
+
+	@Override
+	public void onClick(View v) {
+		if(v.getId() == R.id.clearSearchField) {
+			search.setText("");
+		}
+	}
+
+	/**
+	 * This class represents a Country. There's a name, dial_code, code and max number of digits.
+	 * It is constructed from a JSON object containing all these parameters.
+	 */
+	public class Country {
+		public String name;
+		public String dial_code;
+		public String code;
+		public int maxNum;
+
+		public Country(JSONObject obj ){
+			try {
+				name = obj.getString("name");
+				dial_code = obj.getString("dial_code");
+				code = obj.getString("code");
+				maxNum = obj.getInt("maxNum");
+			} catch (JSONException e){
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * This class reads a JSON file containing Country-specific phone number description,
+	 * and allows to present them into a ListView
+	 */
+	private class CountryListAdapter extends BaseAdapter implements Filterable {
+
+		private List<Country> allCountries;
+		private List<Country> filteredCountries;
+		private Context context;
+
+		public CountryListAdapter(int jsonId, Context ctx) {
+			context = ctx;
+			allCountries = new ArrayList<Country>();
+			String jsonString = loadJSONFromAsset(R.raw.countries);
+			try {
+				JSONArray c = new JSONArray(jsonString);
+				for( int i = 0; i < c.length(); i++) {
+					allCountries.add(new Country(c.getJSONObject(i)));
+				}
+				filteredCountries = allCountries;
+			} catch (JSONException e){
+				e.printStackTrace();
+			}
+		}
+
+		public String loadJSONFromAsset(int id) {
+			String json = null;
+			try {
+				InputStream is = getResources().openRawResource(id);
+				int size = is.available();
+				byte[] buffer = new byte[size];
+				is.read(buffer);
+				is.close();
+				json = new String(buffer, "UTF-8");
+			} catch (IOException ex) {
+				ex.printStackTrace();
+				return null;
+			}
+			return json;
+		}
+
+		@Override
+		public int getCount() {
+			return filteredCountries.size();
+		}
+
+		@Override
+		public Country getItem(int position) {
+			return filteredCountries.get(position);
+		}
+
+		@Override
+		public long getItemId(int position) {
+			return position;
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent){
+			View view = null;
+
+			if (convertView != null) {
+				view = convertView;
+			} else {
+				view = mInflater.inflate(R.layout.country_cell, parent, false);
+			}
+
+			Country c = filteredCountries.get(position);
+
+			TextView name = (TextView) view.findViewById(R.id.country_name);
+			name.setText(c.name);
+
+			TextView dial_code = (TextView) view.findViewById(R.id.country_prefix);
+			dial_code.setText(String.format(getString(R.string.country_code),c.dial_code));
+
+			view.setTag(c);
+			return view;
+		}
+
+		@Override
+		public Filter getFilter() {
+			return new Filter() {
+				@Override
+				protected FilterResults performFiltering(CharSequence constraint) {
+					ArrayList<Country> filteredCountries = new ArrayList<Country>();
+					for (Country c : allCountries) {
+						if (c.name.toLowerCase().contains(constraint) || c.dial_code.contains(constraint)){
+							filteredCountries.add(c);
+						}
+					}
+					FilterResults filterResults = new FilterResults();
+					filterResults.values = filteredCountries;
+					return filterResults;
+				}
+
+				@Override
+				@SuppressWarnings("unchecked")
+				protected void publishResults(CharSequence constraint, FilterResults results) {
+					filteredCountries = (List<Country>) results.values;
+					CountryListAdapter.this.notifyDataSetChanged();
+				}
+			};
+		}
+	}
+}
diff --git a/src/org/linphone/assistant/CreateAccountActivationFragment.java b/src/org/linphone/assistant/CreateAccountActivationFragment.java
index 0b1c7e721..de929db03 100644
--- a/src/org/linphone/assistant/CreateAccountActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountActivationFragment.java
@@ -48,7 +48,7 @@ public class CreateAccountActivationFragment extends Fragment implements Linphon
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.assistant_account_creation_activation, container, false);
+		View view = inflater.inflate(R.layout.assistant_account_creation_email_activation, container, false);
 		
 		username = getArguments().getString("Username");
 		password = getArguments().getString("Password");
@@ -71,7 +71,7 @@ public class CreateAccountActivationFragment extends Fragment implements Linphon
 		runOk = new Runnable() {
 			public void run() {
 				checkAccount.setEnabled(true);
-				AssistantActivity.instance().saveCreatedAccount(username,password,null, getString(R.string.default_domain),null);
+				AssistantActivity.instance().saveCreatedAccount(username, password, null,  null, getString(R.string.default_domain),null);
 				AssistantActivity.instance().isAccountVerified(username);
 			}
 		};
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
new file mode 100644
index 000000000..f874afc7b
--- /dev/null
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -0,0 +1,145 @@
+package org.linphone.assistant;
+/*
+CreateAccountActivationFragment.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program 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, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import org.linphone.LinphoneManager;
+import org.linphone.LinphonePreferences;
+import org.linphone.R;
+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.LinphoneXmlRpcSession;
+import org.linphone.core.LinphoneXmlRpcSessionImpl;
+import org.linphone.mediastream.Log;
+
+/**
+ * @author Sylvain Berfini
+ */
+public class CreateAccountCodeActivationFragment extends Fragment {
+	private String username, phone, ha1;
+	private EditText code;
+	private int code_length;
+	private Handler mHandler = new Handler();
+	private Button checkAccount;
+	private LinphoneXmlRpcSession xmlRpcSession;
+	
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.assistant_account_creation_code_activation, container, false);
+		
+		username = getArguments().getString("Username");
+		phone = getArguments().getString("Phone");
+		code_length = LinphonePreferences.instance().getCodeLength();
+
+		if(username == null || username.length() == 0){
+			username = phone;
+		}
+
+		code = (EditText) view.findViewById(R.id.assistant_code);
+		code.addTextChangedListener(new TextWatcher() {
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+			@Override
+			public void afterTextChanged(Editable s) {
+				if(s.length() == code_length){
+					checkAccount.setEnabled(true);
+				} else {
+					checkAccount.setEnabled(false);
+				}
+			}
+		});
+
+		checkAccount = (Button) view.findViewById(R.id.assistant_check);
+		checkAccount.setEnabled(false);
+		checkAccount.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				checkAccount.setEnabled(false);
+				activateAccount(phone, username, code.getText().toString(), false);
+			}
+		});
+
+		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), getString(R.string.wizard_url));
+
+		return view;
+	}
+
+	private void activateAccount(final String phone, final String username, final String code, boolean suscribe) {
+		final Runnable runNotOk = new Runnable() {
+			public void run() {
+				Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show();
+			}
+		};
+		final Runnable runOk = new Runnable() {
+			public void run() {
+				checkAccount.setEnabled(true);
+				AssistantActivity.instance().saveCreatedAccount(username, null, null, ha1, getString(R.string.default_domain), null);
+				AssistantActivity.instance().isAccountVerified(username);
+			}
+		};
+		final Runnable runNotReachable = new Runnable() {
+			public void run() {
+				Toast.makeText(getActivity(), getString(R.string.wizard_server_unavailable), Toast.LENGTH_LONG).show();
+			}
+		};
+
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("activate_phone_account", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
+					String response = request.getStringResponse();
+					if (response.contains("ERROR")) {
+						mHandler.post(runNotOk);
+					} else {
+						ha1 = response;
+						mHandler.post(runOk);
+					}
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
+					mHandler.post(runNotReachable);
+				}
+			}
+		});
+
+		xmlRpcRequest.addStringArg(phone);
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcRequest.addStringArg(code);
+		xmlRpcRequest.addStringArg(getString(R.string.default_domain));
+		xmlRpcSession.sendRequest(xmlRpcRequest);
+	}
+}
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index 695284546..3eeb7a937 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -29,14 +29,18 @@ import org.linphone.core.LinphoneXmlRpcRequest.LinphoneXmlRpcRequestListener;
 import org.linphone.core.LinphoneXmlRpcRequestImpl;
 import org.linphone.core.LinphoneXmlRpcSession;
 import org.linphone.core.LinphoneXmlRpcSessionImpl;
+import org.linphone.xmlrpc.XmlRpcHelper;
 
+import android.Manifest;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Fragment;
+import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.telephony.TelephonyManager;
 import android.text.Editable;
-import android.text.InputType;
 import android.text.TextWatcher;
 import android.util.Patterns;
 import android.view.LayoutInflater;
@@ -44,86 +48,226 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 /**
  * @author Sylvain Berfini
  */
-public class CreateAccountFragment extends Fragment {
+public class CreateAccountFragment extends Fragment implements CompoundButton.OnCheckedChangeListener, OnClickListener {
 	private Handler mHandler = new Handler();
-	private EditText usernameEdit, passwordEdit, passwordConfirmEdit, emailEdit;
-	private TextView usernameError, passwordError, passwordConfirmError, emailError;
+	private EditText phoneNumberEdit, usernameEdit, passwordEdit, passwordConfirmEdit, emailEdit, dialCode;
+	private TextView phoneNumberError, usernameError, passwordError, passwordConfirmError, emailError, sipUri;
 	
+	private boolean phoneNumberOk = false;
 	private boolean usernameOk = false;
 	private boolean passwordOk = false;
 	private boolean emailOk = false;
 	private boolean confirmPasswordOk = false;
-	private Button createAccount;
+	private Button createAccount, selectCountry;
+	private CheckBox useUsername, useEmail;
+	private LinearLayout phoneNumberLayout, usernameLayout, emailLayout;
 	private final Pattern UPPER_CASE_REGEX = Pattern.compile("[A-Z]");
 	private LinphoneXmlRpcSession xmlRpcSession;
+	private CountryListFragment.Country country;
 	
 	private String getUsername() {
 		String username = usernameEdit.getText().toString();
-		if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_wizard)) {
-			LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
-			username = lpc.normalizePhoneNumber(username);
-		}
 		return username.toLowerCase(Locale.getDefault());
 	}
+
+	private String getPhoneNumber(){
+		LinphoneProxyConfig proxyConfig = LinphoneManager.getLc().createProxyConfig();
+		String countryCode = dialCode.getText().toString();
+		if(countryCode != null && countryCode.startsWith("+")) {
+			countryCode = countryCode.substring(1);
+		}
+		proxyConfig.setDialPrefix(countryCode);
+		return proxyConfig.normalizePhoneNumber(phoneNumberEdit.getText().toString());
+	}
 	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.assistant_account_creation, container, false);
 
-		usernameError = (TextView) view.findViewById(R.id.username_error);
-		usernameEdit = (EditText) view.findViewById(R.id.username);
+		phoneNumberError = (TextView) view.findViewById(R.id.phone_number_error);
+		phoneNumberEdit = (EditText) view.findViewById(R.id.phone_number);
+		phoneNumberEdit.addTextChangedListener(new TextWatcher() {
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
-		passwordError = (TextView) view.findViewById(R.id.password_error);
-		passwordEdit = (EditText) view.findViewById(R.id.password);
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count) {
+			}
 
-		passwordConfirmError = (TextView) view.findViewById(R.id.confirm_password_error);
-		passwordConfirmEdit = (EditText) view.findViewById(R.id.confirm_password);
+			@Override
+			public void afterTextChanged(Editable s) {}
+		});
+		phoneNumberLayout = (LinearLayout) view.findViewById(R.id.phone_number_layout);
+		addXMLRPCPhoneNumberHandler(phoneNumberEdit, null);
 
-		emailError = (TextView) view.findViewById(R.id.email_error);
-		emailEdit = (EditText) view.findViewById(R.id.email);
+		selectCountry = (Button) view.findViewById(R.id.select_country);
+		selectCountry.setOnClickListener(this);
 
-    	addXMLRPCUsernameHandler(usernameEdit, null);
+		dialCode = (EditText) view.findViewById(R.id.dial_code);
+		sipUri = (TextView) view.findViewById(R.id.sip_uri);
 
-    	if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_wizard)) {
-			usernameEdit.setInputType(InputType.TYPE_CLASS_NUMBER);
-    	}
 
-    	addXMLRPCPasswordHandler(passwordEdit, null);
-    	addXMLRPCConfirmPasswordHandler(passwordEdit, passwordConfirmEdit, null);
-    	addXMLRPCEmailHandler(emailEdit, null);
+		if(getResources().getBoolean(R.bool.assistant_allow_username)) {
+			useUsername = (CheckBox) view.findViewById(R.id.use_username);
+			useUsername.setVisibility(View.VISIBLE);
+			useUsername.setOnCheckedChangeListener(this);
+
+			usernameError = (TextView) view.findViewById(R.id.username_error);
+			usernameEdit = (EditText) view.findViewById(R.id.username);
+			usernameEdit.addTextChangedListener(new TextWatcher() {
+				@Override
+				public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+				@Override
+				public void onTextChanged(CharSequence s, int start, int before, int count) {
+					/*if(useUsername.isChecked() && usernameEdit.getText().length() > 0) {
+						sipUri.setText("Sip uri is sip:" + s.toString() + "@sip.linphone.org");
+					} else {
+						if(phoneNumberEdit.getText().length() > 0){
+							sipUri.setText("Sip uri is sip:" + phoneNumberEdit.getText().toString()+ "@sip.linphone.org");
+						} else {
+							sipUri.setText("");
+						}
+					}*/
+				}
+
+				@Override
+				public void afterTextChanged(Editable s) {}
+			});
+			usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
+			addXMLRPCUsernameHandler(usernameEdit, null);
+		}
+
+		if(getResources().getBoolean(R.bool.isTablet)){
+			useEmail.setVisibility(View.VISIBLE);
+			useEmail = (CheckBox) view.findViewById(R.id.use_email);
+			useEmail.setOnCheckedChangeListener(this);
+
+			passwordError = (TextView) view.findViewById(R.id.password_error);
+			passwordEdit = (EditText) view.findViewById(R.id.password);
+
+			passwordConfirmError = (TextView) view.findViewById(R.id.confirm_password_error);
+			passwordConfirmEdit = (EditText) view.findViewById(R.id.confirm_password);
+
+			emailError = (TextView) view.findViewById(R.id.email_error);
+			emailEdit = (EditText) view.findViewById(R.id.email);
+			emailLayout = (LinearLayout) view.findViewById(R.id.email_layout);
+
+			addXMLRPCPasswordHandler(passwordEdit, null);
+			addXMLRPCConfirmPasswordHandler(passwordEdit, passwordConfirmEdit, null);
+			addXMLRPCEmailHandler(emailEdit, null);
+
+			if (getResources().getBoolean(R.bool.pre_fill_email_in_wizard)) {
+				Account[] accounts = AccountManager.get(getActivity()).getAccountsByType("com.google");
+
+				for (Account account: accounts) {
+					if (isEmailCorrect(account.name)) {
+						String possibleEmail = account.name;
+						emailEdit.setText(possibleEmail);
+						emailOk = true;
+						break;
+					}
+				}
+			}
+		}
+
+		String previousPhone = AssistantActivity.instance().phone_number;
+		if(previousPhone != null ){
+			phoneNumberEdit.setText(previousPhone);
+		}
+		setCountry(AssistantActivity.instance().country);
+		updateApplyButton();
 
     	createAccount = (Button) view.findViewById(R.id.assistant_create);
-    	createAccount.setEnabled(false);
+    	createAccount.setEnabled(true);
     	createAccount.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
-				createAccount(getUsername(), passwordEdit.getText().toString(), emailEdit.getText().toString(), false);
+				if(getResources().getBoolean(R.bool.isTablet)) {
+					if (useEmail.isChecked()) {
+						createAccountWithEmail(getUsername(), passwordEdit.getText().toString(), emailEdit.getText().toString(), false);
+					}
+				} else {
+					createAccountWithPhoneNumber(getUsername(), "", getPhoneNumber(), false);
+				}
 			}
-    	});
+		});
     	
-    	if (getResources().getBoolean(R.bool.pre_fill_email_in_wizard)) {
-    		Account[] accounts = AccountManager.get(getActivity()).getAccountsByType("com.google");
-    		
-    	    for (Account account: accounts) {
-    	    	if (isEmailCorrect(account.name)) {
-    	            String possibleEmail = account.name;
-					emailEdit.setText(possibleEmail);
-					emailOk = true;
-    	        	break;
-    	        }
-    	    }
-    	}
-		
+
+
+		int phoneStatePermission = getActivity().getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getActivity().getPackageName());
+
+		if (phoneStatePermission == PackageManager.PERMISSION_GRANTED) {
+			TelephonyManager mTelephonyManager;
+			mTelephonyManager = (TelephonyManager) getActivity().getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
+			String yourNumber = mTelephonyManager.getLine1Number();
+			String iso = mTelephonyManager.getNetworkCountryIso();
+		}
+
 		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), getString(R.string.wizard_url));
     	
 		return view;
 	}
 
+	private void updateApplyButton() {
+
+	}
+
+	@Override
+	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+		if(buttonView.getId() == R.id.use_username) {
+			if(isChecked) {
+				usernameLayout.setVisibility(View.VISIBLE);
+				if(usernameEdit.getText().length() > 0){
+					sipUri.setText("Sip uri is sip:" + usernameEdit.getText().toString() + "@sip.linphone.org");
+				}
+			} else {
+				usernameLayout.setVisibility(View.GONE);
+				if(phoneNumberEdit.getText().length() > 0){
+					sipUri.setText("Sip uri is sip:" + phoneNumberEdit.getText().toString() + "@sip.linphone.org");
+				}
+			}
+		} else if(buttonView.getId() == R.id.use_email){
+			if(isChecked) {
+				emailLayout.setVisibility(View.VISIBLE);
+				usernameLayout.setVisibility(View.VISIBLE);
+				useUsername.setEnabled(false);
+			} else {
+				if(!useUsername.isChecked()) {
+					usernameLayout.setVisibility(View.GONE);
+				}
+				emailLayout.setVisibility(View.GONE);
+				usernameLayout.setVisibility(View.GONE);
+				useUsername.setEnabled(true);
+			}
+		}
+	}
+
+	public void setCountry(CountryListFragment.Country c) {
+		country = c;
+		if( c!= null) {
+			dialCode.setText(c.dial_code);
+			selectCountry.setText(c.name);
+		}
+	}
+
+	@Override
+	public void onClick(View v) {
+		switch (v.getId()){
+			case R.id.select_country: {
+				AssistantActivity.instance().displayCountryChooser();
+			}
+		}
+	}
+
 	private void displayError(Boolean isOk, TextView error, EditText editText, String errorText){
 		if(isOk || editText.getText().toString().equals("")){
 			error.setVisibility(View.INVISIBLE);
@@ -168,16 +312,70 @@ public class CreateAccountFragment extends Fragment {
 			}
 		};
 		
-		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("check_account", LinphoneXmlRpcRequest.ArgType.Int);
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("is_account_used", LinphoneXmlRpcRequest.ArgType.String);
 		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 {
+					String response = request.getStringResponse();
+					if(response.equals(XmlRpcHelper.SERVER_ERROR_ACCOUNT_DOESNT_EXIST)) {
 						mHandler.post(runOk);
+					} else {
+						mHandler.post(runNotOk);
+					}
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
+					mHandler.post(runNotReachable);
+				}
+			}
+		});
+		xmlRpcRequest.addStringArg(username);
+		xmlRpcSession.sendRequest(xmlRpcRequest);
+	}
+
+	private void isPhoneNumberRegistred(final String username, final ImageView icon) {
+		final Runnable runOk = new Runnable() {
+			public void run() {
+				phoneNumberOk = false;
+				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, LinphoneManager.getInstance().getContext().getString(R.string.assistant_phone_number_unavailable));
+				//createAccount.setEnabled(phoneNumberOk);
+			}
+		};
+		final Runnable runNotOk = new Runnable() {
+			public void run() {
+				phoneNumberOk = true;
+				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, "");
+				createAccount.setEnabled(phoneNumberOk);
+			}
+		};
+		final Runnable runNotReachable = new Runnable() {
+			public void run() {
+				phoneNumberOk = false;
+				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, LinphoneManager.getInstance().getContext().getString(R.string.wizard_server_unavailable));
+				createAccount.setEnabled(phoneNumberOk);
+			}
+		};
+
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("is_phone_number_used", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
+					final String response = request.getStringResponse();
+					if (response.equals(XmlRpcHelper.SERVER_RESPONSE_OK)) {
+						mHandler.post(runOk);
+					} else {
+						if(response.startsWith("ERROR")){
+							mHandler.post(new Runnable() {
+								@Override
+								public void run() {
+									phoneNumberOk = false;
+									displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, response);
+									//createAccount.setEnabled(phoneNumberOk);
+								}
+							});
+						} else {
+							mHandler.post(runNotOk);
+						}
 					}
 				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					mHandler.post(runNotReachable);
@@ -197,7 +395,49 @@ public class CreateAccountFragment extends Fragment {
 		return password.length() >= 1;
 	}
 	
-	private void createAccount(final String username, final String password, String email, boolean suscribe) {
+	private void createAccountWithPhoneNumber(final String username, final String password, final String phone, boolean suscribe) {
+		AssistantActivity.instance().displayAssistantCodeConfirm(username, phone);
+		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().displayAssistantCodeConfirm(username, phone);
+			}
+		};
+		final Runnable runNotReachable = new Runnable() {
+			public void run() {
+				//TODO errorMessage.setText(R.string.wizard_not_reachable);
+			}
+		};
+		
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("create_phone_account", LinphoneXmlRpcRequest.ArgType.String);
+		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
+			@Override
+			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
+				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
+					String response = request.getStringResponse();
+					if (response.contains("ERROR")) {
+						mHandler.post(runNotOk);
+					} else {
+						mHandler.post(runOk);
+					}
+				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
+					mHandler.post(runNotReachable);
+				}
+			}
+		});
+		xmlRpcRequest.addStringArg(phone);
+		xmlRpcRequest.addStringArg("");
+		xmlRpcRequest.addStringArg("");
+		xmlRpcRequest.addStringArg(LinphoneManager.getInstance().getUserAgent());
+		xmlRpcRequest.addStringArg("");
+		xmlRpcSession.sendRequest(xmlRpcRequest);
+	}
+
+	private void createAccountWithEmail(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);
@@ -213,7 +453,7 @@ public class CreateAccountFragment extends Fragment {
 				//TODO errorMessage.setText(R.string.wizard_not_reachable);
 			}
 		};
-		
+
 		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("create_account_with_useragent", LinphoneXmlRpcRequest.ArgType.Int);
 		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
 			@Override
@@ -236,6 +476,28 @@ public class CreateAccountFragment extends Fragment {
 		xmlRpcRequest.addStringArg(LinphoneManager.getInstance().getUserAgent());
 		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
+
+	private void addXMLRPCPhoneNumberHandler(final EditText field, final ImageView icon) {
+		field.addTextChangedListener(new TextWatcher() {
+			public void afterTextChanged(Editable s) {
+				if (s.length() > 0) {
+					phoneNumberOk = false;
+					String phoneNumber = getPhoneNumber();
+					if (LinphoneManager.getLc().createProxyConfig().isPhoneNumber(phoneNumber)) {
+						isPhoneNumberRegistred(phoneNumber, icon);
+					} else {
+						displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, getResources().getString(R.string.wizard_username_incorrect));
+					}
+				} else {
+					displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, "");
+				}
+			}
+
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+			public void onTextChanged(CharSequence s, int start, int count, int after) {}
+		});
+	}
 	
 	private void addXMLRPCUsernameHandler(final EditText field, final ImageView icon) {
 		field.addTextChangedListener(new TextWatcher() {
@@ -255,7 +517,7 @@ public class CreateAccountFragment extends Fragment {
 				field.setOnFocusChangeListener(new View.OnFocusChangeListener() {
 					@Override
 					public void onFocusChange(View v, boolean hasFocus) {
-						if(!hasFocus){
+						if (!hasFocus) {
 							usernameOk = false;
 							String username = field.getText().toString();
 							if (isUsernameCorrect(username)) {
diff --git a/src/org/linphone/xmlrpc/XmlRpcHelper.java b/src/org/linphone/xmlrpc/XmlRpcHelper.java
index 3cecd89eb..e87ab6012 100644
--- a/src/org/linphone/xmlrpc/XmlRpcHelper.java
+++ b/src/org/linphone/xmlrpc/XmlRpcHelper.java
@@ -11,6 +11,9 @@ import org.linphone.mediastream.Log;
 
 public class XmlRpcHelper {
     public static final String SERVER_ERROR_INVALID_ACCOUNT = "ERROR_INVALID_ACCOUNT";
+    public static final String SERVER_RESPONSE_OK = "OK";
+    public static final String SERVER_ERROR_INCORRECT_PHONE_NUMBER = "ERROR_PHONE_ISNT_E164";
+    public static final String SERVER_ERROR_ACCOUNT_DOESNT_EXIST = "ERROR_ACCOUNT_DOESNT_EXIST";
     public static final String SERVER_ERROR_PURCHASE_CANCELLED = "ERROR_PURCHASE_CANCELLED";
     public static final String SERVER_ERROR_RECEIPT_PARSING_FAILED = "ERROR_RECEIPT_PARSING_FAILED";
     public static final String SERVER_ERROR_UID_ALREADY_IN_USE = "ERROR_UID_ALREADY_IN_USE";
@@ -152,7 +155,7 @@ public class XmlRpcHelper {
 	}
 	
 	public void isTrialAccountAsync(final XmlRpcListener listener, String username, String password) {
-		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("check_account_trial", LinphoneXmlRpcRequest.ArgType.String);
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("is_account_trial", LinphoneXmlRpcRequest.ArgType.String);
 		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
 			@Override
 			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {

From 41528f0422c83b5ebf69b502f0d9ee18d31cfdca Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 1 Aug 2016 15:19:54 +0200
Subject: [PATCH 02/36] Updated cmakebuilder to set vCards enabled as default +
 rework keepalive

---
 AndroidManifest.xml                         |  8 +++-
 src/org/linphone/KeepAliveHandler.java      | 47 ---------------------
 src/org/linphone/KeepAliveReceiver.java     | 40 +++++++++++++++---
 src/org/linphone/LinphoneManager.java       | 27 +-----------
 src/org/linphone/LinphoneService.java       | 14 +++---
 submodules/cmake-builder                    |  2 +-
 submodules/externals/sqlite3/CMakeLists.txt |  2 +-
 7 files changed, 50 insertions(+), 90 deletions(-)
 delete mode 100644 src/org/linphone/KeepAliveHandler.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 909529b19..59f557074 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -207,7 +207,13 @@
 			<intent-filter><action android:name="android.intent.action.PHONE_STATE" /></intent-filter>
 		</receiver>
 		
-		<receiver android:name="KeepAliveHandler" >
+		<receiver android:name="KeepAliveReceiver">
+		    <intent-filter>
+		        <action android:name="android.intent.action.SCREEN_ON"></action>
+		    </intent-filter>
+		    <intent-filter>
+		        <action android:name="android.intent.action.SCREEN_OFF"></action>
+		    </intent-filter>
         </receiver>
         
 		<!-- Needed for push notification -->
diff --git a/src/org/linphone/KeepAliveHandler.java b/src/org/linphone/KeepAliveHandler.java
deleted file mode 100644
index 9812248f6..000000000
--- a/src/org/linphone/KeepAliveHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.linphone;
-/*
-KeepAliveHandler.java
-Copyright (C) 2013  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program 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, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.mediastream.Log;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class KeepAliveHandler extends BroadcastReceiver {
-	@Override
-	public void onReceive(Context context, Intent intent) {
-		boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled();
-		LinphoneCoreFactory.instance().enableLogCollection(isDebugEnabled);
-		LinphoneCoreFactory.instance().setDebugMode(isDebugEnabled, context.getString(R.string.app_name));
-		
-		Log.i("Keep alive handler invoked");
-		if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
-			//first refresh registers
-			LinphoneManager.getLc().refreshRegisters();
-			//make sure iterate will have enough time, device will not sleep until exit from this method
-			try {
-				Thread.sleep(2000);
-			} catch (InterruptedException e) {
-				//Log.e("Cannot sleep for 2s", e); //TODO FIXME Crash since the log rework
-			}
-		}
-	}
-}
diff --git a/src/org/linphone/KeepAliveReceiver.java b/src/org/linphone/KeepAliveReceiver.java
index 7c104f578..bc78137e4 100644
--- a/src/org/linphone/KeepAliveReceiver.java
+++ b/src/org/linphone/KeepAliveReceiver.java
@@ -18,12 +18,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 package org.linphone;
 
+import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.mediastream.Log;
 
+import android.app.AlarmManager;
+import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-
+import android.os.SystemClock;
 
 /*
  * Purpose of this receiver is to disable keep alives when screen is off
@@ -32,13 +36,37 @@ public class KeepAliveReceiver extends BroadcastReceiver {
 	@Override
 	public void onReceive(Context context, Intent intent) {
 		if (!LinphoneService.isReady()) {
-			Log.i("Keep alive broadcast received while Linphone service not ready");
 			return;
 		} else {
-			if (intent.getAction().equalsIgnoreCase(Intent.ACTION_SCREEN_ON)) {
-				LinphoneManager.getLc().enableKeepAlive(true);
-			} else if (intent.getAction().equalsIgnoreCase(Intent.ACTION_SCREEN_OFF)) {
-				LinphoneManager.getLc().enableKeepAlive(false);
+			boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled();
+			LinphoneCoreFactory.instance().enableLogCollection(isDebugEnabled);
+			LinphoneCoreFactory.instance().setDebugMode(isDebugEnabled, context.getString(R.string.app_name));
+			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+			if (lc == null) return;
+			
+			String action = intent.getAction();
+			if (action == null) {
+				Log.i("[KeepAlive] Refresh registers");
+				lc.refreshRegisters();
+				//make sure iterate will have enough time, device will not sleep until exit from this method
+				try {
+					Thread.sleep(2000);
+				} catch (InterruptedException e) {
+					Log.e("Cannot sleep for 2s", e);
+				} finally {
+					//make sure the application will at least wakes up every 10 mn
+					Intent newIntent = new Intent(context, KeepAliveReceiver.class);
+					PendingIntent keepAlivePendingIntent = PendingIntent.getBroadcast(context, 0, newIntent, PendingIntent.FLAG_ONE_SHOT);
+					((AlarmManager) context.getSystemService(Context.ALARM_SERVICE)).setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP
+																					, SystemClock.elapsedRealtime() + 600000
+																					, keepAlivePendingIntent);
+				}
+			} else if (action.equalsIgnoreCase(Intent.ACTION_SCREEN_ON)) {
+				Log.i("[KeepAlive] Screen is on, enable");
+				lc.enableKeepAlive(true);
+			} else if (action.equalsIgnoreCase(Intent.ACTION_SCREEN_OFF)) {
+				Log.i("[KeepAlive] Screen is off, disable");
+				lc.enableKeepAlive(false);
 			}
 		}
 	}
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 6d6056045..739387310 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -38,8 +38,6 @@ import java.util.TimerTask;
 
 import org.linphone.compatibility.Compatibility;
 import org.linphone.core.CallDirection;
-import org.linphone.core.OpenH264DownloadHelperAction;
-import org.linphone.core.OpenH264DownloadHelperListener;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneBuffer;
 import org.linphone.core.LinphoneCall;
@@ -57,13 +55,13 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.LinphoneCoreFactoryImpl;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneFriendList;
 import org.linphone.core.LinphoneInfoMessage;
 import org.linphone.core.LinphoneProxyConfig;
+import org.linphone.core.OpenH264DownloadHelperListener;
 import org.linphone.core.PayloadType;
 import org.linphone.core.PresenceActivityType;
 import org.linphone.core.PresenceModel;
@@ -82,12 +80,8 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
-import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.hardware.Sensor;
@@ -105,8 +99,6 @@ import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
-import android.provider.MediaStore;
-import android.provider.MediaStore.Images;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.telephony.TelephonyManager;
@@ -207,11 +199,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	private final String mErrorToneFile;
 	private final String mUserCertificatePath;
 	private ByteArrayInputStream mUploadingImageStream;
-
 	private Timer mTimer;
 
-	private  BroadcastReceiver mKeepAliveReceiver = new KeepAliveReceiver();
-
 	private void routeAudioToSpeakerHelper(boolean speakerOn) {
 		Log.w("Routing audio to " + (speakerOn ? "speaker" : "earpiece") + ", disabling bluetooth audio route");
 		BluetoothManager.getInstance().disableBluetoothSCO();
@@ -644,11 +633,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Log.e(e);
 		}
 		finally {
-			try {
-				mServiceContext.unregisterReceiver(mKeepAliveReceiver);
-			} catch (Exception e) {
-				Log.e(e);
-			}
 			mLc = null;
 		}
 	}
@@ -656,10 +640,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	public void restartLinphoneCore() {
 		destroyLinphoneCore();
 		startLibLinphone(mServiceContext);
-
-		IntentFilter lFilter = new IntentFilter(Intent.ACTION_SCREEN_ON);
-        lFilter.addAction(Intent.ACTION_SCREEN_OFF);
-        mServiceContext.registerReceiver(mKeepAliveReceiver, lFilter);
         
 		sExited = false;
 	}
@@ -750,10 +730,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Compatibility.initPushNotificationService(mServiceContext);
 		}
 
-		IntentFilter lFilter = new IntentFilter(Intent.ACTION_SCREEN_ON);
-        lFilter.addAction(Intent.ACTION_SCREEN_OFF);
-        mServiceContext.registerReceiver(mKeepAliveReceiver, lFilter);
-
 		updateNetworkReachability();
 
 		if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
@@ -869,7 +845,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Log.e(e);
 		}
 		finally {
-			mServiceContext.unregisterReceiver(mKeepAliveReceiver);
 			mLc = null;
 			instance = null;
 		}
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 402e29fde..5e7743a27 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -20,6 +20,7 @@ package org.linphone;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Calendar;
 
 import org.linphone.compatibility.Compatibility;
 import org.linphone.core.LinphoneAddress;
@@ -114,7 +115,6 @@ public final class LinphoneService extends Service {
 	private Notification mCustomNotif;
 	private int mMsgNotifCount;
 	private PendingIntent mNotifContentIntent;
-	private PendingIntent mkeepAlivePendingIntent;
 	private String mNotificationTitle;
 	private boolean mDisableRegistrationStatus;
 	private LinphoneCoreListenerBase mListener;
@@ -287,12 +287,11 @@ public final class LinphoneService extends Service {
 		}
 		
 		//make sure the application will at least wakes up every 10 mn
-		Intent intent = new Intent(this, KeepAliveHandler.class);
-	    mkeepAlivePendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_ONE_SHOT);
-		((AlarmManager) this.getSystemService(Context.ALARM_SERVICE)).setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP
-																							, SystemClock.elapsedRealtime()+600000
-																							, 600000
-																							, mkeepAlivePendingIntent);
+		Intent intent = new Intent(this, KeepAliveReceiver.class);
+		PendingIntent keepAlivePendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+		((AlarmManager) this.getSystemService(Context.ALARM_SERVICE)).setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP
+																		, SystemClock.elapsedRealtime() + 600000
+																		, keepAlivePendingIntent);
 		
 		mWindowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
 	}
@@ -630,7 +629,6 @@ public final class LinphoneService extends Service {
 	    mNM.cancel(INCALL_NOTIF_ID);
 	    mNM.cancel(MESSAGE_NOTIF_ID);
 
-	    ((AlarmManager) this.getSystemService(Context.ALARM_SERVICE)).cancel(mkeepAlivePendingIntent);
 		super.onDestroy();
 	}
 	
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 6d4281181..29911ee5b 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 6d4281181addb913e851622e6d9b04d093c869d4
+Subproject commit 29911ee5ba6053dd041ee02c6dc13b0134e890d2
diff --git a/submodules/externals/sqlite3/CMakeLists.txt b/submodules/externals/sqlite3/CMakeLists.txt
index 8c722641d..28a7b381c 100644
--- a/submodules/externals/sqlite3/CMakeLists.txt
+++ b/submodules/externals/sqlite3/CMakeLists.txt
@@ -16,7 +16,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 ############################################################################
 

From bf343ab2698eca189e219264f94cac1916025d35 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 1 Aug 2016 16:51:55 +0200
Subject: [PATCH 03/36] Revert part of previous commit as ScreenOn/Off
 broadcastreceiver must be registered by application

---
 AndroidManifest.xml                   | 10 ++--------
 src/org/linphone/LinphoneManager.java | 28 ++++++++++++++++++++++++++-
 src/org/linphone/LinphoneService.java |  1 -
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 59f557074..b1904f9ca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -207,14 +207,8 @@
 			<intent-filter><action android:name="android.intent.action.PHONE_STATE" /></intent-filter>
 		</receiver>
 		
-		<receiver android:name="KeepAliveReceiver">
-		    <intent-filter>
-		        <action android:name="android.intent.action.SCREEN_ON"></action>
-		    </intent-filter>
-		    <intent-filter>
-		        <action android:name="android.intent.action.SCREEN_OFF"></action>
-		    </intent-filter>
-        </receiver>
+		<!-- This one needs to be registered from application -->
+		<receiver android:name="KeepAliveReceiver"/>
         
 		<!-- Needed for push notification -->
 		<receiver android:name="org.linphone.gcm.GCMReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 739387310..3454c21d8 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -80,8 +80,11 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 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.hardware.Sensor;
@@ -140,6 +143,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	private boolean mAudioFocused;
 	private int mLastNetworkType=-1;
 	private ConnectivityManager mConnectivityManager;
+	private BroadcastReceiver mKeepAliveReceiver;
+	private IntentFilter mKeepAliveIntentFilter;
 	private Handler mHandler = new Handler();
 	private WakeLock mIncallWakeLock;
 	private static List<LinphoneChatMessage> mPendingChatFileMessage;
@@ -633,6 +638,11 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Log.e(e);
 		}
 		finally {
+			try {
+				mServiceContext.unregisterReceiver(mKeepAliveReceiver);
+			} catch (Exception e) {
+				Log.e(e);
+			}
 			mLc = null;
 		}
 	}
@@ -640,7 +650,12 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	public void restartLinphoneCore() {
 		destroyLinphoneCore();
 		startLibLinphone(mServiceContext);
-        
+		/* 
+		 You cannot receive this through components declared in manifests, only 
+		 by explicitly registering for it with Context.registerReceiver(). This is a protected intent that can only 
+		 be sent by the system.
+		*/ 
+		mServiceContext.registerReceiver(mKeepAliveReceiver, mKeepAliveIntentFilter);
 		sExited = false;
 	}
 
@@ -730,6 +745,16 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Compatibility.initPushNotificationService(mServiceContext);
 		}
 
+		/* 
+		 You cannot receive this through components declared in manifests, only 
+		 by explicitly registering for it with Context.registerReceiver(). This is a protected intent that can only 
+		 be sent by the system.
+		*/ 
+		mKeepAliveIntentFilter = new IntentFilter(Intent.ACTION_SCREEN_ON);
+		mKeepAliveIntentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+		mKeepAliveReceiver = new KeepAliveReceiver();
+		mServiceContext.registerReceiver(mKeepAliveReceiver, mKeepAliveIntentFilter);
+
 		updateNetworkReachability();
 
 		if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
@@ -845,6 +870,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Log.e(e);
 		}
 		finally {
+			mServiceContext.unregisterReceiver(mKeepAliveReceiver);
 			mLc = null;
 			instance = null;
 		}
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 5e7743a27..813df0236 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -20,7 +20,6 @@ package org.linphone;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Calendar;
 
 import org.linphone.compatibility.Compatibility;
 import org.linphone.core.LinphoneAddress;

From 8c1b6822caf3b08448a026976fa2ff5eb2dc6363 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 1 Aug 2016 16:54:29 +0200
Subject: [PATCH 04/36] Remove some warnings

---
 src/org/linphone/SettingsFragment.java | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 1230155f8..d7a9914dc 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -35,15 +35,15 @@ import org.linphone.core.PayloadType;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
-import org.linphone.tools.OpenH264DownloadHelper;
 import org.linphone.purchase.InAppPurchaseActivity;
+import org.linphone.tools.OpenH264DownloadHelper;
 import org.linphone.ui.LedPreference;
 import org.linphone.ui.PreferencesListFragment;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.Manifest;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -668,7 +668,7 @@ public class SettingsFragment extends PreferencesListFragment {
 				public boolean onPreferenceChange(Preference preference, Object newValue) {
 					boolean enable = (Boolean) newValue;
 					try {
-						if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86")
+						if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") 
 								&& pt.getMime().equals("H264") && !mCodecDownloader.isCodecFound()) {
 							LinphoneManager.getInstance().getOpenH264DownloadHelper().setOpenH264HelperListener(LinphoneManager.getInstance().getOpenH264HelperListener());
 							LinphoneManager.getInstance().getOpenH264DownloadHelper().setUserData(0,LinphoneManager.getInstance().getContext());
@@ -676,18 +676,17 @@ public class SettingsFragment extends PreferencesListFragment {
 
 							AlertDialog.Builder builder = new AlertDialog.Builder(LinphoneManager.getInstance().getContext());
 							builder.setCancelable(false);
-							AlertDialog.Builder show = builder.setMessage("Do you agree to download "
-									+ mCodecDownloader.getLicenseMessage()).setPositiveButton("Yes", new DialogInterface.OnClickListener(){
+							builder.setMessage("Do you agree to download " + mCodecDownloader.getLicenseMessage()).setPositiveButton("Yes", new DialogInterface.OnClickListener() {
 								@Override
 								public void onClick(DialogInterface dialog, int which) {
 									if (which == DialogInterface.BUTTON_POSITIVE)
 										mCodecDownloader.downloadCodec();
 								}
 							});
-							builder.setNegativeButton("No", new DialogInterface.OnClickListener(){
+							builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
 								@Override
 								public void onClick(DialogInterface dialog, int which) {
-									if (which == DialogInterface.BUTTON_NEGATIVE){
+									if (which == DialogInterface.BUTTON_NEGATIVE) {
 										// Disable H264
 									}
 								}
@@ -981,7 +980,6 @@ public class SettingsFragment extends PreferencesListFragment {
 		// Disable UPnP if ICE si enabled, or disable ICE if UPnP is enabled
 		CheckBoxPreference ice = (CheckBoxPreference) findPreference(getString(R.string.pref_ice_enable_key));
 		CheckBoxPreference turn = (CheckBoxPreference) findPreference(getString(R.string.pref_turn_enable_key));
-		CheckBoxPreference upnp = (CheckBoxPreference) findPreference(getString(R.string.pref_upnp_enable_key));
 		ice.setChecked(mPrefs.isIceEnabled());
 		turn.setChecked(mPrefs.isTurnEnabled());
 
@@ -1023,8 +1021,6 @@ public class SettingsFragment extends PreferencesListFragment {
 		findPreference(getString(R.string.pref_ice_enable_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {
-				CheckBoxPreference upnp = (CheckBoxPreference) findPreference(getString(R.string.pref_upnp_enable_key));
-				boolean value = (Boolean) newValue;
 				mPrefs.setIceEnabled((Boolean) newValue);
 				return true;
 			}
@@ -1033,8 +1029,6 @@ public class SettingsFragment extends PreferencesListFragment {
 		findPreference(getString(R.string.pref_turn_enable_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {
-				CheckBoxPreference upnp = (CheckBoxPreference) findPreference(getString(R.string.pref_upnp_enable_key));
-				boolean value = (Boolean) newValue;
 				mPrefs.setTurnEnabled((Boolean) newValue);
 				return true;
 			}
@@ -1043,7 +1037,6 @@ public class SettingsFragment extends PreferencesListFragment {
 		findPreference(getString(R.string.pref_upnp_enable_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {
-				CheckBoxPreference ice = (CheckBoxPreference) findPreference(getString(R.string.pref_ice_enable_key));
 				boolean value = (Boolean) newValue;
 				mPrefs.setUpnpEnabled(value);
 				return true;

From 716af4d4f4180c807d10c4e6e4aa53738ccdfef9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 2 Aug 2016 11:10:16 +0200
Subject: [PATCH 05/36] Fix for contacts not being fetched when permission is
 denied and is not asked anymore

---
 src/org/linphone/LinphoneActivity.java |  7 +++++++
 src/org/linphone/LinphoneContact.java  | 24 +++++++++---------------
 submodules/linphone                    |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 8562488fe..69d24330e 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1167,6 +1167,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		checkAndRequestPermission(Manifest.permission.READ_CONTACTS, PERMISSIONS_REQUEST_CONTACTS);
 	}
 	
+	private boolean willContactsPermissionBeAsked() {
+		return LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.READ_CONTACTS) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_CONTACTS);
+	}
+	
 	public void checkAndRequestWriteContactsPermission() {
 		checkAndRequestPermission(Manifest.permission.WRITE_CONTACTS, 0);
 	}
@@ -1267,6 +1271,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			ContactsManager.getInstance().enableContactsAccess();
 			ContactsManager.getInstance().fetchContactsAsync();
 			fetchedContactsOnce = true;
+		} else if (contacts != PackageManager.PERMISSION_GRANTED && !willContactsPermissionBeAsked()) {
+			ContactsManager.getInstance().fetchContactsAsync();
+			fetchedContactsOnce = true;
 		} else {
 			checkAndRequestReadContactsPermission();
 		}
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index a50ec6fb3..82f038bc0 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -419,6 +419,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		friend.edit();
 		friend.setFamilyName(lastName);
 		friend.setGivenName(firstName);
+		friend.setName(fullName);
 		
 		for (LinphoneAddress address : friend.getAddresses()) {
 			friend.removeAddress(address);
@@ -443,24 +444,17 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 				friend.addPhoneNumber(noa.getValue());
 			}
 		}
-		if (friend.getAddress() != null) {
-			friend.setName(fullName);
-		}
 		friend.done();
 		
-		if (friend.getAddress() != null) {
-			if (lc.findFriendByAddress(friend.getAddress().asString()) == null) {
-				try {
-					lc.addFriend(friend);
-					if (!ContactsManager.getInstance().hasContactsAccess()) {
-						// This refresh is only needed if app has no contacts permission to refresh the list of LinphoneFriends. 
-						// Otherwise contacts will be refreshed due to changes in native contact and the handler in ContactsManager
-						ContactsManager.getInstance().fetchContactsAsync();
-					}
-				} catch (LinphoneCoreException e) {
-					Log.e(e);
-				}
+		try {
+			LinphoneManager.getLcIfManagerNotDestroyedOrNull().addFriend(friend);
+			if (!ContactsManager.getInstance().hasContactsAccess()) {
+				// This refresh is only needed if app has no contacts permission to refresh the list of LinphoneFriends. 
+				// Otherwise contacts will be refreshed due to changes in native contact and the handler in ContactsManager
+				ContactsManager.getInstance().fetchContactsAsync();
 			}
+		} catch (LinphoneCoreException e) {
+			Log.e(e);
 		}
 	}
 	
diff --git a/submodules/linphone b/submodules/linphone
index 4a7099b98..d843d2789 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 4a7099b9833dda9e7ba9908da27a9032c95f38b0
+Subproject commit d843d278905d44ae20e51eebc5b6327a121e510f

From 375d2eb2dd35f0feb603387d3636e873800a46c3 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 2 Aug 2016 12:10:18 +0200
Subject: [PATCH 06/36] Updated linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index d843d2789..61a3b8a98 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit d843d278905d44ae20e51eebc5b6327a121e510f
+Subproject commit 61a3b8a98e6d35bff351b64e2c6717491792afb3

From 5b264a6685e59d4d8fad05cab9421cd58bee26a2 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 9 Aug 2016 13:21:34 +0200
Subject: [PATCH 07/36] Add inapp purchase Add account creator

---
 AndroidManifest.xml                           |   2 +-
 ant.properties                                |   2 +-
 res/layout/in_app.xml                         |  69 ++++++
 res/layout/in_app_list.xml                    |  16 ++
 res/layout/in_app_purchasable.xml             |  19 --
 res/layout/in_app_purchase_item.xml           |  49 ++++
 res/layout/in_app_store.xml                   |  46 +---
 res/raw/linphonerc_factory                    |  12 +-
 res/values/non_localizable_custom.xml         |   4 +-
 res/values/strings.xml                        |  20 ++
 src/org/linphone/LinphoneActivity.java        | 140 ++++++++---
 src/org/linphone/LinphoneContact.java         |  24 +-
 src/org/linphone/LinphonePreferences.java     |  13 ++
 .../linphone/assistant/AssistantActivity.java |   9 +-
 .../assistant/CreateAccountFragment.java      | 216 ++++++++++-------
 .../purchase/InAppPurchaseActivity.java       | 217 ++++++++----------
 .../purchase/InAppPurchaseFragment.java       | 150 ++++++++++++
 .../purchase/InAppPurchaseHelper.java         |  16 +-
 .../purchase/InAppPurchaseListFragment.java   | 100 ++++++++
 src/org/linphone/xmlrpc/XmlRpcHelper.java     |  10 +-
 20 files changed, 821 insertions(+), 313 deletions(-)
 create mode 100644 res/layout/in_app.xml
 create mode 100644 res/layout/in_app_list.xml
 delete mode 100644 res/layout/in_app_purchasable.xml
 create mode 100644 res/layout/in_app_purchase_item.xml
 create mode 100644 src/org/linphone/purchase/InAppPurchaseFragment.java
 create mode 100644 src/org/linphone/purchase/InAppPurchaseListFragment.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b1904f9ca..89cb2dcd2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
    
-      android:versionCode="3100" android:installLocation="auto">
+      android:versionCode="3120" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>
     
     <!-- Permissions for Push Notification -->
diff --git a/ant.properties b/ant.properties
index 850216300..62c331092 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
 key.store=bc-android.keystore
 key.alias=nw8000
-version.name=2.5.0
+version.name=3.1.2
diff --git a/res/layout/in_app.xml b/res/layout/in_app.xml
new file mode 100644
index 000000000..7eaa23c8b
--- /dev/null
+++ b/res/layout/in_app.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:background="@color/colorH"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical" >
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		tools:layout="@layout/status"/>
+
+	<LinearLayout
+		android:id="@+id/topbar"
+		android:background="@color/colorF"
+		android:orientation="horizontal"
+		android:layout_gravity="center_horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="60dp">
+
+		<ImageView
+			android:id="@+id/back"
+			android:src="@drawable/back"
+			android:background="@drawable/toolbar_button"
+			android:contentDescription="@string/content_description_back"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
+
+		<TextView
+			android:text="@string/inapp"
+			style="@style/font1"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.6"
+			android:gravity="center"/>
+
+		<ImageView
+			android:id="@+id/cancel"
+			android:src="@drawable/dialer_back"
+			android:background="@drawable/toolbar_button"
+			android:contentDescription="@string/content_description_dialer_back"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+	</LinearLayout>
+
+	<ProgressBar
+		android:id="@+id/purchaseItemsFetchInProgress"
+		style="?android:attr/progressBarStyle"
+		android:layout_centerHorizontal="true"
+		android:layout_centerVertical="true"
+		android:visibility="gone"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
+
+	<LinearLayout
+		android:id="@+id/fragment_container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="horizontal"
+		android:layout_below="@+id/topbar"/>
+
+</RelativeLayout>
diff --git a/res/layout/in_app_list.xml b/res/layout/in_app_list.xml
new file mode 100644
index 000000000..d4f95743a
--- /dev/null
+++ b/res/layout/in_app_list.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<ListView
+		android:id="@+id/inapp_list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@color/colorE"
+		android:cacheColorHint="@color/transparent"
+		android:dividerHeight="1dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/in_app_purchasable.xml b/res/layout/in_app_purchasable.xml
deleted file mode 100644
index 768c58572..000000000
--- a/res/layout/in_app_purchasable.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical"
-    android:orientation="vertical" >
-
-    <Button
-        android:id="@+id/inapp_button"
-        android:text="@string/assistant_create_account"
-        android:background="@drawable/assistant_button"
-        style="@style/font8"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"/>
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/in_app_purchase_item.xml b/res/layout/in_app_purchase_item.xml
new file mode 100644
index 000000000..f9ca899c3
--- /dev/null
+++ b/res/layout/in_app_purchase_item.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/inapp_purchase"
+	android:background="@color/colorH"
+	android:layout_width="match_parent"
+	android:layout_height="60dp">
+
+	<ImageView
+		android:id="@+id/inapp_icon"
+		android:src="@drawable/linphone_logo"
+		android:layout_alignParentLeft="true"
+		android:layout_centerInParent="true"
+		android:layout_margin="5dp"
+		android:layout_width="40dp"
+		android:layout_height="40dp"/>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="5dp"
+		android:layout_centerVertical="true"
+		android:layout_toRightOf="@+id/inapp_icon">
+
+		<TextView
+			android:id="@+id/purchase_title"
+			style="@style/font7"
+			android:textSize="15sp"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"/>
+
+		<TextView
+			android:id="@+id/purchase_description"
+			style="@style/font11"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"/>
+
+	</LinearLayout>
+
+	<TextView
+		android:id="@+id/purchase_price"
+		android:layout_margin="5dp"
+		android:layout_alignParentRight="true"
+		android:layout_centerInParent="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/in_app_store.xml b/res/layout/in_app_store.xml
index ba4341aed..923ae5f4c 100644
--- a/res/layout/in_app_store.xml
+++ b/res/layout/in_app_store.xml
@@ -4,28 +4,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-
-	<LinearLayout
-		android:id="@+id/topbar"
-		android:background="@color/colorF"
-		android:orientation="horizontal"
-		android:layout_gravity="center_horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="60dp">
-
-		<TextView
-			android:text="@string/assistant"
-			style="@style/font1"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="1"
-			android:gravity="center"/>
-
-	</LinearLayout>
     
     <LinearLayout 
 	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
+	    android:layout_height="wrap_content"
 		android:padding="30dp"
 	    android:gravity="center"
 	    android:orientation="vertical">
@@ -90,21 +72,17 @@
 				android:singleLine="true"/>
 
 		</LinearLayout>
-        
-	    <LinearLayout 
-	        android:id="@+id/purchasable_items"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:paddingTop="40dp"
-		    android:gravity="center"
-		    android:orientation="vertical"/>
-        
-        <View
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp" />
-        
     </LinearLayout>
 
+	<Button
+		android:id="@+id/inapp_button"
+		android:text="@string/assistant_create_account"
+		android:background="@drawable/assistant_button"
+		style="@style/font8"
+		android:paddingLeft="10dp"
+		android:paddingRight="10dp"
+		android:layout_gravity="center"
+		android:layout_width="wrap_content"
+		android:layout_height="40dp"/>
+
 </LinearLayout>
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index dbad902d8..1f22de0bb 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -37,5 +37,15 @@ max_calls=10
 activation_code_length=4
 
 [in-app-purchase]
-server_url=https://www.linphone.org/xmlrpc.php
+server_url=http://sip3.linphone.org/inapp.php
 purchasable_items_ids=test_account_subscription
+
+[assistant]
+domain=sip.linphone.org
+password_max_length=-1
+password_min_length=1
+username_length=-1
+username_max_length=64
+username_min_length=1
+username_regex=^[a-z0-9_.\-]*$
+xmlrpc_url=https://sip3.linphone.org:444/inapp.php
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 5906afea7..1594d607c 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -16,8 +16,10 @@
 	<bool name="replace_assistant_with_old_interface">false</bool>
 	<bool name="force_use_of_linphone_friends">false</bool>
 	<bool name="in_app_purchase_in_settings">false</bool>
+	<bool name="use_friendlist_subscription">true</bool>
+
+	<string name="wizard_url">https://sip3.linphone.org:444/inapp.php</string>
 
-	<string name="wizard_url">https://www.linphone.org/wizard.php</string>
 
 	<!-- Push notification settings -->
 	<bool name="enable_push_id">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cac212ef7..3d423c483 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -100,6 +100,26 @@
 	<string name="select_your_country">Select your Country</string>
 	<string name="country_code">(%s)</string>
 
+	<!-- Status -->
+	<string name="invalid_email">Invalid email</string>
+	<string name="account_already_exist">Account already exist</string>
+	<string name="invalid_username">Invalid username</string>
+	<string name="invalid_domain">Invalid domain</string>
+	<string name="invalid_route">Invalid route</string>
+	<string name="username_too_short">Username too short</string>
+	<string name="username_too_long">Username too long</string>
+	<string name="username_invalid_size">Username length invalid</string>
+	<string name="phone_number_too_long">Phone number too long</string>
+	<string name="phone_number_too_short">Phone number too short</string>
+	<string name="phone_number_invalid">Invalid phone number</string>
+	<string name="password_too_short">Password too short</string>
+	<string name="password_too_long">Password too long</string>
+	<string name="request_failed">Failed to query the server. Please try again later</string>
+	<string name="transport_unsupported">Unsupported transport</string>
+
+	<!-- In-app -->
+	<string name="inapp">in-app</string>
+
 	<!-- Dailer -->
 	<string name="address_bar_hint">Enter a number or an address</string>
 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 69d24330e..2514c6350 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -48,7 +48,11 @@ import org.linphone.core.LinphoneCoreListenerBase;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.Reason;
 import org.linphone.mediastream.Log;
+import org.linphone.purchase.InAppPurchaseActivity;
+import org.linphone.purchase.InAppPurchaseHelper;
 import org.linphone.ui.AddressText;
+import org.linphone.xmlrpc.XmlRpcHelper;
+import org.linphone.xmlrpc.XmlRpcListenerBase;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -174,7 +178,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 				return;
 			}
 		}
-		
+
 		if (getIntent() != null && getIntent().getExtras() != null) {
 			newProxyConfig = getIntent().getExtras().getBoolean("isNewProxyConfig");
 		}
@@ -197,6 +201,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		initButtons();
 		initSideMenu();
 
+		//ifINAP
+		getTrialAccount();
+		getExpirationAccount();
+
 		currentFragment = FragmentsAvailable.EMPTY;
 		if (savedInstanceState == null) {
 			changeCurrentFragment(FragmentsAvailable.DIALER, getIntent().getExtras());
@@ -348,9 +356,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			} catch (Exception e) {
 			}
 		}
-		
+
 		fragment = null;
-		
+
 		switch (newFragmentType) {
 		case HISTORY_LIST:
 			fragment = new HistoryListFragment();
@@ -619,6 +627,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		startActivity(new Intent(LinphoneActivity.this, AssistantActivity.class));
 	}
 
+	public void displayInapp() {
+		startActivity(new Intent(LinphoneActivity.this, InAppPurchaseActivity.class));
+	}
+
 	public int getUnreadMessageCount() {
 		int count = 0;
 		LinphoneChatRoom[] chats = LinphoneManager.getLc().getChatRooms();
@@ -1063,7 +1075,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		finish();
 		stopService(new Intent(Intent.ACTION_MAIN).setClass(this, LinphoneService.class));
 	}
-	
+
 	@Override
 	protected void onPostResume() {
 		super.onPostResume();
@@ -1114,7 +1126,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		if (lc != null) {
 			lc.removeListener(mListener);
 		}
-		
+
 		super.onPause();
 	}
 
@@ -1139,7 +1151,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 		return true;
 	}
-	
+
 	public boolean checkAndRequestOverlayPermission() {
 		Log.i("[Permission] Draw overlays permission is " + (Compatibility.canDrawOverlays(this) ? "granted" : "denied"));
 		if (!Compatibility.canDrawOverlays(this)) {
@@ -1150,7 +1162,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 		return true;
 	}
-	
+
 	public void checkAndRequestReadExternalStoragePermission() {
 		checkAndRequestPermission(Manifest.permission.READ_EXTERNAL_STORAGE, 0);
 	}
@@ -1158,39 +1170,39 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	public void checkAndRequestExternalStoragePermission() {
 		checkAndRequestPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 0);
 	}
-	
+
 	public void checkAndRequestCameraPermission() {
 		checkAndRequestPermission(Manifest.permission.CAMERA, 0);
 	}
-	
+
 	public void checkAndRequestReadContactsPermission() {
 		checkAndRequestPermission(Manifest.permission.READ_CONTACTS, PERMISSIONS_REQUEST_CONTACTS);
 	}
-	
+
 	private boolean willContactsPermissionBeAsked() {
 		return LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.READ_CONTACTS) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_CONTACTS);
 	}
-	
+
 	public void checkAndRequestWriteContactsPermission() {
 		checkAndRequestPermission(Manifest.permission.WRITE_CONTACTS, 0);
 	}
-	
+
 	public void checkAndRequestRecordAudioPermissionForEchoCanceller() {
 		checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, PERMISSIONS_RECORD_AUDIO_ECHO_CANCELLER);
 	}
-	
+
 	public void checkAndRequestReadExternalStoragePermissionForDeviceRingtone() {
 		checkAndRequestPermission(Manifest.permission.READ_EXTERNAL_STORAGE, PERMISSIONS_READ_EXTERNAL_STORAGE_DEVICE_RINGTONE);
 	}
-	
+
 	public void checkAndRequestPermissionsToSendImage() {
 		ArrayList<String> permissionsList = new ArrayList<String>();
-		
+
 		int readExternalStorage = getPackageManager().checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE, getPackageName());
 		Log.i("[Permission] Read external storage permission is " + (readExternalStorage == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
 		int camera = getPackageManager().checkPermission(Manifest.permission.CAMERA, getPackageName());
 		Log.i("[Permission] Camera permission is " + (camera == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
-		
+
 		if (readExternalStorage != PackageManager.PERMISSION_GRANTED) {
 			if (LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.READ_EXTERNAL_STORAGE) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
 				Log.i("[Permission] Asking for read external storage");
@@ -1209,7 +1221,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			ActivityCompat.requestPermissions(this, permissions, 0);
 		}
 	}
-	
+
 	private void checkSyncPermission() {
 		checkAndRequestPermission(Manifest.permission.WRITE_SYNC_SETTINGS, PERMISSIONS_REQUEST_SYNC);
 	}
@@ -1217,7 +1229,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	public void checkAndRequestPermission(String permission, int result) {
 		int permissionGranted = getPackageManager().checkPermission(permission, getPackageName());
 		Log.i("[Permission] " + permission + " is " + (permissionGranted == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
-		
+
 		if (permissionGranted != PackageManager.PERMISSION_GRANTED) {
 			if (LinphonePreferences.instance().firstTimeAskingForPermission(permission) || ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {
 				Log.i("[Permission] Asking for " + permission);
@@ -1231,7 +1243,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		for (int i = 0; i < permissions.length; i++) {
 			Log.i("[Permission] " + permissions[i] + " is " + (grantResults[i] == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
 		}
-		
+
 		switch (requestCode) {
 			case PERMISSIONS_REQUEST_SYNC:
 				if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
@@ -1259,14 +1271,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 				break;
 		}
 	}
-	
+
 	@Override
 	protected void onStart() {
 		super.onStart();
 
 		int contacts = getPackageManager().checkPermission(Manifest.permission.READ_CONTACTS, getPackageName());
 		Log.i("[Permission] Contacts permission is " + (contacts == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
-		
+
 		if (contacts == PackageManager.PERMISSION_GRANTED && !fetchedContactsOnce) {
 			ContactsManager.getInstance().enableContactsAccess();
 			ContactsManager.getInstance().fetchContactsAsync();
@@ -1278,7 +1290,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			checkAndRequestReadContactsPermission();
 		}
 	}
-	
+
 	@Override
 	protected void onSaveInstanceState(Bundle outState) {
 		outState.putSerializable("currentFragment", currentFragment);
@@ -1288,16 +1300,16 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	@Override
 	protected void onResume() {
 		super.onResume();
-		
+
 		if (!LinphoneService.isReady())  {
 			startService(new Intent(Intent.ACTION_MAIN).setClass(this, LinphoneService.class));
 		}
-		
+
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 		if (lc != null) {
 			lc.addListener(mListener);
 		}
-		
+
 		if (isTablet()) {
 			LinearLayout ll = (LinearLayout) findViewById(R.id.fragmentContainer2);
 			if (currentFragment == FragmentsAvailable.DIALER) {
@@ -1320,7 +1332,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			if (LinphoneManager.getLc().getCalls().length > 0) {
 				LinphoneCall call = LinphoneManager.getLc().getCalls()[0];
 				LinphoneCall.State callState = call.getState();
-				
+
 				if (callState == State.IncomingReceived) {
 					startActivity(new Intent(this, CallIncomingActivity.class));
 				} else if (callState == State.OutgoingInit || callState == State.OutgoingProgress || callState == State.OutgoingRinging) {
@@ -1366,7 +1378,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	@Override
 	protected void onNewIntent(Intent intent) {
 		super.onNewIntent(intent);
-		
+
 		Bundle extras = intent.getExtras();
 		if (extras != null && extras.getBoolean("GoToChat", false)) {
 			LinphoneService.instance().removeMessageNotification();
@@ -1438,8 +1450,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	public void initSideMenu() {
+
 		sideMenu = (DrawerLayout) findViewById(R.id.side_menu);
-		sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about)};
+		sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about),"Inapp"};
 		sideMenuContent = (RelativeLayout) findViewById(R.id.side_menu_content);
 		sideMenuItemList = (ListView)findViewById(R.id.item_list);
 		menu = (ImageView) findViewById(R.id.side_menu_button);
@@ -1448,15 +1461,18 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		sideMenuItemList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-				if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_settings))){
+				if (sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_settings))) {
 					LinphoneActivity.instance().displaySettings();
 				}
-				if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_about))){
+				if (sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_about))) {
 					LinphoneActivity.instance().displayAbout();
 				}
-				if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_assistant))){
+				if (sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_assistant))) {
 					LinphoneActivity.instance().displayAssistant();
 				}
+				if (sideMenuItemList.getAdapter().getItem(i).toString().equals("Inapp")) {
+					LinphoneActivity.instance().displayInapp();
+				}
 				openOrCloseSideMenu(false);
 			}
 		});
@@ -1538,6 +1554,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 	}
 
+
+
 	public void refreshAccounts(){
 		if (LinphoneManager.getLc().getProxyConfigList().length > 1) {
 			accountsList.setVisibility(View.VISIBLE);
@@ -1628,6 +1646,66 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			return view;
 		}
 	}
+
+	//Inapp Purchase
+	private void getTrialAccount() {
+		if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
+			XmlRpcHelper helper = new XmlRpcHelper();
+			helper.isTrialAccountAsync(new XmlRpcListenerBase() {
+				@Override
+				public void onTrialAccountFetched(boolean isTrial) {
+					if(isTrial){
+						displayInappDialog();
+					}
+				}
+			}, LinphonePreferences.instance().getAccountUsername(0), LinphonePreferences.instance().getAccountHa1(0));
+		}
+	}
+
+	private void getExpirationAccount() {
+		if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
+			XmlRpcHelper helper = new XmlRpcHelper();
+			helper.getAccountExpireAsync(new XmlRpcListenerBase() {
+				@Override
+				public void onAccountExpireFetched(String result) {
+					Log.w("RESULT " + result);
+				}
+			}, LinphonePreferences.instance().getAccountUsername(0), LinphonePreferences.instance().getAccountHa1(0));
+		}
+	}
+
+	public Dialog displayInappDialog(){
+		final Dialog dialog = new Dialog(this);
+		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorC));
+		d.setAlpha(200);
+		dialog.setContentView(R.layout.input_dialog);
+		dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+		dialog.getWindow().setBackgroundDrawable(d);
+
+		TextView customText = (TextView) dialog.findViewById(R.id.customText);
+		customText.setText(getString(R.string.error_bad_credentials));
+
+		Button retry = (Button) dialog.findViewById(R.id.retry);
+		Button cancel = (Button) dialog.findViewById(R.id.cancel);
+
+		retry.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+
+			}
+		});
+
+		cancel.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dialog.dismiss();
+			}
+		});
+
+		return dialog;
+	}
+
 }
 
 interface ContactPicked {
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 82f038bc0..a50ec6fb3 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -419,7 +419,6 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		friend.edit();
 		friend.setFamilyName(lastName);
 		friend.setGivenName(firstName);
-		friend.setName(fullName);
 		
 		for (LinphoneAddress address : friend.getAddresses()) {
 			friend.removeAddress(address);
@@ -444,17 +443,24 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 				friend.addPhoneNumber(noa.getValue());
 			}
 		}
+		if (friend.getAddress() != null) {
+			friend.setName(fullName);
+		}
 		friend.done();
 		
-		try {
-			LinphoneManager.getLcIfManagerNotDestroyedOrNull().addFriend(friend);
-			if (!ContactsManager.getInstance().hasContactsAccess()) {
-				// This refresh is only needed if app has no contacts permission to refresh the list of LinphoneFriends. 
-				// Otherwise contacts will be refreshed due to changes in native contact and the handler in ContactsManager
-				ContactsManager.getInstance().fetchContactsAsync();
+		if (friend.getAddress() != null) {
+			if (lc.findFriendByAddress(friend.getAddress().asString()) == null) {
+				try {
+					lc.addFriend(friend);
+					if (!ContactsManager.getInstance().hasContactsAccess()) {
+						// This refresh is only needed if app has no contacts permission to refresh the list of LinphoneFriends. 
+						// Otherwise contacts will be refreshed due to changes in native contact and the handler in ContactsManager
+						ContactsManager.getInstance().fetchContactsAsync();
+					}
+				} catch (LinphoneCoreException e) {
+					Log.e(e);
+				}
 			}
-		} catch (LinphoneCoreException e) {
-			Log.e(e);
 		}
 	}
 	
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 190cc74c8..3c9fb3718 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -26,6 +26,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 
+import org.linphone.core.LinphoneAccountCreator;
+import org.linphone.core.LinphoneAccountCreatorImpl;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAddress.TransportType;
 import org.linphone.core.LinphoneAuthInfo;
@@ -192,6 +194,11 @@ public class LinphonePreferences {
 		getLc().addAuthInfo(authInfo);
 	}
 
+
+	public LinphoneAccountCreator AccountCreator(LinphoneCore lc, String server_url) {
+		return new LinphoneAccountCreatorImpl(lc, server_url);
+	}
+
 	public static class AccountBuilder {
 		private LinphoneCore lc;
 		private String tempUsername;
@@ -537,6 +544,12 @@ public class LinphonePreferences {
 		LinphoneAuthInfo authInfo = getAuthInfo(n);
 		return authInfo == null ? null : authInfo.getPassword();
 	}
+
+	public String getAccountHa1(int n) {
+		LinphoneAuthInfo authInfo = getAuthInfo(n);
+		return authInfo == null ? null : authInfo.getHa1();
+	}
+
 	public void setAccountDomain(int n, String domain) {
 		String identity = "sip:" + getAccountUsername(n) + "@" + domain;
 		LinphoneAuthInfo old_info = getAuthInfo(n);
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index e2dd4e6b8..921b1db61 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -25,6 +25,8 @@ import org.linphone.LinphoneUtils;
 import org.linphone.LinphonePreferences.AccountBuilder;
 import org.linphone.R;
 import org.linphone.StatusFragment;
+import org.linphone.core.LinphoneAccountCreator;
+import org.linphone.core.LinphoneAccountCreatorImpl;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAddress.TransportType;
 import org.linphone.core.LinphoneCore;
@@ -112,8 +114,6 @@ private static AssistantActivity instance;
 		}
         mPrefs = LinphonePreferences.instance();
 		status.enableSideMenu(false);
-
-		checkAndRequestReadPhoneState();
         
         mListener = new LinphoneCoreListenerBase() {
         	@Override
@@ -269,7 +269,7 @@ private static AssistantActivity instance;
 		if (permissionGranted != PackageManager.PERMISSION_GRANTED) {
 			if (LinphonePreferences.instance().firstTimeAskingForPermission(permission) || ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {
 				Log.i("[Permission] Asking for " + permission);
-				ActivityCompat.requestPermissions(this, new String[] { permission }, result);
+				ActivityCompat.requestPermissions(this, new String[]{permission}, result);
 			}
 		}
 	}
@@ -464,7 +464,8 @@ private static AssistantActivity instance;
 			.setQualityReportingInterval(180)
 			.setRealm("sip.linphone.org")
 			.setNoDefault(false);
-			
+
+			mPrefs.enabledFriendlistSubscription(getResources().getBoolean(R.bool.use_friendlist_subscription));
 			
 			mPrefs.setStunServer(getString(R.string.default_stun));
 			mPrefs.setIceEnabled(true);
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index 44cc2bca1..a2df9e686 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -23,6 +23,8 @@ import java.util.regex.Pattern;
 
 import org.linphone.LinphoneManager;
 import org.linphone.R;
+import org.linphone.core.LinphoneAccountCreator;
+import org.linphone.core.LinphoneAccountCreatorImpl;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.LinphoneXmlRpcRequest;
 import org.linphone.core.LinphoneXmlRpcRequest.LinphoneXmlRpcRequestListener;
@@ -30,6 +32,7 @@ import org.linphone.core.LinphoneXmlRpcRequestImpl;
 import org.linphone.core.LinphoneXmlRpcSession;
 import org.linphone.core.LinphoneXmlRpcSessionImpl;
 import org.linphone.xmlrpc.XmlRpcHelper;
+import org.linphone.mediastream.Log;
 
 import android.Manifest;
 import android.accounts.Account;
@@ -54,10 +57,13 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
+import static org.linphone.core.LinphoneAccountCreator.*;
+
 /**
  * @author Sylvain Berfini
  */
-public class CreateAccountFragment extends Fragment implements CompoundButton.OnCheckedChangeListener, OnClickListener {
+public class CreateAccountFragment extends Fragment implements CompoundButton.OnCheckedChangeListener, OnClickListener, LinphoneAccountCreatorListener {
 	private Handler mHandler = new Handler();
 	private EditText phoneNumberEdit, usernameEdit, passwordEdit, passwordConfirmEdit, emailEdit, dialCode;
 	private TextView phoneNumberError, usernameError, passwordError, passwordConfirmError, emailError, sipUri;
@@ -73,6 +79,8 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	private final Pattern UPPER_CASE_REGEX = Pattern.compile("[A-Z]");
 	private LinphoneXmlRpcSession xmlRpcSession;
 	private CountryListFragment.Country country;
+
+	private LinphoneAccountCreator accountCreator;
 	
 	private String getUsername() {
 		String username = usernameEdit.getText().toString();
@@ -93,6 +101,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.assistant_account_creation, container, false);
 
+		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+		accountCreator.setListener(this);
+
 		phoneNumberError = (TextView) view.findViewById(R.id.phone_number_error);
 		phoneNumberEdit = (EditText) view.findViewById(R.id.phone_number);
 		phoneNumberEdit.addTextChangedListener(new TextWatcher() {
@@ -107,7 +118,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			public void afterTextChanged(Editable s) {}
 		});
 		phoneNumberLayout = (LinearLayout) view.findViewById(R.id.phone_number_layout);
-		addXMLRPCPhoneNumberHandler(phoneNumberEdit, null);
+		addPhoneNumberHandler(phoneNumberEdit, null);
 
 		selectCountry = (Button) view.findViewById(R.id.select_country);
 		selectCountry.setOnClickListener(this);
@@ -144,7 +155,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				public void afterTextChanged(Editable s) {}
 			});
 			usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
-			addXMLRPCUsernameHandler(usernameEdit, null);
+			addUsernameHandler(usernameEdit, null);
 		}
 
 		if(getResources().getBoolean(R.bool.isTablet)){
@@ -331,60 +342,6 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		xmlRpcRequest.addStringArg(username);
 		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
-
-	private void isPhoneNumberRegistred(final String username, final ImageView icon) {
-		final Runnable runOk = new Runnable() {
-			public void run() {
-				phoneNumberOk = false;
-				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, LinphoneManager.getInstance().getContext().getString(R.string.assistant_phone_number_unavailable));
-				//createAccount.setEnabled(phoneNumberOk);
-			}
-		};
-		final Runnable runNotOk = new Runnable() {
-			public void run() {
-				phoneNumberOk = true;
-				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, "");
-				createAccount.setEnabled(phoneNumberOk);
-			}
-		};
-		final Runnable runNotReachable = new Runnable() {
-			public void run() {
-				phoneNumberOk = false;
-				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, LinphoneManager.getInstance().getContext().getString(R.string.wizard_server_unavailable));
-				createAccount.setEnabled(phoneNumberOk);
-			}
-		};
-
-		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("is_phone_number_used", LinphoneXmlRpcRequest.ArgType.String);
-		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
-			@Override
-			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
-				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
-					final String response = request.getStringResponse();
-					if (response.equals(XmlRpcHelper.SERVER_RESPONSE_OK)) {
-						mHandler.post(runOk);
-					} else {
-						if(response.startsWith("ERROR")){
-							mHandler.post(new Runnable() {
-								@Override
-								public void run() {
-									phoneNumberOk = false;
-									displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, response);
-									//createAccount.setEnabled(phoneNumberOk);
-								}
-							});
-						} else {
-							mHandler.post(runNotOk);
-						}
-					}
-				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
-					mHandler.post(runNotReachable);
-				}
-			}
-		});
-		xmlRpcRequest.addStringArg(username);
-		xmlRpcSession.sendRequest(xmlRpcRequest);
-	}
 	
 	private boolean isEmailCorrect(String email) {
     	Pattern emailPattern = Patterns.EMAIL_ADDRESS;
@@ -477,29 +434,36 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 
-	private void addXMLRPCPhoneNumberHandler(final EditText field, final ImageView icon) {
+	private void addPhoneNumberHandler(final EditText field, final ImageView icon) {
 		field.addTextChangedListener(new TextWatcher() {
 			public void afterTextChanged(Editable s) {
 				if (s.length() > 0) {
 					phoneNumberOk = false;
 					String phoneNumber = getPhoneNumber();
-					if (LinphoneManager.getLc().createProxyConfig().isPhoneNumber(phoneNumber)) {
-						isPhoneNumberRegistred(phoneNumber, icon);
+					String countryCode = dialCode.getText().toString();
+					if(countryCode != null && countryCode.startsWith("+")) {
+						countryCode = countryCode.substring(1);
+					}
+					Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), countryCode);
+					if(status.equals(Status.Ok)){
+						accountCreator.isAccountUsed();
 					} else {
-						displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, getResources().getString(R.string.wizard_username_incorrect));
+						displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
 					}
 				} else {
 					displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, "");
 				}
 			}
 
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+			}
 
-			public void onTextChanged(CharSequence s, int start, int count, int after) {}
+			public void onTextChanged(CharSequence s, int start, int count, int after) {
+			}
 		});
 	}
 	
-	private void addXMLRPCUsernameHandler(final EditText field, final ImageView icon) {
+	private void addUsernameHandler(final EditText field, final ImageView icon) {
 		field.addTextChangedListener(new TextWatcher() {
 			public void afterTextChanged(Editable s) {
 				Matcher matcher = UPPER_CASE_REGEX.matcher(s);
@@ -510,30 +474,22 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			}
 
 			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-				
+
 			}
 
 			public void onTextChanged(CharSequence s, int start, int count, int after) {
-				field.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-					@Override
-					public void onFocusChange(View v, boolean hasFocus) {
-						if (!hasFocus) {
-							usernameOk = false;
-							String username = field.getText().toString();
-							if (isUsernameCorrect(username)) {
-								if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_wizard)) {
-									LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
-									username = lpc.normalizePhoneNumber(username);
-								}
-								isUsernameRegistred(username, icon);
-							} else {
-								displayError(usernameOk, usernameError, usernameEdit, getResources().getString(R.string.wizard_username_incorrect));
-							}
-						} else {
-							displayError(true, usernameError, usernameEdit, "");
-						}
+				if(s.length() > 0){
+					usernameOk = false;
+					Status status = accountCreator.setUsername(field.getText().toString());
+					if(status.equals(Status.Ok)){
+						accountCreator.setPhoneNumber(null,null);
+						accountCreator.isAccountUsed();
+					} else {
+						displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
 					}
-				});
+				} else {
+					displayError(true, usernameError, usernameEdit, "");
+				}
 			}
 		});
 	}
@@ -631,4 +587,96 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		field1.addTextChangedListener(passwordListener);
 		field2.addTextChangedListener(passwordListener);
 	}
+
+	String errorForStatus(Status status) {
+		boolean isPhoneNumber = (phoneNumberEdit.getText().length() > 0);
+		if (status.equals(Status.EmailInvalid))
+				return getString(R.string.invalid_email);
+		if (status.equals(Status.UsernameInvalid)){
+				return getString(R.string.invalid_username);
+		}
+		if (status.equals(Status.UsernameTooShort)){
+				return getString(R.string.username_too_short);
+		}
+		if (status.equals(Status.UsernameTooLong)){
+			return getString(R.string.username_too_long);
+		}
+		if (status.equals(Status.UsernameInvalidSize))
+				return getString(R.string.username_invalid_size);
+		if (status.equals(Status.PhoneNumberTooShort))
+				return getString(R.string.phone_number_too_short);
+		if (status.equals(Status.PhoneNumberTooLong))
+				return getString(R.string.phone_number_too_long);
+		if (status.equals(Status.PhoneNumberInvalid))
+				return getString(R.string.phone_number_invalid);
+		if (status.equals(Status.PasswordTooShort))
+				return getString(R.string.username_too_short);
+		if (status.equals(Status.PasswordTooLong))
+				return getString(R.string.username_too_long);
+		if (status.equals(Status.DomainInvalid))
+				return getString(R.string.invalid_domain);
+		if (status.equals(Status.RouteInvalid))
+				return getString(R.string.invalid_route);
+		if (status.equals(Status.DisplayNameInvalid))
+				return getString(R.string.invalid_route);
+		if (status.equals(Status.Failed))
+				return getString(R.string.request_failed);
+		if (status.equals(Status.TransportNotSupported))
+				return getString(R.string.transport_unsupported);
+		if (status.equals(Status.AccountExist))
+			return getString(R.string.account_already_exist);
+		if (status.equals(Status.AccountCreated)
+		 		|| status.equals(Status.AccountNotCreated)
+				|| status.equals(Status.AccountNotExist)
+				|| status.equals(Status.AccountNotActivated)
+				|| status.equals(Status.AccountAlreadyActivated)
+				|| status.equals(Status.AccountActivated)
+				|| status.equals(Status.Ok)){
+			return "";
+		}
+		return null;
+	}
+
+	@Override
+	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, final Status status) {
+		if(useUsername.isChecked()){
+			if (status.equals(Status.AccountNotExist)) {
+				usernameOk = true;
+				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
+			} else {
+				usernameOk = false;
+				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
+			}
+			createAccount.setEnabled(usernameOk && phoneNumberOk);
+		} else {
+			if (status.equals(Status.AccountNotExist)) {
+				phoneNumberOk = true;
+				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
+			} else {
+				phoneNumberOk = true;
+				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
+			}
+			createAccount.setEnabled(phoneNumberOk);
+		}
+	}
+
+	@Override
+	public void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, Status status) {
+	}
+
+	@Override
+	public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, Status status) {
+	}
+
+	@Override
+	public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, Status status) {
+	}
+
+	@Override
+	public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, Status status) {
+	}
+
+	@Override
+	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, Status status) {
+	}
 }
diff --git a/src/org/linphone/purchase/InAppPurchaseActivity.java b/src/org/linphone/purchase/InAppPurchaseActivity.java
index 3d747a635..bd84033d0 100644
--- a/src/org/linphone/purchase/InAppPurchaseActivity.java
+++ b/src/org/linphone/purchase/InAppPurchaseActivity.java
@@ -19,92 +19,141 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 import java.util.ArrayList;
-import java.util.Locale;
+import java.util.List;
 
-import org.linphone.LinphoneManager;
+import org.linphone.LinphonePreferences;
 import org.linphone.R;
-import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.mediastream.Log;
 import org.linphone.xmlrpc.XmlRpcHelper;
 import org.linphone.xmlrpc.XmlRpcListenerBase;
 
 import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 /**
  * @author Sylvain Berfini
  */
 public class InAppPurchaseActivity extends Activity implements InAppPurchaseListener, OnClickListener {
+	private static InAppPurchaseActivity instance;
 	private InAppPurchaseHelper inAppPurchaseHelper;
-	private LinearLayout purchasableItemsLayout;
-	private ArrayList<Purchasable> purchasedItems;
-	private Button buyItemButton, recoverAccountButton;
+	private ImageView cancel, back;
+
+	private List<Purchasable> purchasedItems;
+	private Fragment fragment;
 	private Handler mHandler = new Handler();
-	
-	private EditText username, email;
-	private TextView errorMessage;
-	private boolean usernameOk = false;
-	
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		inAppPurchaseHelper = new InAppPurchaseHelper(this, this);
-		
-		setContentView(R.layout.in_app_store);
-		purchasableItemsLayout = (LinearLayout) findViewById(R.id.purchasable_items);
-		
-		username = (EditText) findViewById(R.id.username);
-		email = (EditText) findViewById(R.id.email);
-		errorMessage = (TextView) findViewById(R.id.username_error);
-    	addUsernameHandler(username, errorMessage);
+		setContentView(R.layout.in_app);
+
+		back = (ImageView) findViewById(R.id.back);
+		back.setOnClickListener(this);
+		back.setVisibility(View.INVISIBLE);
+		cancel = (ImageView) findViewById(R.id.cancel);
+		cancel.setOnClickListener(this);
+
+		instance = this;
 	}
-	
+
+	private void changeFragment(Fragment newFragment) {
+		FragmentTransaction transaction = getFragmentManager().beginTransaction();
+		transaction.replace(R.id.fragment_container, newFragment);
+		transaction.commitAllowingStateLoss();
+	}
+
+	public void displayInappList() {
+		fragment = new InAppPurchaseListFragment();
+		changeFragment(fragment);
+	}
+
+	public void displayStore(Purchasable item) {
+		Bundle extra = new Bundle();
+		extra.putString("item_id",item.getId());
+		fragment = new InAppPurchaseFragment();
+		fragment.setArguments(extra);
+		changeFragment(fragment);
+	}
+
+	public void buyInapp(String username, Purchasable item){
+		LinphonePreferences.instance().setInAppPurchasedItem(item);
+		inAppPurchaseHelper.purchaseItemAsync(item.getId(), username);
+	}
+
+
+	public String getGmailAccount() {
+		return inAppPurchaseHelper.getGmailAccount();
+	}
+
+
 	@Override
 	protected void onDestroy() {
+		instance = null;
 		inAppPurchaseHelper.destroy();
 		super.onDestroy();
 	}
+
+	public List<Purchasable> getPurchasedItems() {
+
+		if (purchasedItems == null || purchasedItems.size() == 0) {
+			Log.w("nul");
+		}
+		return purchasedItems;
+	}
+
+	public Purchasable getPurchasedItem(String id) {
+		for(Purchasable item : purchasedItems){
+			if (item.getId().equals(id)){
+				return item;
+			}
+		}
+		return null;
+	}
+
+	public static InAppPurchaseActivity instance() {
+		return instance;
+	}
 	
 	@Override
 	public void onServiceAvailableForQueries() {
-		email.setText(inAppPurchaseHelper.getGmailAccount());
-		email.setEnabled(false);
+		//email.setText(inAppPurchaseHelper.getGmailAccount());
+		//email.setEnabled(false);
 		
-		inAppPurchaseHelper.getPurchasedItemsAsync();
+		//inAppPurchaseHelper.getPurchasedItemsAsync();
+		inAppPurchaseHelper.getAvailableItemsForPurchaseAsync();
 	}
 
 	@Override
 	public void onAvailableItemsForPurchaseQueryFinished(ArrayList<Purchasable> items) {
-		purchasableItemsLayout.removeAllViews();
-		
+		//purchasableItemsLayout.removeAllViews();
+
+		purchasedItems = new ArrayList<Purchasable>();
 		for (Purchasable item : items) {
-			displayBuySubscriptionButton(item);
+			purchasedItems.add(item);
 		}
+		displayInappList();
 	}
 
 	@Override
 	public void onPurchasedItemsQueryFinished(ArrayList<Purchasable> items) {
 		purchasedItems = items;
-		
+
 		if (items == null || items.size() == 0) {
 			inAppPurchaseHelper.getAvailableItemsForPurchaseAsync();
 		} else {
 			for (Purchasable purchasedItem : purchasedItems) {
 				Log.d("[In-app purchase] Found already bought item, expires " + purchasedItem.getExpireDate());
-				displayRecoverAccountButton(purchasedItem);
+				//displayRecoverAccountButton(purchasedItem);
 			}
 		}
 	}
@@ -113,28 +162,26 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList
 	public void onPurchasedItemConfirmationQueryFinished(boolean success) {
 		if (success) {
 			XmlRpcHelper xmlRpcHelper = new XmlRpcHelper();
-			xmlRpcHelper.createAccountAsync(new XmlRpcListenerBase() {
+
+			Purchasable item = LinphonePreferences.instance().getInAppPurchasedItem();
+
+			xmlRpcHelper.updateAccountExpireAsync(new XmlRpcListenerBase() {
 				@Override
-				public void onAccountCreated(String result) {
+				public void onAccountExpireUpdated(String result) {
 					//TODO
 				}
-			}, getUsername(), email.getText().toString(), null);
+			}, LinphonePreferences.instance().getAccountUsername(0), LinphonePreferences.instance().getAccountHa1(0), getString(R.string.default_domain), item.getPayload(), item.getPayloadSignature());
 		}
 	}
 
 	@Override
 	public void onClick(View v) {
-		Purchasable item = (Purchasable) v.getTag();
-		if (v.equals(recoverAccountButton)) {
-			XmlRpcHelper xmlRpcHelper = new XmlRpcHelper();
-			xmlRpcHelper.createAccountAsync(new XmlRpcListenerBase() {
-				@Override
-				public void onAccountCreated(String result) {
-					//TODO
-				}
-			}, getUsername(), email.getText().toString(), null);
-		} else {
-			inAppPurchaseHelper.purchaseItemAsync(item.getId(), getUsername());
+		int id = v.getId();
+
+		if (id == R.id.cancel) {
+			finish();
+		} else if (id == R.id.back) {
+			onBackPressed();
 		}
 	}
 	
@@ -145,12 +192,6 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList
 
 	@Override
 	public void onRecoverAccountSuccessful(boolean success) {
-		mHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				recoverAccountButton.setEnabled(false);				
-			}
-		});
 	}
 
 	@Override
@@ -170,70 +211,4 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList
 			Log.d("[In-app purchase] Account activated");
 		}
 	}
-	
-	private void displayBuySubscriptionButton(Purchasable item) {
-		View layout = LayoutInflater.from(this).inflate(R.layout.in_app_purchasable, purchasableItemsLayout);
-		Button button = (Button) layout.findViewById(R.id.inapp_button);
-		button.setText("Buy account (" + item.getPrice() + ")");
-		button.setTag(item);
-		button.setOnClickListener(this);
-		XmlRpcHelper xmlRpcHelper = new XmlRpcHelper();
-		xmlRpcHelper.createAccountAsync(new XmlRpcListenerBase() {
-			@Override
-			public void onAccountCreated(String result) {
-				//TODO
-			}
-		}, getUsername(), email.getText().toString(), null);
-		
-		buyItemButton = button;
-		buyItemButton.setEnabled(usernameOk);
-	}
-	
-	private void displayRecoverAccountButton(Purchasable item) {
-		View layout = LayoutInflater.from(this).inflate(R.layout.in_app_purchasable, purchasableItemsLayout);
-		Button button = (Button) layout.findViewById(R.id.inapp_button);
-		button.setText("Recover account");
-		button.setTag(item);
-		button.setOnClickListener(this);
-		
-		recoverAccountButton = button;
-		recoverAccountButton.setEnabled(usernameOk);
-	}
-	
-	private String getUsername() {
-		String username = this.username.getText().toString();
-		LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
-		username = lpc.normalizePhoneNumber(username);
-		return username.toLowerCase(Locale.getDefault());
-	}
-	
-	private boolean isUsernameCorrect(String username) {
-		LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
-		return lpc.isPhoneNumber(username);
-	}
-	
-	private void addUsernameHandler(final EditText field, final TextView errorMessage) {
-		field.addTextChangedListener(new TextWatcher() {
-			public void afterTextChanged(Editable s) {
-				
-			}
-
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-				
-			}
-
-			public void onTextChanged(CharSequence s, int start, int count, int after) {
-				usernameOk = false;
-				String username = s.toString();
-				if (isUsernameCorrect(username)) {
-					usernameOk = true;
-					errorMessage.setText("");
-				} else {
-					errorMessage.setText(R.string.wizard_username_incorrect);
-				}
-				if (buyItemButton != null) buyItemButton.setEnabled(usernameOk);
-				if (recoverAccountButton != null) recoverAccountButton.setEnabled(usernameOk);
-			}
-		});
-	}
 }
diff --git a/src/org/linphone/purchase/InAppPurchaseFragment.java b/src/org/linphone/purchase/InAppPurchaseFragment.java
new file mode 100644
index 000000000..4657a2ed8
--- /dev/null
+++ b/src/org/linphone/purchase/InAppPurchaseFragment.java
@@ -0,0 +1,150 @@
+package org.linphone.purchase;
+/*
+InAppPurchaseFragment.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program 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, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.linphone.LinphoneManager;
+import org.linphone.LinphonePreferences;
+import org.linphone.R;
+import org.linphone.mediastream.Log;
+import org.linphone.core.LinphoneProxyConfig;
+import org.linphone.xmlrpc.XmlRpcHelper;
+import org.linphone.xmlrpc.XmlRpcListenerBase;
+
+import java.util.Locale;
+
+
+public class InAppPurchaseFragment extends Fragment implements View.OnClickListener {
+
+	private EditText username, email;
+	private TextView errorMessage;
+
+	private boolean usernameOk = false;
+	private Handler mHandler = new Handler();
+	private Button buyItemButton, recoverAccountButton;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+						 Bundle savedInstanceState) {
+		
+		super.onCreate(savedInstanceState);
+
+		LayoutInflater mInflater = inflater;
+		View view = inflater.inflate(R.layout.in_app_store, container, false);
+
+		String id = getArguments().getString("item_id");
+		Purchasable item = InAppPurchaseActivity.instance().getPurchasedItem(id);
+
+		Log.w("Item store " + item.getDescription());
+
+		buyItemButton = (Button) view.findViewById(R.id.inapp_button);
+
+		displayBuySubscriptionButton(item);
+
+		username = (EditText) view.findViewById(R.id.username);
+		username.setText(LinphonePreferences.instance().getAccountUsername(0));
+		email = (EditText) view.findViewById(R.id.email);
+		email.setText(InAppPurchaseActivity.instance().getGmailAccount());
+		errorMessage = (TextView) view.findViewById(R.id.username_error);
+		addUsernameHandler(username, errorMessage);
+		return view;
+	}
+
+	private void addUsernameHandler(final EditText field, final TextView errorMessage) {
+		field.addTextChangedListener(new TextWatcher() {
+			public void afterTextChanged(Editable s) {
+
+			}
+
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+			}
+
+			public void onTextChanged(CharSequence s, int start, int count, int after) {
+				usernameOk = false;
+				String username = s.toString();
+				if (isUsernameCorrect(username)) {
+					usernameOk = true;
+					errorMessage.setText("");
+				} else {
+					errorMessage.setText(R.string.wizard_username_incorrect);
+				}
+				if (buyItemButton != null) buyItemButton.setEnabled(usernameOk);
+				if (recoverAccountButton != null) recoverAccountButton.setEnabled(usernameOk);
+			}
+		});
+	}
+
+
+	private boolean isUsernameCorrect(String username) {
+		LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
+		return lpc.isPhoneNumber(username);
+	}
+
+	private void displayBuySubscriptionButton(Purchasable item) {
+		//View layout = LayoutInflater.from(this).inflate(R.layout.in_app_purchasable, purchasableItemsLayout);
+		//Button button = (Button) layout.findViewById(R.id.inapp_button);
+		buyItemButton.setText("Buy account (" + item.getPrice() + ")");
+		buyItemButton.setTag(item);
+		buyItemButton.setOnClickListener(this);
+		/*XmlRpcHelper xmlRpcHelper = new XmlRpcHelper();
+		xmlRpcHelper.createAccountAsync(new XmlRpcListenerBase() {
+			@Override
+			public void onAccountCreated(String result) {
+				//TODO
+			}
+		}, getUsername(), email.getText().toString(), null);*/
+
+		buyItemButton.setEnabled(usernameOk);
+	}
+
+	@Override
+	public void onClick(View v) {
+		Purchasable item = (Purchasable) v.getTag();
+		if (v.equals(recoverAccountButton)) {
+			//XmlRpcHelper xmlRpcHelper = new XmlRpcHelper();
+			/*xmlRpcHelper.createAccountAsync(new XmlRpcListenerBase() {
+				@Override
+				public void onAccountCreated(String result) {
+					//TODO
+				}
+			}, getUsername(), email.getText().toString(), null);*/
+		} else {
+			InAppPurchaseActivity.instance().buyInapp(getUsername(), item);
+		}
+	}
+
+	private String getUsername() {
+		String username = this.username.getText().toString();
+		LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
+		username = lpc.normalizePhoneNumber(username);
+		return username.toLowerCase(Locale.getDefault());
+	}
+}
\ No newline at end of file
diff --git a/src/org/linphone/purchase/InAppPurchaseHelper.java b/src/org/linphone/purchase/InAppPurchaseHelper.java
index 2f2cc9828..62a584b06 100644
--- a/src/org/linphone/purchase/InAppPurchaseHelper.java
+++ b/src/org/linphone/purchase/InAppPurchaseHelper.java
@@ -126,15 +126,20 @@ public class InAppPurchaseHelper {
 		mContext = context;
 		mListener = listener;
 		mGmailAccount = getGmailAccount();
-		
+
+
+		Log.d("[In-app purchase] creating InAppPurchaseHelper for context "+context.getLocalClassName());
+
 		mServiceConn = new ServiceConnection() {
 		   @Override
 		   public void onServiceDisconnected(ComponentName name) {
+			   Log.d("[In-app purchase] onServiceDisconnected!");
 		       mService = null;
 		   }
 
 		   @Override
 		   public void onServiceConnected(ComponentName name, IBinder service) {
+			   Log.d("[In-app purchase] onServiceConnected!");
 			   mService = IInAppBillingService.Stub.asInterface(service);
 		       String packageName = mContext.getPackageName();
 		       try {
@@ -150,7 +155,7 @@ public class InAppPurchaseHelper {
 		       }
 		   }
 		};
-		
+
 		Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
 		serviceIntent.setPackage("com.android.vending");
         if (!mContext.getPackageManager().queryIntentServices(serviceIntent, 0).isEmpty()) {
@@ -177,7 +182,7 @@ public class InAppPurchaseHelper {
 		} catch (RemoteException e) {
 			Log.e(e);
 		}
-		
+
 		if (skuDetails != null) {
 			int response = skuDetails.getInt(RESPONSE_CODE);
 			if (response == RESPONSE_RESULT_OK) {
@@ -191,6 +196,7 @@ public class InAppPurchaseHelper {
 						String desc = object.getString(SKU_DETAILS_DESC);
 						
 						Purchasable purchasable = new Purchasable(id).setTitle(title).setDescription(desc).setPrice(price);
+						Log.w("Purchasable item " + purchasable.getDescription());
 						products.add(purchasable);
 					} catch (JSONException e) {
 						Log.e(e);
@@ -276,6 +282,10 @@ public class InAppPurchaseHelper {
 			if (resultCode == Activity.RESULT_OK && responseCode == RESPONSE_RESULT_OK) {
 				String payload = data.getStringExtra(RESPONSE_INAPP_PURCHASE_DATA);
 				String signature = data.getStringExtra(RESPONSE_INAPP_SIGNATURE);
+
+				Purchasable item = LinphonePreferences.instance().getInAppPurchasedItem();
+				item.setPayloadAndSignature(payload, signature);
+				LinphonePreferences.instance().setInAppPurchasedItem(item);
 				
 				XmlRpcHelper xmlRpcHelper = new XmlRpcHelper();
 				xmlRpcHelper.verifySignatureAsync(new XmlRpcListenerBase() {
diff --git a/src/org/linphone/purchase/InAppPurchaseListFragment.java b/src/org/linphone/purchase/InAppPurchaseListFragment.java
new file mode 100644
index 000000000..2acf64ec2
--- /dev/null
+++ b/src/org/linphone/purchase/InAppPurchaseListFragment.java
@@ -0,0 +1,100 @@
+package org.linphone.purchase;
+
+/*
+InAppPurchaseListFragment.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program 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, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+import android.widget.AdapterView;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import org.linphone.R;
+import org.linphone.mediastream.Log;
+import java.util.List;
+
+public class InAppPurchaseListFragment extends Fragment implements AdapterView.OnItemClickListener{
+	private ListView inappList;
+	private LayoutInflater mInflater;
+	private List<Purchasable> mPurchasableItems;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+							 Bundle savedInstanceState) {
+		mInflater = inflater;
+		View view = inflater.inflate(R.layout.in_app_list, container, false);
+
+		mPurchasableItems = InAppPurchaseActivity.instance().getPurchasedItems();
+		inappList = (ListView) view.findViewById(R.id.inapp_list);
+
+		if(mPurchasableItems != null){
+			inappList.setAdapter(new InAppListAdapter());
+			inappList.setOnItemClickListener(this);
+		}
+		return view;
+	}
+
+	class InAppListAdapter extends BaseAdapter {
+		InAppListAdapter() {}
+
+		public int getCount() {
+			return mPurchasableItems.size();
+		}
+
+		public Object getItem(int position) {
+			return mPurchasableItems.get(position);
+		}
+
+		public long getItemId(int position) {
+			return position;
+		}
+
+		public View getView(final int position, View convertView, ViewGroup parent) {
+			View view = null;
+			if (convertView != null) {
+				view = convertView;
+			} else {
+				view = mInflater.inflate(R.layout.in_app_purchase_item, parent, false);
+			}
+
+			final Purchasable item = mPurchasableItems.get(position);
+
+			TextView itemTitle = (TextView) view.findViewById(R.id.purchase_title);
+			TextView itemDesc = (TextView) view.findViewById(R.id.purchase_description);
+			TextView itemPrice = (TextView) view.findViewById(R.id.purchase_price);
+
+			itemTitle.setText(item.getTitle());
+			itemDesc.setText(item.getDescription());
+			itemPrice.setText(item.getPrice());
+
+			view.setTag(item);
+			return view;
+		}
+	}
+
+
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		Purchasable item = (Purchasable) view.getTag();
+		InAppPurchaseActivity.instance().displayStore(item);
+	}
+}
diff --git a/src/org/linphone/xmlrpc/XmlRpcHelper.java b/src/org/linphone/xmlrpc/XmlRpcHelper.java
index e87ab6012..30b025e56 100644
--- a/src/org/linphone/xmlrpc/XmlRpcHelper.java
+++ b/src/org/linphone/xmlrpc/XmlRpcHelper.java
@@ -56,7 +56,7 @@ public class XmlRpcHelper {
 	}
 	
 	public void getAccountExpireAsync(final XmlRpcListener listener, String username, String password) {
-		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("get_expiration_for_account", LinphoneXmlRpcRequest.ArgType.String);
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("get_account_expiration", LinphoneXmlRpcRequest.ArgType.String);
 		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
 			@Override
 			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
@@ -79,7 +79,7 @@ public class XmlRpcHelper {
 		xmlRpcSession.sendRequest(xmlRpcRequest);
 	}
 	
-	public void updateAccountExpireAsync(final XmlRpcListener listener, String username, String password, String payload, String signature) {
+	public void updateAccountExpireAsync(final XmlRpcListener listener, String username, String password, String domain, String payload, String signature) {
 		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("update_expiration_date", LinphoneXmlRpcRequest.ArgType.String);
 		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
 			@Override
@@ -100,6 +100,7 @@ public class XmlRpcHelper {
 		});
 		xmlRpcRequest.addStringArg(username);
 		xmlRpcRequest.addStringArg(password);
+		xmlRpcRequest.addStringArg(domain);
 		xmlRpcRequest.addStringArg(payload);
 		xmlRpcRequest.addStringArg(signature);
 		xmlRpcSession.sendRequest(xmlRpcRequest);
@@ -164,7 +165,7 @@ public class XmlRpcHelper {
 					if (!"NOK".equals(result) && !"OK".equals(result)) {
 						listener.onError(result);
 					}
-					listener.onAccountFetched("OK".equals(result));
+					listener.onTrialAccountFetched("OK".equals(result));
 				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
 					Log.e(result);
 					listener.onError(result);
@@ -352,12 +353,13 @@ public class XmlRpcHelper {
 	}
 	
 	public void verifySignatureAsync(final XmlRpcListener listener, String payload, String signature) {
-		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("verify_payload_signature", LinphoneXmlRpcRequest.ArgType.String);
+		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("check_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) {
+					Log.w(result);
 					if (result.startsWith("ERROR_")) {
 						Log.e(result);
 						listener.onError(result);

From ecf792a7fe29098e406e7751c3c698096fe69fd7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 9 Aug 2016 14:40:15 +0200
Subject: [PATCH 08/36] Use compatibility method for setTextAppearance

---
 src/org/linphone/ChatFragment.java            |  8 ++--
 .../linphone/compatibility/ApiElevenPlus.java |  6 +++
 .../compatibility/ApiTwentyThreePlus.java     | 48 +++++++++++++++++++
 .../linphone/compatibility/Compatibility.java | 10 ++++
 4 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 src/org/linphone/compatibility/ApiTwentyThreePlus.java

diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 5dfdadc77..77d160176 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -1187,8 +1187,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 				layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
 				layoutParams.setMargins(100, 10, 10, 10);
 				holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_outgoing);
-				holder.contactName.setTextAppearance(R.style.font3);
-				holder.fileTransferAction.setTextAppearance(R.style.font15);
+				Compatibility.setTextAppearance(holder.contactName, getActivity(), R.style.font3);
+				Compatibility.setTextAppearance(holder.fileTransferAction, getActivity(), R.style.font15);
 				holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_confirm_delete_button);
 			} else {
 				if (isEditMode) {
@@ -1199,8 +1199,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 					layoutParams.setMargins(10, 10, 100, 10);
 				}
 				holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
-				holder.contactName.setTextAppearance(R.style.font9);
-				holder.fileTransferAction.setTextAppearance(R.style.font8);
+				Compatibility.setTextAppearance(holder.contactName, getActivity(), R.style.font9);
+				Compatibility.setTextAppearance(holder.fileTransferAction, getActivity(), R.style.font8);
 				holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
 			}
 			holder.bubbleLayout.setLayoutParams(layoutParams);
diff --git a/src/org/linphone/compatibility/ApiElevenPlus.java b/src/org/linphone/compatibility/ApiElevenPlus.java
index 7b30e5581..ba7711204 100644
--- a/src/org/linphone/compatibility/ApiElevenPlus.java
+++ b/src/org/linphone/compatibility/ApiElevenPlus.java
@@ -17,6 +17,7 @@ import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.SipAddress;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Intents.Insert;
+import android.widget.TextView;
 
 /*
 ApiElevenPlus.java
@@ -162,4 +163,9 @@ public class ApiElevenPlus {
 
 		return notif;
 	}
+
+	@SuppressWarnings("deprecation")
+	public static void setTextAppearance(TextView textview, Context context, int style) {
+		textview.setTextAppearance(context, style);
+	}
 }
diff --git a/src/org/linphone/compatibility/ApiTwentyThreePlus.java b/src/org/linphone/compatibility/ApiTwentyThreePlus.java
new file mode 100644
index 000000000..8efdfccfe
--- /dev/null
+++ b/src/org/linphone/compatibility/ApiTwentyThreePlus.java
@@ -0,0 +1,48 @@
+package org.linphone.compatibility;
+
+import java.util.ArrayList;
+
+import org.linphone.R;
+
+import android.annotation.TargetApi;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Intents.Insert;
+import android.widget.TextView;
+
+/*
+ApiTwentyThreePlus.java
+Copyright (C) 2012  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program 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, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+/**
+ * @author Sylvain Berfini
+ */
+@TargetApi(23)
+public class ApiTwentyThreePlus {
+	public static void setTextAppearance(TextView textview, int style) {
+		textview.setTextAppearance(style);
+	}
+}
diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/org/linphone/compatibility/Compatibility.java
index cad5a21a0..9fac817b5 100644
--- a/src/org/linphone/compatibility/Compatibility.java
+++ b/src/org/linphone/compatibility/Compatibility.java
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 import org.linphone.mediastream.Version;
 
+import android.app.Activity;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -29,6 +30,7 @@ import android.text.Html;
 import android.text.Spanned;
 import android.view.ViewTreeObserver;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.widget.TextView;
 /**
  * @author Sylvain Berfini
  */
@@ -120,4 +122,12 @@ public class Compatibility {
 		}*/
 		return Html.fromHtml(text);
 	}
+
+	public static void setTextAppearance(TextView textview, Context context, int style) {
+		if (Version.sdkAboveOrEqual(Version.API23_MARSHMALLOW_60)) {
+			ApiTwentyThreePlus.setTextAppearance(textview, style);
+		} else {
+			ApiElevenPlus.setTextAppearance(textview, context, style);
+		}
+	}
 }

From e270bb6b6d2f58465cb0e58844cfa6ac9da21f81 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 9 Aug 2016 14:55:59 +0200
Subject: [PATCH 09/36] Fix LinphoneContact which wasn't serializable anymore,
 causing crash when calling from contact

---
 src/org/linphone/ContactsManager.java | 2 ++
 src/org/linphone/LinphoneContact.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index b67f1453d..f36f83896 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -247,6 +247,8 @@ public class ContactsManager extends ContentObserver {
 					}
 					c.close();
 				}
+			} else {
+				Log.w("[Permission] Read contacts permission wasn't granted, only fetch LinphoneFriends");
 			}
 
 			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index c53310b1f..ef7f2fa48 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -59,7 +59,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 	private transient ArrayList<ContentProviderOperation> changesToCommit;
 	private transient ArrayList<ContentProviderOperation> changesToCommit2;
 	private boolean hasSipAddress;
-	private Bitmap photoBitmap, thumbnailBitmap;
+	private transient Bitmap photoBitmap, thumbnailBitmap;
 	
 	public LinphoneContact() {
 		addresses = new ArrayList<LinphoneNumberOrAddress>();

From 59be616a43de2dd79af7b2ce5272430bf00e44fe Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 11 Aug 2016 13:58:50 +0200
Subject: [PATCH 10/36] Add notification for trial account and add boolean for
 interface customization

---
 res/layout/in_app.xml                         |   1 +
 res/layout/in_app_store.xml                   |   1 +
 res/values/non_localizable_custom.xml         |  90 +++++++--------
 res/values/strings.xml                        |   6 +-
 .../linphone/AccountPreferencesFragment.java  |   2 +-
 src/org/linphone/LinphoneActivity.java        | 106 ++++++++++--------
 src/org/linphone/LinphonePreferences.java     |   8 ++
 src/org/linphone/LinphoneService.java         |  10 ++
 .../linphone/assistant/AssistantActivity.java |  20 +---
 .../CreateAccountCodeActivationFragment.java  |   5 +-
 .../assistant/CreateAccountFragment.java      |  49 ++++----
 .../assistant/LinphoneLoginFragment.java      |   2 +-
 .../linphone/assistant/WelcomeFragment.java   |   6 +-
 .../purchase/InAppPurchaseActivity.java       |  10 +-
 .../purchase/InAppPurchaseFragment.java       |  87 +++++++++-----
 .../purchase/InAppPurchaseListFragment.java   |   2 +-
 16 files changed, 231 insertions(+), 174 deletions(-)

diff --git a/res/layout/in_app.xml b/res/layout/in_app.xml
index 7eaa23c8b..69b6562b7 100644
--- a/res/layout/in_app.xml
+++ b/res/layout/in_app.xml
@@ -15,6 +15,7 @@
 
 	<LinearLayout
 		android:id="@+id/topbar"
+		android:layout_below="@+id/status"
 		android:background="@color/colorF"
 		android:orientation="horizontal"
 		android:layout_gravity="center_horizontal"
diff --git a/res/layout/in_app_store.xml b/res/layout/in_app_store.xml
index 923ae5f4c..cccaf054e 100644
--- a/res/layout/in_app_store.xml
+++ b/res/layout/in_app_store.xml
@@ -13,6 +13,7 @@
 	    android:orientation="vertical">
 
 		<LinearLayout
+			android:id="@+id/username_layout"
 			android:orientation="vertical"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content">
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 2c8a608da..09452bf69 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -1,80 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	
-	<!-- New settings -->
-	<string name="default_domain">sip.linphone.org</string>
-	<string name="default_stun">stun.linphone.org</string>
 
+	<!-- Global -->
+	<string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses -->
 	<string name="sync_account_type">org.linphone</string> <!-- Change package ! -->
 	<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! -->
-
-	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool>
-	<bool name="assistant_allow_username">true</bool> <!-- Allow to use an username instead of the phone number for account creation -->
-	<bool name="hide_in_call_stats">false</bool>
 	<bool name="orientation_portrait_only">false</bool>
 	<bool name="show_statusbar_only_on_dialer">false</bool>
-	<bool name="replace_assistant_with_old_interface">false</bool>
 	<bool name="force_use_of_linphone_friends">false</bool>
-	<bool name="in_app_purchase_in_settings">false</bool>
-	<bool name="use_friendlist_subscription">true</bool>
+	<bool name="use_linphone_tag">true</bool>
 
-	<string name="wizard_url">https://sip3.linphone.org:444/inapp.php</string>
+	<!-- Assistant -->
+	<string name="wizard_url">https://sip3.linphone.org:444/inapp.php</string><!-- Url of the xmlrpc script -->
+	<bool name="assistant_allow_username">false</bool> <!-- Allow to use an username instead of the phone number for account creation -->
+	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool><!-- Start assistant in loginFragment view instead of menu -->
+	<bool name="replace_assistant_with_old_interface">false</bool>
+	<bool name="hide_assistant">false</bool>
+	<bool name="assistant_cancel_move_to_back">false</bool>
+	<bool name="pre_fill_email_in_assistant">true</bool> <!-- Set the email field of the wizard with one of the gmail account registered on the device -->
+	<bool name="assistant_account_validation_mandatory">false</bool>
+	<bool name="allow_only_phone_numbers_in_assistant">false</bool>
+	<bool name="hide_linphone_accounts_in_assistant">false</bool>
+	<bool name="hide_generic_accounts_in_assistant">false</bool>
+	<bool name="hide_remote_provisioning_in_assistant">false</bool>
+	<bool name="display_account_assistant_at_first_start">true</bool>
+	<bool name="hide_H264_downloader">false</bool><!-- Set the email field of the wizard with one of the gmail account registered on the device -->
 
+	<!-- Remote provisioning -->
+	<bool name="display_sms_remote_provisioning_activity">false</bool>
+	<bool name="forbid_app_usage_until_remote_provisioning_completed">false</bool>
+	<bool name="display_confirmation_popup_after_first_configuration">false</bool>
+	<bool name="allow_cancel_remote_provisioning_login_activity">true</bool>
+
+	<!-- Inapp -->
+	<bool name="enabled_in_app_purchase">true</bool>
+	<bool name="in_app_purchase_in_settings">true</bool>
+	<integer name="number_days_reminder">28</integer><!-- Remind to biy account  -->
+	<bool name="hide_username_in_inapp">true</bool>
 
 	<!-- Push notification settings -->
 	<bool name="enable_push_id">true</bool>
 	<string name="push_sender_id">622464153529</string>
-	<bool name="hide_camera_settings">false</bool>
-	<bool name="hide_wizard">false</bool>
-
-	<bool name="disable_chat">false</bool>
-	<bool name="disable_chat_message_notification">false</bool>
-	<bool name="disable_chat_send_file">false</bool>
-	
-	<bool name="setup_account_validation_mandatory">false</bool>
-	<bool name="hide_linphone_accounts_wizard">false</bool>
-	<bool name="hide_generic_accounts_wizard">false</bool>
-	<bool name="hide_remote_provisioning_in_wizard">false</bool>
-	<bool name="allow_cancel_remote_provisioning_login_activity">true</bool>
-	<bool name="hide_accounts">false</bool>
-	<bool name="display_account_wizard_at_first_start">true</bool>
-	<bool name="allow_only_phone_numbers_in_wizard">false</bool>
-
-	<bool name="use_linphone_tag">true</bool>
-
-	<bool name="pre_fill_email_in_wizard">true</bool> <!-- Set the email field of the wizard with one of the gmail account registered on the device -->
 
+	<!-- Call -->
 	<bool name="forbid_self_call">false</bool>
 	<bool name="allow_ringing_while_early_media">true</bool>
 	<bool name="allow_transfers">true</bool>
 	<bool name="disable_options_in_call">false</bool>
+	<bool name="automatically_start_intercepted_outgoing_gsm_call">true</bool><!-- This settings handle the behavior of the view waiting for the remote provisioning configuration to be done -->
+	<bool name="hide_camera_settings">false</bool>
+	<bool name="hide_in_call_stats">false</bool>
 
-	<bool name="automatically_start_intercepted_outgoing_gsm_call">true</bool>
-	<!-- This settings handle the behavior of the view waiting for the remote provisioning configuration to be done -->
-	<bool name="display_sms_remote_provisioning_activity">false</bool>
-	<bool name="forbid_app_usage_until_remote_provisioning_completed">false</bool>
-	<bool name="display_confirmation_popup_after_first_configuration">false</bool>
+	<!-- Settings -->
 	<bool name="disable_every_log">false</bool>
 	<bool name="disable_all_security_features_for_markets">false</bool> <!-- Disable TLS/SRTP/ZRTP -->
 	<bool name="disable_all_patented_codecs_for_markets">false</bool> <!-- Disable MPEG4/H264 -->
-	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
+	<bool name="use_friendlist_subscription">true</bool>
+	<string name="default_stun">stun.linphone.org</string>
+	<bool name="hide_accounts">false</bool>
 
+	<!-- Chat -->
+	<bool name="disable_chat">false</bool>
+	<bool name="disable_chat_message_notification">false</bool>
+	<bool name="disable_chat_send_file">false</bool>
 	<string name="temp_photo_name">linphone-android-photo-temp</string>
 	<string name="temp_photo_name_with_date">linphone-android-photo-%s</string>
 
-	<bool name="hide_phone_numbers_in_editor">false</bool>
-	<bool name="hide_sip_addresses_in_editor">false</bool>
-	
+	<!-- Contacts -->
 	<bool name="hide_contact_phone_numbers">false</bool>
 	<bool name="hide_contact_sip_addresses">false</bool>
-	
+	<bool name="hide_phone_numbers_in_editor">false</bool>
+	<bool name="hide_sip_addresses_in_editor">false</bool>
 	<bool name="allow_only_one_phone_number">false</bool>
 	<bool name="allow_only_one_sip_address">false</bool>
-	
 	<bool name="display_contact_organization">true</bool>
-	
-	<bool name="setup_cancel_move_to_back">false</bool>
 
+	<!-- Others Parameters-->
+	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 	<bool name="enable_call_notification">true</bool>
 	<bool name="kill_service_with_task_manager">true</bool>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 62bd17bb9..5edc40d99 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,8 @@
 	<string name="sync_account_name">linphone contacts</string>
 	<string name="history_date_format">EEE, d MMM</string>
 	<string name="history_detail_date_format">yyyy/MM/dd - HH:mm - </string>
+	<string name="inapp_popup_date_format">yyyy/MM/dd</string>
+	<string name="inapp_popup_date_day">dd</string>
 	<string name="messages_date_format">dd/MM, HH:mm</string>
 	<string name="messages_list_date_format">dd/MM</string>
 	<string name="today_date_format">HH:mm</string>
@@ -118,7 +120,9 @@
 	<string name="transport_unsupported">Unsupported transport</string>
 
 	<!-- In-app -->
-	<string name="inapp">in-app</string>
+	<string name="inapp">In-app</string>
+	<string name="inapp_notification_title">In-app purchase</string>
+	<string name="inapp_notification_content">The trail period expires on %s</string>
 
 	<!-- Dailer -->
 	<string name="address_bar_hint">Enter a number or an address</string>
diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java
index 9e6c98417..5d52619d1 100644
--- a/src/org/linphone/AccountPreferencesFragment.java
+++ b/src/org/linphone/AccountPreferencesFragment.java
@@ -369,7 +369,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
 		CheckBoxPreference friendlistSubscribe = (CheckBoxPreference) advanced.getPreference(8);
 		friendlistSubscribe.setOnPreferenceChangeListener(friendlistSubscribeListener);
 		if(!isNewAccount){
-			escape.setChecked(mPrefs.getReplacePlusByZeroZero(n));
+			friendlistSubscribe.setChecked(mPrefs.isFriendlistsubscriptionEnabled());
 		}
     	
     	PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key));
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 21386ed85..d27e8670e 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -49,7 +49,6 @@ import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.Reason;
 import org.linphone.mediastream.Log;
 import org.linphone.purchase.InAppPurchaseActivity;
-import org.linphone.purchase.InAppPurchaseHelper;
 import org.linphone.ui.AddressText;
 import org.linphone.xmlrpc.XmlRpcHelper;
 import org.linphone.xmlrpc.XmlRpcListenerBase;
@@ -162,7 +161,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			return;
 		}
 
-		boolean useFirstLoginActivity = getResources().getBoolean(R.bool.display_account_wizard_at_first_start);
+		boolean useFirstLoginActivity = getResources().getBoolean(R.bool.display_account_assistant_at_first_start);
 		if (LinphonePreferences.instance().isProvisioningLoginViewEnabled()) {
 			Intent wizard = new Intent();
 			wizard.setClass(this, RemoteProvisioningLoginActivity.class);
@@ -202,9 +201,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		initButtons();
 		initSideMenu();
 
-		//ifINAP
-		getTrialAccount();
-		getExpirationAccount();
+		if(getResources().getBoolean(R.bool.enabled_in_app_purchase)){
+			isTrialAccount();
+		}
 
 		currentFragment = FragmentsAvailable.EMPTY;
 		if (savedInstanceState == null) {
@@ -629,6 +628,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	public void displayInapp() {
+		checkAndRequestInappPermission();
 		startActivity(new Intent(LinphoneActivity.this, InAppPurchaseActivity.class));
 	}
 
@@ -1179,6 +1179,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	public void checkAndRequestReadContactsPermission() {
 		checkAndRequestPermission(Manifest.permission.READ_CONTACTS, PERMISSIONS_REQUEST_CONTACTS);
 	}
+
+	public void checkAndRequestInappPermission() {
+		checkAndRequestPermission(Manifest.permission.GET_ACCOUNTS, PERMISSIONS_REQUEST_CONTACTS);
+	}
 	
 	private boolean willContactsPermissionBeAsked() {
 		return LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.READ_CONTACTS) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_CONTACTS);
@@ -1206,6 +1210,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		int readExternalStorage = getPackageManager().checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE, getPackageName());
 		Log.i("[Permission] Read external storage permission is " + (readExternalStorage == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
 		int camera = getPackageManager().checkPermission(Manifest.permission.CAMERA, getPackageName());
+		int accounts = getPackageManager().checkPermission(Manifest.permission.GET_ACCOUNTS, getPackageName());
 		Log.i("[Permission] Camera permission is " + (camera == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
 
 		if (readExternalStorage != PackageManager.PERMISSION_GRANTED) {
@@ -1394,6 +1399,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			String sipUri = extras.getString("ChatContactSipUri");
 			doNotGoToCallActivity = true;
 			displayChat(sipUri);
+		} else if (extras != null && extras.getBoolean("GoToInapp", false)) {
+				LinphoneService.instance().removeMessageNotification();
+				doNotGoToCallActivity = true;
+				displayInapp();
 		} else if (extras != null && extras.getBoolean("Notification", false)) {
 			if (LinphoneManager.getLc().getCallsNb() > 0) {
 				LinphoneCall call = LinphoneManager.getLc().getCalls()[0];
@@ -1461,7 +1470,11 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	public void initSideMenu() {
 
 		sideMenu = (DrawerLayout) findViewById(R.id.side_menu);
-		sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about),"Inapp"};
+		if(getResources().getBoolean(R.bool.in_app_purchase_in_settings)){
+			sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about), getResources().getString(R.string.inapp)};
+		} else {
+			sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about)};
+		}
 		sideMenuContent = (RelativeLayout) findViewById(R.id.side_menu_content);
 		sideMenuItemList = (ListView)findViewById(R.id.item_list);
 		menu = (ImageView) findViewById(R.id.side_menu_button);
@@ -1479,8 +1492,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 				if (sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_assistant))) {
 					LinphoneActivity.instance().displayAssistant();
 				}
-				if (sideMenuItemList.getAdapter().getItem(i).toString().equals("Inapp")) {
-					LinphoneActivity.instance().displayInapp();
+				if(getResources().getBoolean(R.bool.in_app_purchase_in_settings)){
+					if (sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.inapp))) {
+						LinphoneActivity.instance().displayInapp();
+					}
 				}
 				openOrCloseSideMenu(false);
 			}
@@ -1657,17 +1672,17 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	//Inapp Purchase
-	private void getTrialAccount() {
+	private void isTrialAccount() {
 		if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
 			XmlRpcHelper helper = new XmlRpcHelper();
 			helper.isTrialAccountAsync(new XmlRpcListenerBase() {
 				@Override
 				public void onTrialAccountFetched(boolean isTrial) {
-					if(isTrial){
-						displayInappDialog();
+					if (isTrial) {
+						getExpirationAccount();
 					}
 				}
-			}, LinphonePreferences.instance().getAccountUsername(0), LinphonePreferences.instance().getAccountHa1(0));
+			}, LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()), LinphonePreferences.instance().getAccountHa1(LinphonePreferences.instance().getDefaultAccountIndex()));
 		}
 	}
 
@@ -1677,44 +1692,47 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			helper.getAccountExpireAsync(new XmlRpcListenerBase() {
 				@Override
 				public void onAccountExpireFetched(String result) {
-					Log.w("RESULT " + result);
+					if (result != null) {
+						long timestamp = Long.parseLong(result);
+
+						Calendar calresult = Calendar.getInstance();
+						calresult.setTimeInMillis(timestamp);
+
+						int diff = getDiffDays(calresult, Calendar.getInstance());
+						if (diff != -1 && diff <= getResources().getInteger(R.integer.number_days_reminder)) {
+							displayInappNotification(timestampToHumanDate(calresult));
+						}
+					}
+
 				}
-			}, LinphonePreferences.instance().getAccountUsername(0), LinphonePreferences.instance().getAccountHa1(0));
+			}, LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()), LinphonePreferences.instance().getAccountHa1(LinphonePreferences.instance().getDefaultAccountIndex()));
 		}
 	}
 
-	public Dialog displayInappDialog(){
-		final Dialog dialog = new Dialog(this);
-		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorC));
-		d.setAlpha(200);
-		dialog.setContentView(R.layout.input_dialog);
-		dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
-		dialog.getWindow().setBackgroundDrawable(d);
-
-		TextView customText = (TextView) dialog.findViewById(R.id.customText);
-		customText.setText(getString(R.string.error_bad_credentials));
-
-		Button retry = (Button) dialog.findViewById(R.id.retry);
-		Button cancel = (Button) dialog.findViewById(R.id.cancel);
-
-		retry.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View view) {
-
-			}
-		});
-
-		cancel.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				dialog.dismiss();
-			}
-		});
-
-		return dialog;
+	public void displayInappNotification(String date) {
+		if (LinphonePreferences.instance().getLastDateNotificationShown() != null && timestampToHumanDate(Calendar.getInstance()).equals(LinphonePreferences.instance().getLastDateNotificationShown())) {
+			return;
+		} else {
+			LinphonePreferences.instance().setLastDateNotificationShown(timestampToHumanDate(Calendar.getInstance()));
+		}
+		LinphoneService.instance().displayInappNotification(String.format(getString(R.string.inapp_notification_content), date));
 	}
 
+	private String timestampToHumanDate(Calendar cal) {
+		SimpleDateFormat dateFormat;
+		dateFormat = new SimpleDateFormat(getResources().getString(R.string.inapp_popup_date_format));
+		return dateFormat.format(cal.getTime());
+	}
+
+	private int getDiffDays(Calendar cal1, Calendar cal2) {
+		if (cal1 == null || cal2 == null) {
+			return -1;
+		}
+		if(cal1.get(Calendar.ERA) == cal2.get(Calendar.ERA) && cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR)){
+			return cal1.get(Calendar.DAY_OF_YEAR) - cal2.get(Calendar.DAY_OF_YEAR);
+		}
+		return -1;
+	}
 }
 
 interface ContactPicked {
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 3c9fb3718..23e0b1b87 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -1311,6 +1311,14 @@ public class LinphonePreferences {
 		return purchasables;
 	}
 
+	public String getLastDateNotificationShown(){
+		return getConfig().getString("app", "notification_date", null);
+	}
+
+	public void setLastDateNotificationShown(String date){
+		getConfig().setString("app", "notification_date", date);
+	}
+
 	public String getXmlRpcServerUrl() {
 		return getConfig().getString("app", "server_url", null);
 	}
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 813df0236..878b0be18 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -455,6 +455,16 @@ public final class LinphoneService extends Service {
 		
 		notifyWrapper(MESSAGE_NOTIF_ID, mMsgNotif);
 	}
+
+	public void displayInappNotification(String message) {
+		Intent notifIntent = new Intent(this, LinphoneActivity.class);
+		notifIntent.putExtra("GoToInapp", true);
+
+		PendingIntent notifContentIntent = PendingIntent.getActivity(this, 0, notifIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+		mNotif = Compatibility.createSimpleNotification(getApplicationContext(), getString(R.string.inapp_notification_title), message, notifContentIntent);
+
+		notifyWrapper(NOTIF_ID, mNotif);
+	}
 	
 	public void removeMessageNotification() {
 		mNM.cancel(MESSAGE_NOTIF_ID);
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 921b1db61..46c9e84c7 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -25,8 +25,6 @@ import org.linphone.LinphoneUtils;
 import org.linphone.LinphonePreferences.AccountBuilder;
 import org.linphone.R;
 import org.linphone.StatusFragment;
-import org.linphone.core.LinphoneAccountCreator;
-import org.linphone.core.LinphoneAccountCreatorImpl;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAddress.TransportType;
 import org.linphone.core.LinphoneCore;
@@ -82,7 +80,6 @@ private static AssistantActivity instance;
 	private boolean remoteProvisioningInProgress;
 	private boolean echoCancellerAlreadyDone;
 	private static final int PERMISSIONS_REQUEST_RECORD_AUDIO = 201;
-	private static final int PERMISSIONS_READ_PHONE_STATE = 202;
 
 	public CountryListFragment.Country country;
 	public String phone_number;
@@ -196,10 +193,6 @@ private static AssistantActivity instance;
 		transaction.commitAllowingStateLoss();
 	}
 
-	public AssistantFragmentsEnum getCurrentFragment() {
-		return currentFragment;
-	}
-
 	@Override
 	public void onClick(View v) {
 		int id = v.getId();
@@ -207,7 +200,7 @@ private static AssistantActivity instance;
 		if (id == R.id.assistant_cancel) {
 			hideKeyboard();
 			LinphonePreferences.instance().firstLaunchSuccessful();
-			if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
+			if (getResources().getBoolean(R.bool.assistant_cancel_move_to_back)) {
 				moveTaskToBack(true);
 			} else {
 				LinphonePreferences.instance().firstLaunchSuccessful();
@@ -224,7 +217,7 @@ private static AssistantActivity instance;
 	public void onBackPressed() {
 		if (currentFragment == firstFragment) {
 			LinphonePreferences.instance().firstLaunchSuccessful();
-			if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
+			if (getResources().getBoolean(R.bool.assistant_cancel_move_to_back)) {
 				moveTaskToBack(true);
 			} else {
 				LinphonePreferences.instance().firstLaunchSuccessful();
@@ -254,10 +247,6 @@ private static AssistantActivity instance;
 		}
 	}
 
-	public void checkAndRequestReadPhoneState() {
-		checkAndRequestPermission(Manifest.permission.READ_PHONE_STATE, 0);
-	}
-
 	public void checkAndRequestAudioPermission() {
 		checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, 0);
 	}
@@ -393,11 +382,6 @@ private static AssistantActivity instance;
 		saveCreatedAccount(username, password, displayName, null, domain, transport);
 	}
 
-	public void loadLinphoneConfig(){
-		//LinphoneManager.getInstance().loadConfig();
-		//LinphoneManager.getInstance().restartLinphoneCore();
-	}
-
 	private void launchDownloadCodec() {
 		OpenH264DownloadHelper downloadHelper = LinphoneCoreFactory.instance().createOpenH264DownloadHelper();
 		if (Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") && !downloadHelper.isCodecFound()) {
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index f874afc7b..77df0e82d 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -1,6 +1,6 @@
 package org.linphone.assistant;
 /*
-CreateAccountActivationFragment.java
+CreateAccountCodeActivationFragment.java
 Copyright (C) 2015  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
@@ -42,9 +42,6 @@ import org.linphone.core.LinphoneXmlRpcSession;
 import org.linphone.core.LinphoneXmlRpcSessionImpl;
 import org.linphone.mediastream.Log;
 
-/**
- * @author Sylvain Berfini
- */
 public class CreateAccountCodeActivationFragment extends Fragment {
 	private String username, phone, ha1;
 	private EditText code;
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index a2df9e686..c17cb2d21 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -32,7 +32,6 @@ import org.linphone.core.LinphoneXmlRpcRequestImpl;
 import org.linphone.core.LinphoneXmlRpcSession;
 import org.linphone.core.LinphoneXmlRpcSessionImpl;
 import org.linphone.xmlrpc.XmlRpcHelper;
-import org.linphone.mediastream.Log;
 
 import android.Manifest;
 import android.accounts.Account;
@@ -83,8 +82,11 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	private LinphoneAccountCreator accountCreator;
 	
 	private String getUsername() {
-		String username = usernameEdit.getText().toString();
-		return username.toLowerCase(Locale.getDefault());
+		if(usernameEdit != null) {
+			String username = usernameEdit.getText().toString();
+			return username.toLowerCase(Locale.getDefault());
+		}
+		return null;
 	}
 
 	private String getPhoneNumber(){
@@ -134,27 +136,8 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 			usernameError = (TextView) view.findViewById(R.id.username_error);
 			usernameEdit = (EditText) view.findViewById(R.id.username);
-			usernameEdit.addTextChangedListener(new TextWatcher() {
-				@Override
-				public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-				@Override
-				public void onTextChanged(CharSequence s, int start, int before, int count) {
-					/*if(useUsername.isChecked() && usernameEdit.getText().length() > 0) {
-						sipUri.setText("Sip uri is sip:" + s.toString() + "@sip.linphone.org");
-					} else {
-						if(phoneNumberEdit.getText().length() > 0){
-							sipUri.setText("Sip uri is sip:" + phoneNumberEdit.getText().toString()+ "@sip.linphone.org");
-						} else {
-							sipUri.setText("");
-						}
-					}*/
-				}
-
-				@Override
-				public void afterTextChanged(Editable s) {}
-			});
 			usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
+
 			addUsernameHandler(usernameEdit, null);
 		}
 
@@ -177,7 +160,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			addXMLRPCConfirmPasswordHandler(passwordEdit, passwordConfirmEdit, null);
 			addXMLRPCEmailHandler(emailEdit, null);
 
-			if (getResources().getBoolean(R.bool.pre_fill_email_in_wizard)) {
+			if (getResources().getBoolean(R.bool.pre_fill_email_in_assistant)) {
 				Account[] accounts = AccountManager.get(getActivity()).getAccountsByType("com.google");
 
 				for (Account account: accounts) {
@@ -199,7 +182,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		updateApplyButton();
 
     	createAccount = (Button) view.findViewById(R.id.assistant_create);
-    	createAccount.setEnabled(true);
+    	createAccount.setEnabled(false);
     	createAccount.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
 				if(getResources().getBoolean(R.bool.isTablet)) {
@@ -207,7 +190,11 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 						createAccountWithEmail(getUsername(), passwordEdit.getText().toString(), emailEdit.getText().toString(), false);
 					}
 				} else {
-					createAccountWithPhoneNumber(getUsername(), "", getPhoneNumber(), false);
+					if(getResources().getBoolean(R.bool.assistant_allow_username)){
+						createAccountWithPhoneNumber(getUsername(), "", getPhoneNumber(), false);
+					} else {
+						createAccountWithPhoneNumber(getPhoneNumber(), "", getPhoneNumber(), false);
+					}
 				}
 			}
 		});
@@ -292,7 +279,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	}
 	
 	private boolean isUsernameCorrect(String username) {
-		if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_wizard)) {
+		if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_assistant)) {
 			LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
 			return lpc.isPhoneNumber(username);
 		} else {
@@ -439,7 +426,6 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			public void afterTextChanged(Editable s) {
 				if (s.length() > 0) {
 					phoneNumberOk = false;
-					String phoneNumber = getPhoneNumber();
 					String countryCode = dialCode.getText().toString();
 					if(countryCode != null && countryCode.startsWith("+")) {
 						countryCode = countryCode.substring(1);
@@ -639,7 +625,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, final Status status) {
-		if(useUsername.isChecked()){
+		if(getResources().getBoolean(R.bool.assistant_allow_username) && useUsername.isChecked()){
 			if (status.equals(Status.AccountNotExist)) {
 				usernameOk = true;
 				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
@@ -679,4 +665,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	@Override
 	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, Status status) {
 	}
+
+	@Override
+	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, Status status) {
+
+	}
 }
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index e889336b1..88bd0161e 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -69,7 +69,7 @@ public class LinphoneLoginFragment extends Fragment implements OnClickListener,
 			return;
 		}
 		
-		AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), displayName.getText().toString(), getResources().getBoolean(R.bool.setup_account_validation_mandatory));
+		AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), displayName.getText().toString(), getResources().getBoolean(R.bool.assistant_account_validation_mandatory));
 	}
 
 	@Override
diff --git a/src/org/linphone/assistant/WelcomeFragment.java b/src/org/linphone/assistant/WelcomeFragment.java
index d0a767451..b85120800 100644
--- a/src/org/linphone/assistant/WelcomeFragment.java
+++ b/src/org/linphone/assistant/WelcomeFragment.java
@@ -42,21 +42,21 @@ public class WelcomeFragment extends Fragment implements OnClickListener {
 		createAccount.setOnClickListener(this);
 
 		logLinphoneAccount = (Button) view.findViewById(R.id.login_linphone);
-		if (getResources().getBoolean(R.bool.hide_linphone_accounts_wizard)) {
+		if (getResources().getBoolean(R.bool.hide_linphone_accounts_in_assistant)) {
 			logLinphoneAccount.setVisibility(View.GONE);
 		} else {
 			logLinphoneAccount.setOnClickListener(this);
 		}
 		
 		logGenericAccount = (Button) view.findViewById(R.id.login_generic);
-		if (getResources().getBoolean(R.bool.hide_generic_accounts_wizard)) {
+		if (getResources().getBoolean(R.bool.hide_generic_accounts_in_assistant)) {
 			logGenericAccount.setVisibility(View.GONE);
 		} else {
 			logGenericAccount.setOnClickListener(this);
 		}
 		
 		remoteProvisioning = (Button) view.findViewById(R.id.remote_provisioning);
-		if (getResources().getBoolean(R.bool.hide_remote_provisioning_in_wizard)) {
+		if (getResources().getBoolean(R.bool.hide_remote_provisioning_in_assistant)) {
 			remoteProvisioning.setVisibility(View.GONE);
 		} else {
 			remoteProvisioning.setOnClickListener(this);
diff --git a/src/org/linphone/purchase/InAppPurchaseActivity.java b/src/org/linphone/purchase/InAppPurchaseActivity.java
index bd84033d0..44e7af4ff 100644
--- a/src/org/linphone/purchase/InAppPurchaseActivity.java
+++ b/src/org/linphone/purchase/InAppPurchaseActivity.java
@@ -36,6 +36,7 @@ import android.os.Handler;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 
 /**
@@ -45,6 +46,7 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList
 	private static InAppPurchaseActivity instance;
 	private InAppPurchaseHelper inAppPurchaseHelper;
 	private ImageView cancel, back;
+	private ProgressBar inProgress;
 
 	private List<Purchasable> purchasedItems;
 	private Fragment fragment;
@@ -57,6 +59,9 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList
 		inAppPurchaseHelper = new InAppPurchaseHelper(this, this);
 		setContentView(R.layout.in_app);
 
+		inProgress = (ProgressBar) findViewById(R.id.purchaseItemsFetchInProgress);
+		inProgress.setVisibility(View.VISIBLE);
+
 		back = (ImageView) findViewById(R.id.back);
 		back.setOnClickListener(this);
 		back.setVisibility(View.INVISIBLE);
@@ -77,7 +82,7 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList
 		changeFragment(fragment);
 	}
 
-	public void displayStore(Purchasable item) {
+	public void displayPurchase(Purchasable item) {
 		Bundle extra = new Bundle();
 		extra.putString("item_id",item.getId());
 		fragment = new InAppPurchaseFragment();
@@ -136,7 +141,7 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList
 	@Override
 	public void onAvailableItemsForPurchaseQueryFinished(ArrayList<Purchasable> items) {
 		//purchasableItemsLayout.removeAllViews();
-
+		inProgress.setVisibility(View.GONE);
 		purchasedItems = new ArrayList<Purchasable>();
 		for (Purchasable item : items) {
 			purchasedItems.add(item);
@@ -200,6 +205,7 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList
 		mHandler.post(new Runnable() {
 			@Override
 			public void run() {
+				inProgress.setVisibility(View.GONE);
 				Toast.makeText(InAppPurchaseActivity.this, error, Toast.LENGTH_LONG).show();	
 			}
 		});
diff --git a/src/org/linphone/purchase/InAppPurchaseFragment.java b/src/org/linphone/purchase/InAppPurchaseFragment.java
index 4657a2ed8..21dcff4d2 100644
--- a/src/org/linphone/purchase/InAppPurchaseFragment.java
+++ b/src/org/linphone/purchase/InAppPurchaseFragment.java
@@ -23,11 +23,13 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.linphone.LinphoneManager;
@@ -39,15 +41,17 @@ import org.linphone.xmlrpc.XmlRpcHelper;
 import org.linphone.xmlrpc.XmlRpcListenerBase;
 
 import java.util.Locale;
+import java.util.regex.Pattern;
 
 
 public class InAppPurchaseFragment extends Fragment implements View.OnClickListener {
-
+	private LinearLayout usernameLayout;
 	private EditText username, email;
 	private TextView errorMessage;
 
-	private boolean usernameOk = false;
+	private boolean usernameOk = false, emailOk = false;
 	private Handler mHandler = new Handler();
+	private String defaultUsername, defaultEmail;
 	private Button buyItemButton, recoverAccountButton;
 
 	@Override
@@ -61,19 +65,36 @@ public class InAppPurchaseFragment extends Fragment implements View.OnClickListe
 
 		String id = getArguments().getString("item_id");
 		Purchasable item = InAppPurchaseActivity.instance().getPurchasedItem(id);
-
-		Log.w("Item store " + item.getDescription());
-
 		buyItemButton = (Button) view.findViewById(R.id.inapp_button);
 
 		displayBuySubscriptionButton(item);
 
+		defaultEmail = InAppPurchaseActivity.instance().getGmailAccount();
+		defaultUsername = LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex());
+
+		usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
 		username = (EditText) view.findViewById(R.id.username);
-		username.setText(LinphonePreferences.instance().getAccountUsername(0));
+		if(!getResources().getBoolean(R.bool.hide_username_in_inapp)){
+			usernameLayout.setVisibility(View.VISIBLE);
+			username.setText(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
+
+			addUsernameHandler(username, errorMessage);
+		} else {
+			if(defaultUsername != null){
+				usernameLayout.setVisibility(View.GONE);
+				usernameOk = true;
+			}
+		}
+
 		email = (EditText) view.findViewById(R.id.email);
-		email.setText(InAppPurchaseActivity.instance().getGmailAccount());
+		if(defaultEmail != null){
+			email.setText(defaultEmail);
+			emailOk = true;
+		}
+
+		buyItemButton.setEnabled(emailOk && usernameOk);
 		errorMessage = (TextView) view.findViewById(R.id.username_error);
-		addUsernameHandler(username, errorMessage);
+
 		return view;
 	}
 
@@ -102,6 +123,36 @@ public class InAppPurchaseFragment extends Fragment implements View.OnClickListe
 		});
 	}
 
+	private void addEmailHandler(final EditText field, final TextView errorMessage) {
+		field.addTextChangedListener(new TextWatcher() {
+			public void afterTextChanged(Editable s) {
+
+			}
+
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+			}
+
+			public void onTextChanged(CharSequence s, int start, int count, int after) {
+				emailOk = false;
+				String email = s.toString();
+				if (isEmailCorrect(email)) {
+					emailOk = true;
+					errorMessage.setText("");
+				} else {
+					errorMessage.setText(R.string.wizard_email_incorrect);
+				}
+				if (buyItemButton != null) buyItemButton.setEnabled(emailOk && usernameOk);
+				if (recoverAccountButton != null) recoverAccountButton.setEnabled(emailOk && usernameOk);
+			}
+		});
+	}
+
+	private boolean isEmailCorrect(String email) {
+		Pattern emailPattern = Patterns.EMAIL_ADDRESS;
+		return emailPattern.matcher(email).matches();
+	}
+
 
 	private boolean isUsernameCorrect(String username) {
 		LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
@@ -109,33 +160,17 @@ public class InAppPurchaseFragment extends Fragment implements View.OnClickListe
 	}
 
 	private void displayBuySubscriptionButton(Purchasable item) {
-		//View layout = LayoutInflater.from(this).inflate(R.layout.in_app_purchasable, purchasableItemsLayout);
-		//Button button = (Button) layout.findViewById(R.id.inapp_button);
 		buyItemButton.setText("Buy account (" + item.getPrice() + ")");
 		buyItemButton.setTag(item);
 		buyItemButton.setOnClickListener(this);
-		/*XmlRpcHelper xmlRpcHelper = new XmlRpcHelper();
-		xmlRpcHelper.createAccountAsync(new XmlRpcListenerBase() {
-			@Override
-			public void onAccountCreated(String result) {
-				//TODO
-			}
-		}, getUsername(), email.getText().toString(), null);*/
-
-		buyItemButton.setEnabled(usernameOk);
+		buyItemButton.setEnabled(usernameOk && emailOk);
 	}
 
 	@Override
 	public void onClick(View v) {
 		Purchasable item = (Purchasable) v.getTag();
 		if (v.equals(recoverAccountButton)) {
-			//XmlRpcHelper xmlRpcHelper = new XmlRpcHelper();
-			/*xmlRpcHelper.createAccountAsync(new XmlRpcListenerBase() {
-				@Override
-				public void onAccountCreated(String result) {
-					//TODO
-				}
-			}, getUsername(), email.getText().toString(), null);*/
+			//TODO
 		} else {
 			InAppPurchaseActivity.instance().buyInapp(getUsername(), item);
 		}
diff --git a/src/org/linphone/purchase/InAppPurchaseListFragment.java b/src/org/linphone/purchase/InAppPurchaseListFragment.java
index 2acf64ec2..bc8b031b5 100644
--- a/src/org/linphone/purchase/InAppPurchaseListFragment.java
+++ b/src/org/linphone/purchase/InAppPurchaseListFragment.java
@@ -95,6 +95,6 @@ public class InAppPurchaseListFragment extends Fragment implements AdapterView.O
 	@Override
 	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 		Purchasable item = (Purchasable) view.getTag();
-		InAppPurchaseActivity.instance().displayStore(item);
+		InAppPurchaseActivity.instance().displayPurchase(item);
 	}
 }

From b518041fb531cd78ea83b306f2a437d62ec50a24 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 12 Aug 2016 17:48:38 +0200
Subject: [PATCH 11/36] Add recover account Add documentation for linphone
 customization

---
 doc/CustomsParameters.txt                     |  72 +++++++
 res/layout/assistant_account_creation.xml     |   4 +-
 res/layout/assistant_linphone_login.xml       | 178 +++++++++++++-----
 res/raw/linphonerc_default                    |   1 -
 res/raw/linphonerc_factory                    |   3 +-
 res/values/non_localizable_custom.xml         |   9 +-
 res/values/strings.xml                        |   6 +-
 src/org/linphone/LinphoneActivity.java        |  31 +--
 src/org/linphone/SettingsFragment.java        |  12 --
 .../linphone/assistant/AssistantActivity.java |  13 +-
 .../CreateAccountCodeActivationFragment.java  |   2 +
 .../assistant/CreateAccountFragment.java      |  32 ++--
 .../assistant/LinphoneLoginFragment.java      | 142 +++++++++++++-
 13 files changed, 391 insertions(+), 114 deletions(-)
 create mode 100644 doc/CustomsParameters.txt

diff --git a/doc/CustomsParameters.txt b/doc/CustomsParameters.txt
new file mode 100644
index 000000000..dc39dbba5
--- /dev/null
+++ b/doc/CustomsParameters.txt
@@ -0,0 +1,72 @@
+ 			  **********************************
+              *   LINPHONE customs parameters  *
+              **********************************
+
+In res/values/non_localizable_custom.xml (filled with linphone default options):
+
+1. Global
+
+	* Set the default domain used by the application:
+	<string name="default_domain">sip.linphone.org</string
+
+2. Assistant
+
+	* Server xmlrpc url for accounts
+	<string name="wizard_url">https://sip3.linphone.org:444/inapp.php</string>
+
+	* In CreateAccount, allow username instead of phone number for creating a new account
+	<bool name="assistant_allow_username">true</bool>
+
+	* Hide buttons in assistant menu
+	<bool name="hide_linphone_accounts_in_assistant">false</bool>
+	<bool name="hide_generic_accounts_in_assistant">false</bool>
+	<bool name="hide_remote_provisioning_in_assistant">false</bool>
+
+
+3. Inapp
+
+	* Enabled inapp purchase
+	<bool name="enable_in_app_purchase">true</bool>
+
+	* Days before end of trial period that launch daily notification to remind user to buy an account
+	<integer name="days_notification_shown">5</integer>
+
+	* Time between two inapp notifications in seconds
+	<integer name="time_between_inapp_notification">86400</integer>
+
+	* Hide username field in purchase view (automatically get from default account)
+	<bool name="hide_username_in_inapp">true</bool>
+
+
+In res/raw/linphonerc_factory sections:
+
+	[in-app-purchase]
+	* Server xmlrpc url for inapp
+	server_url=https://sip3.linphone.org:444/inapp.php
+
+	* Item ids from the google play store
+	purchasable_items_ids=test_account_subscription
+
+	[app]
+
+	* Numbers of digits to enter for validation/recover account
+    activation_code_length=4
+
+
+	[assistant]
+
+	* Set the default domain used for account creation :
+	domain=sip.linphone.org
+
+	* Set the default password length (min-max) :
+	password_max_length=-1
+	password_min_length=1
+
+	* Set the default username length (min-max) :
+	username_length=-1
+	username_max_length=64
+	username_min_length=1
+	username_regex=^[a-z0-9_.\-]*$
+
+	* Server xmlrpc url for accounts
+	xmlrpc_url=https://sip3.linphone.org:444/inapp.php
diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index ea6bb13ea..165b138dc 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -103,14 +103,14 @@
 				android:visibility="gone"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="Don't use phone number as username"/>
+				android:text="@string/use_username_instead_or_phone_number"/>
 
 			<CheckBox
 				android:id="@+id/use_email"
 				android:visibility="gone"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="Don't use phone number for account activation"/>
+				android:text="@string/use_email_for_validation"/>
 
 
 			<LinearLayout
diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml
index 9f4d91918..b57ae3a6d 100644
--- a/res/layout/assistant_linphone_login.xml
+++ b/res/layout/assistant_linphone_login.xml
@@ -34,64 +34,142 @@
 			android:layout_marginTop="30dp"
 			android:orientation="vertical">
 
-			<TextView
-				android:text="@string/username"
-				style="@style/font13"
-				android:textAllCaps="true"
+			<LinearLayout
+				android:id="@+id/phone_number_layout"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
+				android:layout_height="match_parent"
+				android:gravity="center"
+				android:orientation="vertical">
 
-			<EditText
-				android:id="@+id/assistant_username"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:inputType="text|textNoSuggestions"
-				android:contentDescription="@string/content_description_username_field"
+				<Button
+					android:id="@+id/select_country"
+					style="@style/font8"
+					android:text="@string/select_your_country"
+					android:background="@drawable/resizable_assistant_button"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_marginTop="10dp"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<TextView
+						android:id="@+id/phone_number_label"
+						android:text="@string/phone_number"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content">
+
+						<EditText
+							android:id="@+id/dial_code"
+							android:background="@drawable/resizable_textfield"
+							android:textColor="@color/colorB"
+							android:inputType="phone"
+							android:layout_marginRight="10dp"
+							android:layout_width="50dp"
+							android:layout_height="40dp"
+							android:singleLine="true"/>
+
+						<EditText
+							android:id="@+id/phone_number"
+							android:background="@drawable/resizable_textfield"
+							android:textColor="@color/colorB"
+							android:contentDescription="@string/content_description_phone_number_field"
+							android:inputType="phone"
+							android:layout_width="match_parent"
+							android:layout_height="40dp"
+							android:singleLine="true"/>
+
+					</LinearLayout>
+
+					<TextView
+						android:id="@+id/phone_number_error"
+						android:text="@string/error"
+						style="@style/font20"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:visibility="invisible"/>
+
+					<TextView
+						android:id="@+id/sip_uri"
+						style="@style/font9"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+				</LinearLayout>
+			</LinearLayout>
+
+			<CheckBox
+				android:id="@+id/use_username"
+				android:visibility="visible"
 				android:layout_width="match_parent"
-				android:layout_height="40dp"
-				android:singleLine="true"/>
-
-			<TextView
-				android:text="@string/password"
-				style="@style/font13"
-				android:textAllCaps="true"
-				android:paddingTop="20dp"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
-
-			<EditText
-				android:id="@+id/assistant_password"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:inputType="textPassword"
-				android:layout_width="match_parent"
-				android:layout_height="40dp"
-				android:singleLine="true"/>
-
-			<TextView
-				android:id="@+id/forgot_password"
-				android:layout_gravity="right"
-				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:singleLine="true"/>
+				android:text="@string/login_with_username"/>
 
-			<TextView
-				android:text="@string/assistant_display_name_optional"
-				style="@style/font13"
-				android:textAllCaps="true"
-				android:paddingTop="15dp"
+			<LinearLayout
+				android:id="@+id/username_layout"
+				android:visibility="gone"
+				android:orientation="vertical"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
+				android:layout_height="wrap_content">
 
-			<EditText
-				android:id="@+id/assistant_display_name"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:inputType="textPersonName"
-				android:contentDescription="@string/content_description_username_field"
+				<TextView
+					android:text="@string/username"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/assistant_username"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="text|textNoSuggestions"
+					android:contentDescription="@string/content_description_username_field"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:singleLine="true"/>
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/password_layout"
+				android:visibility="gone"
+				android:orientation="vertical"
 				android:layout_width="match_parent"
-				android:layout_height="40dp"
-				android:singleLine="true"/>
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:text="@string/password"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:paddingTop="20dp"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/assistant_password"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="textPassword"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:singleLine="true"/>
+
+				<TextView
+					android:id="@+id/forgot_password"
+					android:layout_gravity="right"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:singleLine="true"/>
+			</LinearLayout>
 
 			<Button
 				android:id="@+id/assistant_apply"
diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default
index a1437cbef..4d6c28236 100644
--- a/res/raw/linphonerc_default
+++ b/res/raw/linphonerc_default
@@ -7,7 +7,6 @@ contact="Linphone Android" <sip:linphone.android@unknown-host>
 use_info=0
 use_ipv6=0
 keepalive_period=30000
-rls_uri=sip:rls@sip1.linphone.org
 use_rls_presence=1
 
 [video]
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 1f22de0bb..28f765950 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -12,6 +12,7 @@ register_only_when_network_is_up=1
 auto_net_state_mon=0
 auto_answer_replacing_calls=1
 ping_with_options=0
+rls_uri=sip:rls@sip.linphone.org
 
 [rtp]
 audio_rtp_port=7076
@@ -37,7 +38,7 @@ max_calls=10
 activation_code_length=4
 
 [in-app-purchase]
-server_url=http://sip3.linphone.org/inapp.php
+server_url=https://sip3.linphone.org:444/inapp.php
 purchasable_items_ids=test_account_subscription
 
 [assistant]
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 09452bf69..f94202657 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -12,7 +12,7 @@
 
 	<!-- Assistant -->
 	<string name="wizard_url">https://sip3.linphone.org:444/inapp.php</string><!-- Url of the xmlrpc script -->
-	<bool name="assistant_allow_username">false</bool> <!-- Allow to use an username instead of the phone number for account creation -->
+	<bool name="assistant_allow_username">true</bool> <!-- Allow to use an username instead of the phone number for account creation -->
 	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool><!-- Start assistant in loginFragment view instead of menu -->
 	<bool name="replace_assistant_with_old_interface">false</bool>
 	<bool name="hide_assistant">false</bool>
@@ -24,7 +24,6 @@
 	<bool name="hide_generic_accounts_in_assistant">false</bool>
 	<bool name="hide_remote_provisioning_in_assistant">false</bool>
 	<bool name="display_account_assistant_at_first_start">true</bool>
-	<bool name="hide_H264_downloader">false</bool><!-- Set the email field of the wizard with one of the gmail account registered on the device -->
 
 	<!-- Remote provisioning -->
 	<bool name="display_sms_remote_provisioning_activity">false</bool>
@@ -33,9 +32,9 @@
 	<bool name="allow_cancel_remote_provisioning_login_activity">true</bool>
 
 	<!-- Inapp -->
-	<bool name="enabled_in_app_purchase">true</bool>
-	<bool name="in_app_purchase_in_settings">true</bool>
-	<integer name="number_days_reminder">28</integer><!-- Remind to biy account  -->
+	<bool name="enable_in_app_purchase">true</bool>
+	<integer name="days_notification_shown">5</integer><!-- Notification shown before end of trial version in days -->
+	<integer name="time_between_inapp_notification">86400</integer><!-- Time between two inapp notifications in seconds -->
 	<bool name="hide_username_in_inapp">true</bool>
 
 	<!-- Push notification settings -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5edc40d99..14bb442ca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,6 +101,9 @@
 	<string name="assistant_choose_country">Choose a country</string>
 	<string name="select_your_country">Select your Country</string>
 	<string name="country_code">(%s)</string>
+	<string name="use_username_instead_or_phone_number">Don\'t use phone number as username</string>
+	<string name="use_email_for_validation">Use email address for account validation</string>
+	<string name="login_with_username">Log in with username</string>
 
 	<!-- Status -->
 	<string name="invalid_email">Invalid email</string>
@@ -122,7 +125,8 @@
 	<!-- In-app -->
 	<string name="inapp">In-app</string>
 	<string name="inapp_notification_title">In-app purchase</string>
-	<string name="inapp_notification_content">The trail period expires on %s</string>
+	<string name="inapp_notification_trial_expire">The trail period expires on %s</string>
+	<string name="inapp_notification_account_expire">The subscription period expires on %s</string>
 
 	<!-- Dailer -->
 	<string name="address_bar_hint">Enter a number or an address</string>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index a7006eee1..29c76c283 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -125,6 +125,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private Fragment.SavedState dialerSavedState;
 	private boolean newProxyConfig;
 	private boolean emptyFragment = false;
+	private boolean isTrialAccount = false;
 	private OrientationEventListener mOrientationHelper;
 	private LinphoneCoreListenerBase mListener;
 	private LinearLayout mTabBar;
@@ -201,7 +202,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		initButtons();
 		initSideMenu();
 
-		if(getResources().getBoolean(R.bool.enabled_in_app_purchase)){
+		if(getResources().getBoolean(R.bool.enable_in_app_purchase)){
 			isTrialAccount();
 		}
 
@@ -628,7 +629,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	public void displayInapp() {
-		checkAndRequestInappPermission();
 		startActivity(new Intent(LinphoneActivity.this, InAppPurchaseActivity.class));
 	}
 
@@ -1470,8 +1470,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	public void initSideMenu() {
 
 		sideMenu = (DrawerLayout) findViewById(R.id.side_menu);
-		if(getResources().getBoolean(R.bool.in_app_purchase_in_settings)){
-			sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about), getResources().getString(R.string.inapp)};
+		if(getResources().getBoolean(R.bool.enable_in_app_purchase)){
+			sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.inapp), getResources().getString(R.string.menu_about)};
 		} else {
 			sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about)};
 		}
@@ -1492,7 +1492,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 				if (sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_assistant))) {
 					LinphoneActivity.instance().displayAssistant();
 				}
-				if(getResources().getBoolean(R.bool.in_app_purchase_in_settings)){
+				if(getResources().getBoolean(R.bool.enable_in_app_purchase)){
 					if (sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.inapp))) {
 						LinphoneActivity.instance().displayInapp();
 					}
@@ -1678,10 +1678,12 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			helper.isTrialAccountAsync(new XmlRpcListenerBase() {
 				@Override
 				public void onTrialAccountFetched(boolean isTrial) {
-					if (isTrial) {
-						getExpirationAccount();
-					}
+					isTrialAccount = isTrial;
+					getExpirationAccount();
 				}
+
+				@Override
+				public void onError(String error){}
 			}, LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()), LinphonePreferences.instance().getAccountHa1(LinphonePreferences.instance().getDefaultAccountIndex()));
 		}
 	}
@@ -1699,12 +1701,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 						calresult.setTimeInMillis(timestamp);
 
 						int diff = getDiffDays(calresult, Calendar.getInstance());
-						if (diff != -1 && diff <= getResources().getInteger(R.integer.number_days_reminder)) {
+						if (diff != -1 && diff <= getResources().getInteger(R.integer.days_notification_shown)) {
 							displayInappNotification(timestampToHumanDate(calresult));
 						}
 					}
-
 				}
+
+				@Override
+				public void onError(String error){}
 			}, LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()), LinphonePreferences.instance().getAccountHa1(LinphonePreferences.instance().getDefaultAccountIndex()));
 		}
 	}
@@ -1715,7 +1719,12 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		} else {
 			LinphonePreferences.instance().setLastDateNotificationShown(timestampToHumanDate(Calendar.getInstance()));
 		}
-		LinphoneService.instance().displayInappNotification(String.format(getString(R.string.inapp_notification_content), date));
+		if(isTrialAccount){
+			LinphoneService.instance().displayInappNotification(String.format(getString(R.string.inapp_notification_trial_expire), date));
+		} else {
+			LinphoneService.instance().displayInappNotification(String.format(getString(R.string.inapp_notification_account_expire), date));
+		}
+
 	}
 
 	private String timestampToHumanDate(Calendar cal) {
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 3b5d90324..7cc2d2e47 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -143,14 +143,6 @@ public class SettingsFragment extends PreferencesListFragment {
 				return true;
 			}
 		});
-		findPreference(getString(R.string.pref_in_app_store_key)).setOnPreferenceClickListener(new OnPreferenceClickListener() {
-			@Override
-			public boolean onPreferenceClick(Preference preference) {
-				Intent intent = new Intent(LinphoneService.instance(), InAppPurchaseActivity.class);
-	        	startActivityForResult(intent, STORE_INTENT);
-	        	return true;
-			}
-		});
 	}
 
 	// Sets listener for each preference to update the matching value in linphonecore
@@ -174,10 +166,6 @@ public class SettingsFragment extends PreferencesListFragment {
 			hidePreference(R.string.pref_add_account_key);
 		}
 
-		if(!getResources().getBoolean(R.bool.in_app_purchase_in_settings)){
-			hidePreference(R.string.pref_in_app_store_key);
-		}
-
 		if (getResources().getBoolean(R.bool.disable_chat)) {
 			findPreference(getString(R.string.pref_image_sharing_server_key)).setLayoutResource(R.layout.hidden);
 		}
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 46c9e84c7..7d2c1a9a4 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -294,22 +294,22 @@ private static AssistantActivity instance;
 		}
 	}
 
-	private void logIn(String username, String password, String displayName, String domain, TransportType transport, boolean sendEcCalibrationResult) {
-		saveCreatedAccount(username, password, displayName, null, domain, transport);
+	private void logIn(String username, String password, String ha1, String displayName, String domain, TransportType transport, boolean sendEcCalibrationResult) {
+		saveCreatedAccount(username, password, displayName, ha1, domain, transport);
 	}
 
 	public void checkAccount(String username, String password, String displayName, String domain) {
 		saveCreatedAccount(username, password, displayName, null, domain, null);
 	}
 
-	public void linphoneLogIn(String username, String password, String displayName, boolean validate) {
+	public void linphoneLogIn(String username, String password, String ha1,  String displayName, boolean validate) {
 		if (validate) {
 			checkAccount(username, password, displayName, getString(R.string.default_domain));
 		} else {
 			if(accountCreated) {
 				retryLogin(username, password, displayName, getString(R.string.default_domain), null);
 			} else {
-				logIn(username, password, displayName, getString(R.string.default_domain), null, true);
+				logIn(username, password, ha1,  displayName, getString(R.string.default_domain), null, true);
 			}
 		}
 	}
@@ -318,7 +318,7 @@ private static AssistantActivity instance;
 		if (accountCreated) {
 			retryLogin(username, password, displayName, domain, transport);
 		} else {
-			logIn(username, password, displayName, domain, transport, false);
+			logIn(username, password, null, displayName, domain, transport, false);
 		}
 	}
 
@@ -525,12 +525,13 @@ private static AssistantActivity instance;
 		back.setVisibility(View.INVISIBLE);
 	}
 
-	public void displayAssistantCodeConfirm(String username, String phone) {
+	public void displayAssistantCodeConfirm(String username, String phone, boolean recoverAccount) {
 		CreateAccountCodeActivationFragment fragment = new CreateAccountCodeActivationFragment();
 		newAccount = true;
 		Bundle extras = new Bundle();
 		extras.putString("Username", username);
 		extras.putString("Phone", phone);
+		extras.putBoolean("RecoverAccount", recoverAccount);
 		fragment.setArguments(extras);
 		changeFragment(fragment);
 
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index 77df0e82d..e9535fee6 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -45,6 +45,7 @@ import org.linphone.mediastream.Log;
 public class CreateAccountCodeActivationFragment extends Fragment {
 	private String username, phone, ha1;
 	private EditText code;
+	private boolean recoverAccount;
 	private int code_length;
 	private Handler mHandler = new Handler();
 	private Button checkAccount;
@@ -57,6 +58,7 @@ public class CreateAccountCodeActivationFragment extends Fragment {
 		
 		username = getArguments().getString("Username");
 		phone = getArguments().getString("Phone");
+		recoverAccount = getArguments().getBoolean("RecoverAccount");
 		code_length = LinphonePreferences.instance().getCodeLength();
 
 		if(username == null || username.length() == 0){
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index c17cb2d21..85e6a9c41 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -32,6 +32,7 @@ import org.linphone.core.LinphoneXmlRpcRequestImpl;
 import org.linphone.core.LinphoneXmlRpcSession;
 import org.linphone.core.LinphoneXmlRpcSessionImpl;
 import org.linphone.xmlrpc.XmlRpcHelper;
+import org.linphone.mediastream.Log;
 
 import android.Manifest;
 import android.accounts.Account;
@@ -104,21 +105,11 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		View view = inflater.inflate(R.layout.assistant_account_creation, container, false);
 
 		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+		accountCreator.setDomain(getResources().getString(R.string.default_domain));
 		accountCreator.setListener(this);
 
 		phoneNumberError = (TextView) view.findViewById(R.id.phone_number_error);
 		phoneNumberEdit = (EditText) view.findViewById(R.id.phone_number);
-		phoneNumberEdit.addTextChangedListener(new TextWatcher() {
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
-			}
-
-			@Override
-			public void afterTextChanged(Editable s) {}
-		});
 		phoneNumberLayout = (LinearLayout) view.findViewById(R.id.phone_number_layout);
 		addPhoneNumberHandler(phoneNumberEdit, null);
 
@@ -225,12 +216,10 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			if(isChecked) {
 				usernameLayout.setVisibility(View.VISIBLE);
 				if(usernameEdit.getText().length() > 0){
-					sipUri.setText("Sip uri is sip:" + usernameEdit.getText().toString() + "@sip.linphone.org");
 				}
 			} else {
 				usernameLayout.setVisibility(View.GONE);
 				if(phoneNumberEdit.getText().length() > 0){
-					sipUri.setText("Sip uri is sip:" + phoneNumberEdit.getText().toString() + "@sip.linphone.org");
 				}
 			}
 		} else if(buttonView.getId() == R.id.use_email){
@@ -340,7 +329,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	}
 	
 	private void createAccountWithPhoneNumber(final String username, final String password, final String phone, boolean suscribe) {
-		AssistantActivity.instance().displayAssistantCodeConfirm(username, phone);
+
 		final Runnable runNotOk = new Runnable() {
 			public void run() {
 				//TODO errorMessage.setText(R.string.wizard_failed);
@@ -348,7 +337,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		};
 		final Runnable runOk = new Runnable() {
 			public void run() {
-				AssistantActivity.instance().displayAssistantCodeConfirm(username, phone);
+				AssistantActivity.instance().displayAssistantCodeConfirm(username, phone, false);
 			}
 		};
 		final Runnable runNotReachable = new Runnable() {
@@ -611,6 +600,8 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				return getString(R.string.transport_unsupported);
 		if (status.equals(Status.AccountExist))
 			return getString(R.string.account_already_exist);
+		if (status.equals(Status.AccountExistWithAlias))
+			return getString(R.string.account_already_exist);
 		if (status.equals(Status.AccountCreated)
 		 		|| status.equals(Status.AccountNotCreated)
 				|| status.equals(Status.AccountNotExist)
@@ -626,18 +617,19 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	@Override
 	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, final Status status) {
 		if(getResources().getBoolean(R.bool.assistant_allow_username) && useUsername.isChecked()){
-			if (status.equals(Status.AccountNotExist)) {
-				usernameOk = true;
+			if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) {
+				usernameOk = false;
 				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
 			} else {
-				usernameOk = false;
+				usernameOk = true;
 				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
 			}
 			createAccount.setEnabled(usernameOk && phoneNumberOk);
 		} else {
-			if (status.equals(Status.AccountNotExist)) {
-				phoneNumberOk = true;
+			if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) {
+				phoneNumberOk = false;
 				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
+				phoneNumberOk = true;
 			} else {
 				phoneNumberOk = true;
 				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index 88bd0161e..898409c9b 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -17,8 +17,13 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+import org.linphone.LinphoneManager;
 import org.linphone.R;
 import org.linphone.compatibility.Compatibility;
+import org.linphone.core.LinphoneAccountCreator;
+import org.linphone.core.LinphoneAccountCreatorImpl;
+import org.linphone.core.LinphoneProxyConfig;
+import org.linphone.mediastream.Log;
 
 import android.app.Fragment;
 import android.os.Bundle;
@@ -30,46 +35,122 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 /**
  * @author Sylvain Berfini
  */
-public class LinphoneLoginFragment extends Fragment implements OnClickListener, TextWatcher {
+public class LinphoneLoginFragment extends Fragment implements CompoundButton.OnCheckedChangeListener, OnClickListener, TextWatcher, LinphoneAccountCreator.LinphoneAccountCreatorListener {
 	private EditText login, password, displayName;
 	private Button apply;
+	private CheckBox useUsername, usePassword;
+	private LinearLayout phoneNumberLayout, usernameLayout, passwordLayout;
 	private TextView forgotPassword;
-	
+	private EditText phoneNumberEdit, usernameEdit, passwordEdit, passwordConfirmEdit, emailEdit, dialCode;
+	private TextView phoneNumberError, usernameError, passwordError, passwordConfirmError, emailError, sipUri;
+	private CountryListFragment.Country country;
+	private Boolean recoverAccount = true;
+
+	private LinphoneAccountCreator accountCreator;
+
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.assistant_linphone_login, container, false);
 
+		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+		accountCreator.setListener(this);
+
 		String url = "http://linphone.org/free-sip-service.html&action=recover";
 		
 		login = (EditText) view.findViewById(R.id.assistant_username);
 		login.addTextChangedListener(this);
+
+		dialCode = (EditText) view.findViewById(R.id.dial_code);
+
+		phoneNumberEdit = (EditText) view.findViewById(R.id.phone_number);
+		phoneNumberLayout = (LinearLayout) view.findViewById(R.id.phone_number_layout);
+		addPhoneNumberHandler(phoneNumberEdit, null);
+
+		if(getResources().getBoolean(R.bool.assistant_allow_username)) {
+			useUsername = (CheckBox) view.findViewById(R.id.use_username);
+			useUsername.setVisibility(View.VISIBLE);
+			useUsername.setOnCheckedChangeListener(this);
+
+			usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
+		}
+
 		password = (EditText) view.findViewById(R.id.assistant_password);
 		password.addTextChangedListener(this);
 		forgotPassword = (TextView) view.findViewById(R.id.forgot_password);
 		forgotPassword.setText(Compatibility.fromHtml("<a href=\"" + url + "\"'>"+ getString(R.string.forgot_password) + "</a>"));
 		forgotPassword.setMovementMethod(LinkMovementMethod.getInstance());
 		displayName = (EditText) view.findViewById(R.id.assistant_display_name);
+
 		apply = (Button) view.findViewById(R.id.assistant_apply);
 		apply.setEnabled(false);
 		apply.setOnClickListener(this);
 
 		return view;
 	}
-	
+
+	private String getPhoneNumber(){
+		LinphoneProxyConfig proxyConfig = LinphoneManager.getLc().createProxyConfig();
+		String countryCode = dialCode.getText().toString();
+		if(countryCode != null && countryCode.startsWith("+")) {
+			countryCode = countryCode.substring(1);
+		}
+		proxyConfig.setDialPrefix(countryCode);
+		return proxyConfig.normalizePhoneNumber(phoneNumberEdit.getText().toString());
+	}
+
+
 	public void linphoneLogIn() {
 		if (login.getText() == null || login.length() == 0 || password.getText() == null || password.length() == 0) {
 			Toast.makeText(getActivity(), getString(R.string.first_launch_no_login_password), Toast.LENGTH_LONG).show();
 			return;
 		}
 		
-		AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), displayName.getText().toString(), getResources().getBoolean(R.bool.assistant_account_validation_mandatory));
+		AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), null, displayName.getText().toString(), getResources().getBoolean(R.bool.assistant_account_validation_mandatory));
+	}
+
+	private void addPhoneNumberHandler(final EditText field, final ImageView icon) {
+		field.addTextChangedListener(new TextWatcher() {
+			public void afterTextChanged(Editable s) {
+				if (s.length() > 0) {
+					//phoneNumberOk = false;
+					String countryCode = dialCode.getText().toString();
+					if (countryCode != null && countryCode.startsWith("+")) {
+						countryCode = countryCode.substring(1);
+					}
+					LinphoneAccountCreator.Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), countryCode);
+					Log.w("Set PhoneNmuber " + status.toString());
+					if (status.equals(LinphoneAccountCreator.Status.Ok)) {
+						status = accountCreator.isAccountUsed();
+						Log.w("Is account activated " + status.toString());
+						if (status.equals(LinphoneAccountCreator.Status.Ok)) {
+
+						}
+					} else {
+						//displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
+					}
+				} else {
+					//displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, "");
+				}
+			}
+
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+			}
+
+			public void onTextChanged(CharSequence s, int start, int count, int after) {
+			}
+		});
 	}
 
 	@Override
@@ -77,10 +158,18 @@ public class LinphoneLoginFragment extends Fragment implements OnClickListener,
 		int id = v.getId();
 		
 		if (id == R.id.assistant_apply) {
-			linphoneLogIn();
+			if(recoverAccount){
+				recoverAccount();
+			} else {
+				linphoneLogIn();
+			}
 		}
 	}
 
+	private void recoverAccount() {
+		accountCreator.recoverPhoneAccount();
+	}
+
 	@Override
 	public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
@@ -91,4 +180,47 @@ public class LinphoneLoginFragment extends Fragment implements OnClickListener,
 
 	@Override
 	public void afterTextChanged(Editable s) {}
+
+	@Override
+	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+
+	}
+
+	@Override
+	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		recoverAccount = true;
+		apply.setEnabled(true);
+	}
+
+	@Override
+	public void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		Log.w("IS ACTIVATED " + status.toString());
+		apply.setEnabled(true);
+	}
+
+	@Override
+	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		AssistantActivity.instance().displayAssistantCodeConfirm(getPhoneNumber(), getPhoneNumber(), true);
+
+	}
 }

From 83b298506ddcc6e995063b6da97b376b291395e8 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 29 Aug 2016 16:40:57 +0200
Subject: [PATCH 12/36] Update linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index dd2749d56..9cbccee8d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit dd2749d56f51107fd57e9b5db1125c8d3b2f6e77
+Subproject commit 9cbccee8de5686fcfed41717429c4130d13d7ee8

From 7424cb0ba8f3cc93eb49ed611e5072f2dd4fa31b Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 30 Aug 2016 10:49:44 +0200
Subject: [PATCH 13/36] Update linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 9cbccee8d..a44713b45 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9cbccee8de5686fcfed41717429c4130d13d7ee8
+Subproject commit a44713b458d1d9ccaa84d5acb464d76ad77ca403

From 8af58d54043253647845ec8a539270f29b5a88f6 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 19 Aug 2016 11:26:05 +0200
Subject: [PATCH 14/36] Update linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 4c2268e2d..1d1c196ea 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 4c2268e2de1cf3fd503e3682e2e2ad77bbebc950
+Subproject commit 1d1c196ead2f63e2393b91e12e48ca09c2c7284d

From 735ec05f02d9c4d11f62f8f07749e584a082d53a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 25 Aug 2016 11:12:37 +0200
Subject: [PATCH 15/36] Updated submodules

---
 submodules/belle-sip | 2 +-
 submodules/linphone  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/belle-sip b/submodules/belle-sip
index b553f58c3..0b825c68d 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit b553f58c3f23633b9c183af5784b2170b6b4aa91
+Subproject commit 0b825c68d2c69385d277f7833f21c6c0a3f4ad8d
diff --git a/submodules/linphone b/submodules/linphone
index 1d1c196ea..dd2749d56 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 1d1c196ead2f63e2393b91e12e48ca09c2c7284d
+Subproject commit dd2749d56f51107fd57e9b5db1125c8d3b2f6e77

From 04ca2b9d00901cd95249515a19fff0b23296db8a Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 29 Aug 2016 16:40:57 +0200
Subject: [PATCH 16/36] Update linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index dd2749d56..9cbccee8d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit dd2749d56f51107fd57e9b5db1125c8d3b2f6e77
+Subproject commit 9cbccee8de5686fcfed41717429c4130d13d7ee8

From 7cf0738b7d025be33696a0b40df0c4b37ffebeaa Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 30 Aug 2016 10:49:44 +0200
Subject: [PATCH 17/36] Update linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 9cbccee8d..a44713b45 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9cbccee8de5686fcfed41717429c4130d13d7ee8
+Subproject commit a44713b458d1d9ccaa84d5acb464d76ad77ca403

From ec3542fca974473fadef755231f259ca7c90a965 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 1 Sep 2016 17:46:03 +0200
Subject: [PATCH 18/36] Integration of account creator

---
 res/drawable-xhdpi/info.png                   | Bin 0 -> 2935 bytes
 .../assistant_account_creation.xml            | 273 +++++++--
 .../assistant_linphone_login.xml              | 110 ++++
 res/layout/assistant_account_creation.xml     | 142 +++--
 res/layout/assistant_linphone_login.xml       |  14 -
 res/raw/linphonerc_factory                    |   1 -
 res/values/non_localizable_custom.xml         |   9 +-
 res/values/strings.xml                        |   5 +
 res/xml/preferences.xml                       |   5 -
 src/org/linphone/LinphoneActivity.java        | 117 +++-
 src/org/linphone/LinphoneManager.java         |   2 +-
 src/org/linphone/LinphonePreferences.java     |  16 +-
 src/org/linphone/SettingsFragment.java        |   2 -
 .../linphone/assistant/AssistantActivity.java |  31 +-
 .../assistant/CountryListFragment.java        |   2 +-
 .../CreateAccountCodeActivationFragment.java  | 154 +++--
 .../assistant/CreateAccountFragment.java      | 554 ++++++++----------
 .../assistant/LinphoneLoginFragment.java      | 123 +++-
 18 files changed, 988 insertions(+), 572 deletions(-)
 create mode 100644 res/drawable-xhdpi/info.png

diff --git a/res/drawable-xhdpi/info.png b/res/drawable-xhdpi/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..22ba01c965bd04d55c1ff228ebd44deaff8ff552
GIT binary patch
literal 2935
zcmY*bcUaTO7X1Z5Dbjm2QY0WDfI)hI5I{<3A_9sD-H0JEK<LdCBnnvQO%#@rrAbi)
zLO=wOB1=)M6j4HuA|Ob|4eq{u@6Gqk+&gE^oOAE|H53OsOI~g%ZU6vytxlnwSkaL+
z9XJoNR?m@~G*)2uH$|HQK<zD_9ZwF{9_)R}2@L=d#{eMi8USpupg1M~glGW3S1bVN
zX9IvZF~8Z-kafUCJmnU|(tfi)K}bkm7yy9WaL%s5u4r3*ZvtN3(}&>Ys~(0Yve*D%
z7^crk@xH;H;4u8<z##oFBl%wpeOA5?!{ougD8T_n@~&tHuo;2m3)WVLt82(3xWQns
zA<4&2-w9>$&vn+$Nd97QFi{@{3k?lb4?UqyAo;^I_4M>$8d@+dEhvit4GIqo_6&mt
z1}Xe4@*f?PZ;&?$M-0Xh0>S&bo?e8IU?X|?eWQQJ-*pD#{Qm0{81zqDtOjBGCooNQ
z4cNchtgD9msJ=Z3=gV^5*GFg?{$l<g_K%MtY~TEUiut?KUnr|p1h*mV-)BQ`+jc0s
zu^v9j3T5gX23p9EO_n_)+C9_#p~RzEF`=?F4vVzrMS4{peOp9s%*?f}H+DZOc+<=F
z(&bftXpyrG9GxVvXL8?39*L~V!%vVKaneGU11O59p`^C^=yte}<KvbOm!Te^6M1tp
z{q%SJ0|PXjw(-2^520!6i~X%L`H_pE14ipJ$<@9RiHV8sH@l|r<;3FQHPPl_7YI7q
z;k3Kmn@38&>!2&j>{UzDZ<ABEuT<L$_kH7yi5+XejYv-QU%k+GmrB#rATr75`qAaN
z!H`{--anOIo2o280Yu`Cw_&<?WMrgeT5oa(CPaXm9kVp~^mXSsxW|NT{8<Y}4OM8I
zdv58G8ITbMV#^0GV~cx}tTEaG9JKiO_!MVGBxG&5{6>js4IJ-$dTWuv_~<RI6KI&1
zXlpD<{S7k7%f}ZJzp*V6b`$g9k)4^+4mComK<;TQJ&n9cy_z&l=~`f{-)Rs<o5^K{
z3-(2YEl>5yy?^NW?C0=p6)h)F?W?{;WDlMbKH^mEPFl)~9fhy)R<2CLdruwqLKI@~
z63-F2y&*V=vw`H{a`@WD($dn8s&kEYN-8=hlj5EeeTm9+zeC)La;1t?6mmT6)pWHY
zT}v!U*)IP@N=nME%ye7+LpIa-8I3gYB@AKdc4sKGn5)`XZQ~O-QE@gs<d}c%oPmLX
zeb*gf$<DpKy)Fy&H-wAt3$AciwkyQ#-ltM=I%ap*X$`^W=gOCaA<@M;uvsI1oU2N}
zGseq2Op5App(M*&a;;uoUQ?V28gr*~fC2OLrsA@)nZ{|wtYC?&erUbs?C_aSbI9wT
z9XB+~iSfs1oPhb}D^P>>;2Ob&&4DSAo9s<3^u{h9$%Boxxjaw5zOreiRmd-kjE5kI
zK0cNF)BvPSs>O!8{n<D5o^C!r;$uIGW+J#{5gQ~lOh%75X>#$WG<WCFP;H@P;;5u~
zPEtc;j-1vE?-8bBEJw&uL(4GhkG&bqp0xIj^{*P|MNNH{CyyJh)g%atWm%|v4|NR3
zZ7D3#Br{-YMkW`|K}6Pj9jb-w-Pkm7GJ9zm*A!psptZ#;4~mL_E5tPJkuBKyomIgC
zsEDV1*_71)>qpK)ci|Itm5;Nv#>LZMaOptC)7|a$8r5zAPI;qceoq=zCg?_Z;SJTB
z8Abfe<|}5-bct2HXYj(bAuE9zSQ7m6^kGDsaHn&^YRmfkyVLKvIhAGSTC<v9)fHRu
z$jn=*_qJUetmt5=#7*`+u)rqRlWUl8F(80vcaS;X$=0Y0f$`1R`32B#ss)+!&s<0J
z2-6kpRII|7?PQQ0K}pj2i&USJ7L!ng%JZWq9|>yu_*;zDOx%luPF>?K>>Y;Txycls
z*#j?>IUqHL5nk^qn)>>uW9*M}843L8wIbb$Ip@07GJf1U)84cv10o&HwkVprDp#Ra
zl--Z{IY78Op%o*$Q_aZ2-ESNp8yjnVS#?dk6T>zoKE|Fh_l^^rBHZQmNuMluy&yk_
z5w)@OsbnKpPPtfcTLCOvjXOEEFi-%x;ze5duDy6?EaKH`?Sg)>#*P!<uh!8$1w&8N
zZ?;=X+Qhzi@NnIN$@@WKx5n$@=imK>J~tSPm0<gZ?{%okFQe{YQeED>3|u)PBqfa!
z(=&#eC6R0&y(oUOZI(`2*#x;!1{5c^Mx7q=7LDcSAgg*%Y5MBv7q(8i6YHIyE>mPf
z&KKG`!(L(oADObhRMK|m?fJd#wVKEg`tU))*e69U6-QrJI#|>#RGm8z>sq1x?8aL9
z2_sPoLl9I@Yt%1T_#}$X>^jhTiOv*q;+Hlc1IgjVx`<M`n&Zeg3@e@eMf9j6;dZzH
z7CUzNo4MxKnu@Y-R7*yqOaq}rd(KAdjbbTVzf@g8S&<I3>Gfn~rCP*Eq%HeH6nQ=4
zkFDd}nrjt2kEvAZ70D^MiS5!8-T8<M5i>koKIexk>&}2@T6v%Q5irB26w3`|KeQ!y
z<kr)C-g0URV7Xk#3fega-TL#g#r+)J9i(i0oP~`|pK-az89p0z-B*U9MaFtit3=wp
z1h>7OG>mfN3euho5?EL`yi8#axvU?!V`(y}1{2tIWa0&8ePe{<!{zR%zEkT}B)0D;
zS)4>E37|)!ay0FW)<0-btr8QwqLmA#@HSsUD!=zX;5VS8JTYX`osv%sZGWJ;i3-e!
z7`M9IIW35lUDi!phh4vP5aptfdRuqO2R?;mXJ+_IemtBcBbugEOUI5{48Ym8bd~)M
zja}@IgHS35_pbdIcf|xNd}(5!Uv<wTIx`SFoz>OVvBTr*Ei2Ml>g?I+=i3*I7Om@G
z{_zkMuN2zToF3b_x|!|wjMIz4b$r=DCY@40k!N=+%^dn9u17!4oHkeCsgQz-m1#U|
z^5jcGb`0I!rd%379U1-dd`P_ws8cq^1tPV174l8kTXe;@!~y_CeX7W7ZYktrdnS%L
z$~f~D)4nqYer}^A%j47Fg%4r$#H{hLU&-xhK2#dID*?-ZTO424tI#$L;bV7{u%5Uv
zJB<_hja_YNwYA|zq01i%CTIC*y1NSHWS3G~iwB3jJw&*geOo0G5b_Ii4bRWyD`fFw
zGI<}Eh;RX$kfFvt>vQ0o2HFVlovTtK{WuS=eCs3H{f)!AV=X2RSE>#IbhFSXgX(!G
zhOMx(4l#tjg{we5SPB{58k^;r-}3NvD@<X#|H`;QNgtb`w&J<iXn^BUM3|3_9+=E2
zU*p14Qn9tCqPn6#{?x6|dt7XDV>tkLD|g6b=xCi%vuIiUtVt*0`Rb3_bD<Za&)dhE
zT^TAepFpqp{)qx}JJ2XGP{$);&CQ6oyde_%+_vgy=*4474D&CHdFUafale$R0}13M
zF6KII^ZW8Wg;6tRixw|X5<`Iw@d~*#^<R+9B3%0OS^MLqiMQSpiT1`hr4iJtOvuSy
zbKyDA*8Md*_e@RiwiC{)cS>xs5F_K`h&zwf&wz#;>sCEex2Y&)4sC;3?PNFXsND4D
zmhHPSQH}WnXE=sbva>YA>&?i@{_2ZQxndK8w~Ydnji)!z$IeFKtKW8)p#w-i>W+b%
zP1yzmNKJkNgRTL!gM1>l$BnFRe;cH;5oLPoQb&4PJGg_<XA3Uz6^TP7<$G*$W%{1v
z$bCO1_MxUb>jIw#kF03`WlvtVgCkDLpMOEEkkg>cQgfR46{ofn(spYjqL0eh{Rxtb
Wl%on*bENKnZ>`MjP}NB6)xQAKV>qt>

literal 0
HcmV?d00001

diff --git a/res/layout-sw533dp-land/assistant_account_creation.xml b/res/layout-sw533dp-land/assistant_account_creation.xml
index 06a1061c2..14127030f 100644
--- a/res/layout-sw533dp-land/assistant_account_creation.xml
+++ b/res/layout-sw533dp-land/assistant_account_creation.xml
@@ -25,11 +25,12 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"/>
 
+
 		<TableLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="30dp"
-			android:orientation="horizontal">
+			android:orientation="vertical">
 
 		<TableRow
 			android:layout_weight="1"
@@ -38,44 +39,153 @@
 			android:layout_marginRight="10dp">
 
 			<LinearLayout
+				android:id="@+id/phone_number_layout"
+				android:visibility="visible"
 				android:orientation="vertical"
 				android:layout_width="0dp"
 				android:layout_weight="1"
 				android:layout_height="wrap_content">
 
-				<TextView
-					android:id="@+id/username_label"
-					android:text="@string/username"
-					style="@style/font13"
-					android:textAllCaps="true"
+				<RelativeLayout
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"/>
+					android:layout_height="wrap_content">
 
-				<EditText
-					android:id="@+id/username"
-					android:background="@drawable/resizable_textfield"
-					android:textColor="@color/colorB"
-					android:inputType="text|textNoSuggestions"
-					android:contentDescription="@string/content_description_username_field"
-					android:layout_width="match_parent"
-					android:layout_height="40dp"
-					android:singleLine="true"/>
+					<TextView
+						android:id="@+id/phone_number_label"
+						android:text="@string/phone_number"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
 
-				<TextView
-					android:id="@+id/username_error"
-					android:text="@string/error"
-					style="@style/font20"
+					<ImageView
+						android:id="@+id/info_phone_number"
+						android:src="@drawable/info"
+						android:layout_alignParentRight="true"
+						android:layout_width="20dp"
+						android:layout_height="20dp"/>
+
+				</RelativeLayout>
+
+				<LinearLayout
+					android:visibility="visible"
+					android:orientation="horizontal"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"/>
+					android:layout_marginTop="5dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content">
+
+					<Button
+						android:id="@+id/select_country"
+						style="@style/font8"
+						android:text="@string/select_your_country"
+						android:background="@drawable/resizable_assistant_button"
+						android:layout_width="0dp"
+						android:layout_weight="1"
+						android:layout_height="40dp"/>
+
+					<LinearLayout
+						android:orientation="vertical"
+						android:layout_marginLeft="30dp"
+						android:layout_width="0dp"
+						android:layout_weight="1"
+						android:layout_height="wrap_content">
+
+
+						<LinearLayout
+							android:orientation="horizontal"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content">
+
+							<EditText
+								android:id="@+id/dial_code"
+								android:background="@drawable/resizable_textfield"
+								android:textColor="@color/colorB"
+								android:inputType="phone"
+								android:text="+"
+								android:layout_marginRight="10dp"
+								android:gravity="center"
+								android:layout_width="65dp"
+								android:layout_height="40dp"
+								android:singleLine="true"/>
+
+							<EditText
+								android:id="@+id/phone_number"
+								android:background="@drawable/resizable_textfield"
+								android:textColor="@color/colorB"
+								android:contentDescription="@string/content_description_phone_number_field"
+								android:inputType="phone"
+								android:layout_width="match_parent"
+								android:layout_height="40dp"
+								android:singleLine="true"/>
+
+						</LinearLayout>
+
+						<TextView
+							android:id="@+id/phone_number_error"
+							android:text="@string/error"
+							style="@style/font20"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:visibility="invisible"/>
+
+						<TextView
+							android:id="@+id/sip_uri"
+							style="@style/font9"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"/>
+
+					</LinearLayout>
+				</LinearLayout>
 			</LinearLayout>
 
-			<LinearLayout
+		</TableRow>
+
+			<TableRow
+				android:layout_weight="1"
+				android:gravity="left"
+				android:layout_marginLeft="10dp"
+				android:layout_marginRight="10dp">
+
+				<CheckBox
+					android:id="@+id/use_username"
+					android:visibility="visible"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="@string/use_username_instead_or_phone_number"
+					android:checked="false" android:layout_column="1"/>
+			</TableRow>
+
+			<TableRow
+				android:layout_weight="1"
+				android:gravity="left"
+				android:layout_marginLeft="10dp"
+				android:layout_marginRight="10dp">
+
+				<CheckBox
+					android:id="@+id/use_email"
+					android:visibility="visible"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="@string/use_email_for_validation" android:layout_column="1"
+					android:checked="false"/>
+
+			</TableRow>
+
+			<TableRow
+				android:layout_weight="1"
+				android:gravity="center"
+				android:layout_marginLeft="10dp"
+				android:layout_marginRight="10dp">
+
+				<LinearLayout
+				android:id="@+id/password_layout"
 				android:orientation="vertical"
+				android:visibility="visible"
 				android:paddingLeft="30dp"
 				android:layout_width="0dp"
 				android:layout_weight="1"
-				android:layout_height="wrap_content">
+				android:layout_height="wrap_content" android:layout_column="0">
 
 				<TextView
 					android:id="@+id/password_label"
@@ -106,7 +216,41 @@
 					android:visibility="invisible"/>
 
 			</LinearLayout>
-		</TableRow>
+				<LinearLayout
+					android:id="@+id/username_layout"
+					android:orientation="vertical"
+					android:visibility="gone"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content" android:layout_column="1">
+
+					<TextView
+						android:id="@+id/username_label"
+						android:text="@string/username"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<EditText
+						android:id="@+id/username"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="text|textNoSuggestions"
+						android:contentDescription="@string/content_description_username_field"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:singleLine="true"/>
+
+					<TextView
+						android:id="@+id/username_error"
+						android:text="@string/error"
+						style="@style/font20"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:visibility="invisible"/>
+				</LinearLayout>
+			</TableRow>
 
 		<TableRow
 			android:layout_weight="1"
@@ -115,48 +259,13 @@
 			android:layout_marginRight="10dp">
 
 			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="0dp"
-				android:layout_weight="1"
-				android:layout_height="wrap_content">
-
-				<TextView
-					android:id="@+id/confirm_password_label"
-					android:text="@string/confirm_password"
-					style="@style/font13"
-					android:textAllCaps="true"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"/>
-
-				<EditText
-					android:id="@+id/confirm_password"
-					android:background="@drawable/resizable_textfield"
-					android:textColor="@color/colorB"
-					android:inputType="textPassword"
-					android:contentDescription="@string/content_description_confirm_password_field"
-					android:textCursorDrawable="@null"
-					android:layout_width="match_parent"
-					android:layout_height="40dp"
-					android:paddingLeft="10dp"
-					android:paddingRight="10dp"
-					android:singleLine="true"/>
-
-				<TextView
-					android:id="@+id/confirm_password_error"
-					android:text="@string/error"
-					style="@style/font20"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"/>
-
-			</LinearLayout>
-
-			<LinearLayout
+				android:id="@+id/email_layout"
+				android:visibility="gone"
 				android:orientation="vertical"
 				android:layout_width="0dp"
 				android:layout_weight="1"
 				android:paddingLeft="30dp"
-				android:layout_height="wrap_content">
+				android:layout_height="wrap_content" android:layout_column="0">
 
 			<TextView
 					android:id="@+id/email_label"
@@ -188,6 +297,44 @@
 					android:visibility="invisible"/>
 
 			</LinearLayout>
+			<LinearLayout
+				android:id="@+id/password_confirm_layout"
+				android:visibility="gone"
+				android:orientation="vertical"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="wrap_content" android:layout_column="1">
+
+				<TextView
+					android:id="@+id/confirm_password_label"
+					android:text="@string/confirm_password"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/confirm_password"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="textPassword"
+					android:contentDescription="@string/content_description_confirm_password_field"
+					android:textCursorDrawable="@null"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:paddingLeft="10dp"
+					android:paddingRight="10dp"
+					android:singleLine="true"/>
+
+				<TextView
+					android:id="@+id/confirm_password_error"
+					android:text="@string/error"
+					style="@style/font20"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"/>
+
+			</LinearLayout>
 		</TableRow>
 	</TableLayout>
 
diff --git a/res/layout-sw533dp-land/assistant_linphone_login.xml b/res/layout-sw533dp-land/assistant_linphone_login.xml
index 1c9d8df64..31756ec07 100644
--- a/res/layout-sw533dp-land/assistant_linphone_login.xml
+++ b/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -21,18 +21,123 @@
 		android:paddingTop="10dp"
 		android:layout_gravity="center"/>
 
+
+
 	<TableLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
 		android:orientation="horizontal">
 
+		<TableRow
+			android:layout_weight="1"
+			android:gravity="left"
+			android:layout_marginLeft="10dp"
+			android:layout_marginRight="10dp">
+
+			<LinearLayout
+				android:id="@+id/phone_number_layout"
+				android:visibility="visible"
+				android:orientation="horizontal"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="wrap_content">
+
+				<Button
+					android:id="@+id/select_country"
+					style="@style/font8"
+					android:text="@string/select_your_country"
+					android:layout_marginTop="15dp"
+					android:background="@drawable/resizable_assistant_button"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="40dp"/>
+
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_marginLeft="30dp"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content">
+
+					<RelativeLayout
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content">
+
+						<TextView
+							android:id="@+id/phone_number_label"
+							android:text="@string/phone_number"
+							style="@style/font13"
+							android:textAllCaps="true"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"/>
+
+						<ImageView
+							android:id="@+id/info_phone_number"
+							android:src="@drawable/info"
+							android:layout_alignParentRight="true"
+							android:layout_width="15dp"
+							android:layout_height="15dp"/>
+
+					</RelativeLayout>
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content">
+
+						<EditText
+							android:id="@+id/dial_code"
+							android:background="@drawable/resizable_textfield"
+							android:textColor="@color/colorB"
+							android:inputType="phone"
+							android:text="+"
+							android:layout_marginRight="10dp"
+							android:gravity="center"
+							android:layout_width="65dp"
+							android:layout_height="40dp"
+							android:singleLine="true"/>
+
+						<EditText
+							android:id="@+id/phone_number"
+							android:background="@drawable/resizable_textfield"
+							android:textColor="@color/colorB"
+							android:contentDescription="@string/content_description_phone_number_field"
+							android:inputType="phone"
+							android:layout_width="match_parent"
+							android:layout_height="40dp"
+							android:singleLine="true"/>
+
+					</LinearLayout>
+
+				</LinearLayout>
+			</LinearLayout>
+
+		</TableRow>
+
+		<TableRow
+			android:layout_weight="1"
+			android:gravity="left"
+			android:layout_marginLeft="10dp"
+			android:layout_marginRight="10dp">
+
+			<CheckBox
+				android:id="@+id/use_username"
+				android:visibility="visible"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/login_with_username"/>
+		</TableRow>
+
 		<TableRow
 			android:layout_weight="1"
 			android:gravity="center"
 			android:layout_margin="10dp">
 
 			<LinearLayout
+				android:id="@+id/username_layout"
+				android:layout_gravity="top"
+				android:visibility="gone"
 				android:orientation="vertical"
 				android:layout_width="0dp"
 				android:layout_weight="1"
@@ -57,7 +162,10 @@
 			</LinearLayout>
 
 			<LinearLayout
+				android:id="@+id/password_layout"
+				android:visibility="gone"
 				android:orientation="vertical"
+				android:layout_gravity="top"
 				android:paddingLeft="30dp"
 				android:layout_width="0dp"
 				android:layout_weight="1"
@@ -94,7 +202,9 @@
 			android:layout_margin="10dp">
 
 			<LinearLayout
+				android:id="@+id/display_layout"
 				android:orientation="vertical"
+				android:visibility="gone"
 				android:layout_width="0dp"
 				android:layout_weight="1"
 				android:layout_height="wrap_content">
diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index 165b138dc..fa2d37c04 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -10,6 +10,7 @@
 		android:orientation="vertical">
 
 		<TextView
+			android:id="@+id/assistant_title"
 			android:text="@string/assistant_create_account"
 			style="@style/font6"
 			android:textAllCaps="true"
@@ -26,76 +27,98 @@
 			android:layout_height="wrap_content"/>
 
 		<LinearLayout
-			android:id="@+id/phone_number_layout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:gravity="center"
 			android:layout_marginTop="30dp"
 			android:orientation="vertical">
 
-			<Button
-				android:id="@+id/select_country"
-				style="@style/font8"
-				android:text="@string/select_your_country"
-				android:background="@drawable/resizable_assistant_button"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
-
 			<LinearLayout
+				android:id="@+id/phone_number_layout"
+				android:visibility="gone"
 				android:orientation="vertical"
-				android:layout_marginTop="10dp"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
 
-				<TextView
-					android:id="@+id/phone_number_label"
-					android:text="@string/phone_number"
-					style="@style/font13"
-					android:textAllCaps="true"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"/>
-
-				<LinearLayout
-					android:orientation="horizontal"
+				<RelativeLayout
+					android:layout_marginBottom="5dp"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content">
 
-					<EditText
-						android:id="@+id/dial_code"
-						android:background="@drawable/resizable_textfield"
-						android:textColor="@color/colorB"
-						android:inputType="phone"
-						android:layout_marginRight="10dp"
-						android:layout_width="50dp"
-						android:layout_height="40dp"
-						android:singleLine="true"/>
-
-					<EditText
-						android:id="@+id/phone_number"
-						android:background="@drawable/resizable_textfield"
-						android:textColor="@color/colorB"
-						android:contentDescription="@string/content_description_phone_number_field"
-						android:inputType="phone"
+					<TextView
+						android:id="@+id/phone_number_label"
+						android:text="@string/phone_number"
+						style="@style/font13"
+						android:textAllCaps="true"
 						android:layout_width="match_parent"
-						android:layout_height="40dp"
-						android:singleLine="true"/>
+						android:layout_height="wrap_content"/>
+
+					<ImageView
+						android:id="@+id/info_phone_number"
+						android:src="@drawable/info"
+						android:layout_alignParentRight="true"
+						android:layout_width="20dp"
+						android:layout_height="20dp"/>
+
+				</RelativeLayout>
+				<Button
+					android:id="@+id/select_country"
+					style="@style/font8"
+					android:text="@string/select_your_country"
+					android:background="@drawable/resizable_assistant_button"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"/>
+
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_marginTop="10dp"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content">
+
+						<EditText
+							android:id="@+id/dial_code"
+							android:background="@drawable/resizable_textfield"
+							android:textColor="@color/colorB"
+							android:inputType="phone"
+							android:text="+"
+							android:layout_marginRight="10dp"
+							android:gravity="center"
+							android:layout_width="65dp"
+							android:layout_height="42dp"
+							android:singleLine="true"/>
+
+						<EditText
+							android:id="@+id/phone_number"
+							android:background="@drawable/resizable_textfield"
+							android:textColor="@color/colorB"
+							android:contentDescription="@string/content_description_phone_number_field"
+							android:inputType="phone"
+							android:layout_width="match_parent"
+							android:layout_height="40dp"
+							android:singleLine="true"/>
+
+					</LinearLayout>
+
+					<TextView
+						android:id="@+id/phone_number_error"
+						android:text="@string/error"
+						style="@style/font20"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:visibility="invisible"/>
+
+					<TextView
+						android:id="@+id/sip_uri"
+						style="@style/font9"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
 
 				</LinearLayout>
-
-				<TextView
-					android:id="@+id/phone_number_error"
-					android:text="@string/error"
-					style="@style/font20"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"/>
-
-				<TextView
-					android:id="@+id/sip_uri"
-					style="@style/font9"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"/>
-
 			</LinearLayout>
 
 			<CheckBox
@@ -149,7 +172,7 @@
 			</LinearLayout>
 
 			<LinearLayout
-				android:id="@+id/email_layout"
+				android:id="@+id/password_layout"
 				android:visibility="gone"
 				android:orientation="vertical"
 				android:layout_width="match_parent"
@@ -191,6 +214,7 @@
 				</LinearLayout>
 
 				<LinearLayout
+					android:id="@+id/password_confirm_layout"
 					android:orientation="vertical"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content">
@@ -226,6 +250,16 @@
 
 				</LinearLayout>
 
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/email_layout"
+				android:visibility="gone"
+				android:orientation="vertical"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
 				<LinearLayout
 					android:orientation="vertical"
 					android:layout_width="match_parent"
diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml
index b57ae3a6d..3a130a6f4 100644
--- a/res/layout/assistant_linphone_login.xml
+++ b/res/layout/assistant_linphone_login.xml
@@ -90,20 +90,6 @@
 
 					</LinearLayout>
 
-					<TextView
-						android:id="@+id/phone_number_error"
-						android:text="@string/error"
-						style="@style/font20"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:visibility="invisible"/>
-
-					<TextView
-						android:id="@+id/sip_uri"
-						style="@style/font9"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"/>
-
 				</LinearLayout>
 			</LinearLayout>
 
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 28f765950..63bc3f753 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -49,4 +49,3 @@ username_length=-1
 username_max_length=64
 username_min_length=1
 username_regex=^[a-z0-9_.\-]*$
-xmlrpc_url=https://sip3.linphone.org:444/inapp.php
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index f94202657..a3cb87fc9 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -10,10 +10,15 @@
 	<bool name="force_use_of_linphone_friends">false</bool>
 	<bool name="use_linphone_tag">true</bool>
 
+	<!-- Phone numbers -->
+	<bool name="use_phone_number_validation">true</bool><!-- Use phone number for validation -->
+	<integer name="popup_time_interval">86400</integer><!-- Time between two inapp notifications in seconds -->
+
 	<!-- Assistant -->
-	<string name="wizard_url">https://sip3.linphone.org:444/inapp.php</string><!-- Url of the xmlrpc script -->
+	<string name="wizard_url">https://sip3.linphone.org:444/wizard.php</string><!-- Url of the xmlrpc script -->
 	<bool name="assistant_allow_username">true</bool> <!-- Allow to use an username instead of the phone number for account creation -->
 	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool><!-- Start assistant in loginFragment view instead of menu -->
+
 	<bool name="replace_assistant_with_old_interface">false</bool>
 	<bool name="hide_assistant">false</bool>
 	<bool name="assistant_cancel_move_to_back">false</bool>
@@ -32,7 +37,7 @@
 	<bool name="allow_cancel_remote_provisioning_login_activity">true</bool>
 
 	<!-- Inapp -->
-	<bool name="enable_in_app_purchase">true</bool>
+	<bool name="enable_in_app_purchase">false</bool>
 	<integer name="days_notification_shown">5</integer><!-- Notification shown before end of trial version in days -->
 	<integer name="time_between_inapp_notification">86400</integer><!-- Time between two inapp notifications in seconds -->
 	<bool name="hide_username_in_inapp">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 14bb442ca..0e1399a20 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -49,6 +49,8 @@
 	<string name="connect">Connection</string>
 	<string name="decline">Decline</string>
 	<string name="conference">Conference</string>
+	<string name="link">Link</string>
+	<string name="link_account_popup">Do you want to link the account %s with your phone number ?</string>
 
 	<!-- Launch screen -->
 	<string name="app_description">the <i>libre</i> SIP client</string>
@@ -57,6 +59,7 @@
 	<string name="welcome">Welcome</string>
 	<string name="assistant">Assistant</string>
 	<string name="assistant_create_account">Create account</string>
+	<string name="assistant_link_account">Link account</string>
 	<string name="assistant_continue">Continue</string>
 	<string name="assistant_activate">Activate account</string>
 	<string name="assistant_finish">Finish configuration</string>
@@ -104,6 +107,8 @@
 	<string name="use_username_instead_or_phone_number">Don\'t use phone number as username</string>
 	<string name="use_email_for_validation">Use email address for account validation</string>
 	<string name="login_with_username">Log in with username</string>
+	<string name="phone_number_info_title">What is my phone number for?</string>
+	<string name="phone_number_info_content">A SMS code will be sent to your phone number to validate your account.</string>
 
 	<!-- Status -->
 	<string name="invalid_email">Invalid email</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c225348a7..7c008a604 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -14,11 +14,6 @@
 	    android:key="@string/pref_add_account_key"
 	    android:persistent="false"/>
 
-	<Preference
-	    android:title="@string/pref_in_app_store"
-	    android:key="@string/pref_in_app_store_key"
-	    android:persistent="false"/>
-
 	<PreferenceCategory
 	    android:title="@string/pref_preferences_title">
 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 29c76c283..95d1debf0 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -32,6 +32,8 @@ import org.linphone.assistant.AssistantActivity;
 import org.linphone.assistant.RemoteProvisioningLoginActivity;
 import org.linphone.compatibility.Compatibility;
 import org.linphone.core.CallDirection;
+import org.linphone.core.LinphoneAccountCreator;
+import org.linphone.core.LinphoneAccountCreatorImpl;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCall;
@@ -100,7 +102,7 @@ import android.widget.Toast;
 /**
  * @author Sylvain Berfini
  */
-public class LinphoneActivity extends Activity implements OnClickListener, ContactPicked, ActivityCompat.OnRequestPermissionsResultCallback {
+public class LinphoneActivity extends Activity implements OnClickListener, ContactPicked, ActivityCompat.OnRequestPermissionsResultCallback, LinphoneAccountCreator.LinphoneAccountCreatorListener {
 	public static final String PREF_FIRST_LAUNCH = "pref_first_launch";
 	private static final int SETTINGS_ACTIVITY = 123;
 	private static final int CALL_ACTIVITY = 19;
@@ -202,10 +204,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		initButtons();
 		initSideMenu();
 
-		if(getResources().getBoolean(R.bool.enable_in_app_purchase)){
-			isTrialAccount();
-		}
-
 		currentFragment = FragmentsAvailable.EMPTY;
 		if (savedInstanceState == null) {
 			changeCurrentFragment(FragmentsAvailable.DIALER, getIntent().getExtras());
@@ -628,6 +626,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		startActivity(new Intent(LinphoneActivity.this, AssistantActivity.class));
 	}
 
+	public void displayLinkPhoneNumber() {
+		Intent assistant = new Intent();
+		assistant.setClass(this, AssistantActivity.class);
+		assistant.putExtra("LinkPhoneNumber", true);
+		startActivity(assistant);
+	}
+
 	public void displayInapp() {
 		startActivity(new Intent(LinphoneActivity.this, InAppPurchaseActivity.class));
 	}
@@ -981,8 +986,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 	private int mAlwaysChangingPhoneAngle = -1;
 
-
-
 	private class LocalOrientationEventListener extends OrientationEventListener {
 		public LocalOrientationEventListener(Context context) {
 			super(context);
@@ -1120,7 +1123,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	protected void onPause() {
 		getIntent().putExtra("PreviousActivity", 0);
 
-		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled()){
+		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled() && LinphoneManager.getLc().getDefaultProxyConfig() != null){
 			LinphoneManager.getInstance().subscribeFriendList(!isApplicationBroughtToBackground(this));
 		}
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
@@ -1333,6 +1336,16 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 		refreshAccounts();
 
+		if(getResources().getBoolean(R.bool.enable_in_app_purchase)){
+			isTrialAccount();
+		}
+
+		if(getResources().getBoolean(R.bool.use_phone_number_validation)) {
+			if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null && !LinphonePreferences.instance().getLinkPopupTime().equals(""))){
+				isAccountWithAlias();
+			}
+		}
+
 		updateMissedChatCount();
 		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled()){
 			LinphoneManager.getInstance().subscribeFriendList(true);
@@ -1578,8 +1591,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 	}
 
-
-
 	public void refreshAccounts(){
 		if (LinphoneManager.getLc().getProxyConfigList().length > 1) {
 			accountsList.setVisibility(View.VISIBLE);
@@ -1671,9 +1682,20 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 	}
 
+	private void isAccountWithAlias(){
+		if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
+			LinphoneAccountCreator accountCreator;
+			accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+			accountCreator.setDomain(getResources().getString(R.string.default_domain));
+			accountCreator.setListener(this);
+			accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
+			accountCreator.isAccountUsed();
+		}
+	}
+
 	//Inapp Purchase
 	private void isTrialAccount() {
-		if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
+		if(LinphoneManager.getLc().getDefaultProxyConfig() != null && LinphonePreferences.instance().getInappPopupTime() != null) {
 			XmlRpcHelper helper = new XmlRpcHelper();
 			helper.isTrialAccountAsync(new XmlRpcListenerBase() {
 				@Override
@@ -1683,13 +1705,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 				}
 
 				@Override
-				public void onError(String error){}
+				public void onError(String error) {
+				}
 			}, LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()), LinphonePreferences.instance().getAccountHa1(LinphonePreferences.instance().getDefaultAccountIndex()));
 		}
 	}
 
 	private void getExpirationAccount() {
-		if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
+		if(LinphoneManager.getLc().getDefaultProxyConfig() != null && LinphonePreferences.instance().getInappPopupTime() != null) {
 			XmlRpcHelper helper = new XmlRpcHelper();
 			helper.getAccountExpireAsync(new XmlRpcListenerBase() {
 				@Override
@@ -1708,16 +1731,19 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 				}
 
 				@Override
-				public void onError(String error){}
+				public void onError(String error) {
+				}
 			}, LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()), LinphonePreferences.instance().getAccountHa1(LinphonePreferences.instance().getDefaultAccountIndex()));
 		}
 	}
 
 	public void displayInappNotification(String date) {
-		if (LinphonePreferences.instance().getLastDateNotificationShown() != null && timestampToHumanDate(Calendar.getInstance()).equals(LinphonePreferences.instance().getLastDateNotificationShown())) {
+		long now = Calendar.getInstance().getTimeInMillis();
+		if (LinphonePreferences.instance().getInappPopupTime() != null && Long.parseLong(LinphonePreferences.instance().getInappPopupTime()) < now) {
 			return;
 		} else {
-			LinphonePreferences.instance().setLastDateNotificationShown(timestampToHumanDate(Calendar.getInstance()));
+			long newDate = now + (getResources().getInteger(R.integer.time_between_inapp_notification)*60);
+			LinphonePreferences.instance().setInappPopupTime(String.valueOf(newDate));
 		}
 		if(isTrialAccount){
 			LinphoneService.instance().displayInappNotification(String.format(getString(R.string.inapp_notification_trial_expire), date));
@@ -1742,6 +1768,65 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 		return -1;
 	}
+
+	private void askLinkWithPhoneNumber(){
+		long now = Calendar.getInstance().getTimeInMillis();
+		long newDate = now + (getResources().getInteger(R.integer.popup_time_interval)*60);
+		Log.w(LinphonePreferences.instance().getLinkPopupTime());
+		Log.w(now);
+		if (LinphonePreferences.instance().getLinkPopupTime() != null &&  Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) > now) {
+			return;
+		} else {
+				LinphonePreferences.instance().setLinkPopupTime(String.valueOf(newDate));
+		}
+		final Dialog dialog = displayDialog(String.format(getResources().getString(R.string.link_account_popup), LinphoneManager.getLc().getDefaultProxyConfig().getAddress().asStringUriOnly()));
+		Button delete = (Button) dialog.findViewById(R.id.delete_button);
+		delete.setText(getResources().getString(R.string.link));
+		Button cancel = (Button) dialog.findViewById(R.id.cancel);
+
+		delete.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				displayLinkPhoneNumber();
+				dialog.dismiss();
+			}
+		});
+
+		LinphonePreferences.instance().setLinkPopupTime(String.valueOf(newDate));
+
+		cancel.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				dialog.dismiss();
+			}
+		});
+		dialog.show();
+	}
+
+	@Override
+	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if(status.equals(LinphoneAccountCreator.Status.AccountExist)){
+			askLinkWithPhoneNumber();
+		}
+	}
+
+	@Override
+	public void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {}
+
+	@Override
+	public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {}
+
+	@Override
+	public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {}
+
+	@Override
+	public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {}
+
+	@Override
+	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {}
+
+	@Override
+	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {}
 }
 
 interface ContactPicked {
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index e025c5505..d63a66d2b 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -746,7 +746,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
 		mLc.setFriendsDatabasePath(mFriendsDatabaseFile);
 		mLc.setUserCertificatesPath(mUserCertificatePath);
-		subscribeFriendList(mPrefs.isFriendlistsubscriptionEnabled());
+		//subscribeFriendList(mPrefs.isFriendlistsubscriptionEnabled());
 		//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
 		enableDeviceRingtone(mPrefs.isDeviceRingtoneEnabled());
 
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 7cc92ce45..6e129309f 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -1311,12 +1311,20 @@ public class LinphonePreferences {
 		return purchasables;
 	}
 
-	public String getLastDateNotificationShown(){
-		return getConfig().getString("app", "notification_date", null);
+	public String getInappPopupTime(){
+		return getConfig().getString("app", "inapp_popup_time", null);
 	}
 
-	public void setLastDateNotificationShown(String date){
-		getConfig().setString("app", "notification_date", date);
+	public void setInappPopupTime(String date){
+		getConfig().setString("app", "inapp_popup_time", date);
+	}
+
+	public void setLinkPopupTime(String date){
+		getConfig().setString("app", "link_popup_time", date);
+	}
+
+	public String getLinkPopupTime(){
+		return getConfig().getString("app", "link_popup_time", null);
 	}
 
 	public String getXmlRpcServerUrl() {
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 7cc2d2e47..80d5241c6 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -35,7 +35,6 @@ import org.linphone.core.PayloadType;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
-import org.linphone.purchase.InAppPurchaseActivity;
 import org.linphone.tools.OpenH264DownloadHelper;
 import org.linphone.ui.LedPreference;
 import org.linphone.ui.PreferencesListFragment;
@@ -65,7 +64,6 @@ import android.provider.Settings;
  * @author Sylvain Berfini
  */
 public class SettingsFragment extends PreferencesListFragment {
-	private static final int STORE_INTENT = 2;
 	private LinphonePreferences mPrefs;
 	private Handler mHandler = new Handler();
 	private LinphoneCoreListenerBase mListener;
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 7d2c1a9a4..ed0bb2079 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -61,6 +61,7 @@ import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageView;
 import android.widget.Toast;
+
 /**
  * @author Sylvain Berfini
  */
@@ -71,7 +72,7 @@ private static AssistantActivity instance;
 	private AssistantFragmentsEnum firstFragment;
 	private Fragment fragment;
 	private LinphonePreferences mPrefs;
-	private boolean accountCreated = false, newAccount = false;
+	private boolean accountCreated = false, newAccount = false, isLink = false;
 	private LinphoneCoreListenerBase mListener;
 	private LinphoneAddress address;
 	private StatusFragment status;
@@ -96,14 +97,19 @@ private static AssistantActivity instance;
 		setContentView(R.layout.assistant);
 		initUI();
 
-		firstFragment = getResources().getBoolean(R.bool.assistant_use_linphone_login_as_first_fragment) ? AssistantFragmentsEnum.LINPHONE_LOGIN : AssistantFragmentsEnum.WELCOME;
-        if (findViewById(R.id.fragment_container) != null) {
-            if (savedInstanceState == null) {
-            	display(firstFragment);
-            } else {
-            	currentFragment = (AssistantFragmentsEnum) savedInstanceState.getSerializable("CurrentFragment");
-            }
-        }
+		if(getIntent().getBooleanExtra("LinkPhoneNumber",false)){
+			isLink = true;
+			displayCreateAccount();
+		} else {
+			firstFragment = getResources().getBoolean(R.bool.assistant_use_linphone_login_as_first_fragment) ? AssistantFragmentsEnum.LINPHONE_LOGIN : AssistantFragmentsEnum.WELCOME;
+			if (findViewById(R.id.fragment_container) != null) {
+				if (savedInstanceState == null) {
+					display(firstFragment);
+				} else {
+					currentFragment = (AssistantFragmentsEnum) savedInstanceState.getSerializable("CurrentFragment");
+				}
+			}
+		}
 		if (savedInstanceState != null && savedInstanceState.containsKey("echoCanceller")) {
 			echoCancellerAlreadyDone = savedInstanceState.getBoolean("echoCanceller");
 		} else {
@@ -358,6 +364,9 @@ private static AssistantActivity instance;
 
 	public void displayCreateAccount() {
 		fragment = new CreateAccountFragment();
+		Bundle extra = new Bundle();
+		extra.putBoolean("LinkPhoneNumber", isLink);
+		fragment.setArguments(extra);
 		changeFragment(fragment);
 		currentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT;
 		back.setVisibility(View.VISIBLE);
@@ -525,13 +534,15 @@ private static AssistantActivity instance;
 		back.setVisibility(View.INVISIBLE);
 	}
 
-	public void displayAssistantCodeConfirm(String username, String phone, boolean recoverAccount) {
+	public void displayAssistantCodeConfirm(String username, String phone, String dialcode, boolean recoverAccount) {
 		CreateAccountCodeActivationFragment fragment = new CreateAccountCodeActivationFragment();
 		newAccount = true;
 		Bundle extras = new Bundle();
 		extras.putString("Username", username);
 		extras.putString("Phone", phone);
+		extras.putString("Dialcode", dialcode);
 		extras.putBoolean("RecoverAccount", recoverAccount);
+		extras.putBoolean("LinkAccount", isLink);
 		fragment.setArguments(extras);
 		changeFragment(fragment);
 
diff --git a/src/org/linphone/assistant/CountryListFragment.java b/src/org/linphone/assistant/CountryListFragment.java
index 3c49dfdb5..8e1344f0a 100644
--- a/src/org/linphone/assistant/CountryListFragment.java
+++ b/src/org/linphone/assistant/CountryListFragment.java
@@ -75,7 +75,7 @@ public class CountryListFragment extends Fragment implements AdapterView.OnItemC
 	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 		Country c = (Country)view.getTag();
 		AssistantActivity.instance().country = c;
-		AssistantActivity.instance().displayCreateAccount();
+		AssistantActivity.instance().onBackPressed();
 	}
 
 	@Override
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index e9535fee6..4c0c00de9 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -20,9 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import android.app.Fragment;
 import android.os.Bundle;
-import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
+import org.linphone.mediastream.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -34,23 +34,20 @@ import android.widget.Toast;
 import org.linphone.LinphoneManager;
 import org.linphone.LinphonePreferences;
 import org.linphone.R;
-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.LinphoneXmlRpcSession;
-import org.linphone.core.LinphoneXmlRpcSessionImpl;
-import org.linphone.mediastream.Log;
+import org.linphone.core.LinphoneAccountCreator;
+import org.linphone.core.LinphoneAccountCreatorImpl;
 
-public class CreateAccountCodeActivationFragment extends Fragment {
-	private String username, phone, ha1;
+
+import static org.linphone.core.LinphoneAccountCreator.*;
+
+public class CreateAccountCodeActivationFragment extends Fragment implements LinphoneAccountCreatorListener {
+	private String username, phone, dialcode, ha1;
 	private EditText code;
-	private boolean recoverAccount;
+	private boolean recoverAccount = false, linkAccount = false;
 	private int code_length;
-	private Handler mHandler = new Handler();
 	private Button checkAccount;
-	private LinphoneXmlRpcSession xmlRpcSession;
-	
+	private LinphoneAccountCreator accountCreator;
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
@@ -58,12 +55,16 @@ public class CreateAccountCodeActivationFragment extends Fragment {
 		
 		username = getArguments().getString("Username");
 		phone = getArguments().getString("Phone");
+		dialcode = getArguments().getString("Dialcode");
 		recoverAccount = getArguments().getBoolean("RecoverAccount");
-		code_length = LinphonePreferences.instance().getCodeLength();
+		linkAccount = getArguments().getBoolean("LinkAccount");
 
-		if(username == null || username.length() == 0){
-			username = phone;
-		}
+		code_length = LinphonePreferences.instance().getCodeLength();
+		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+		accountCreator.setDomain(getResources().getString(R.string.default_domain));
+		accountCreator.setListener(this);
+		accountCreator.setUsername(username);
+		accountCreator.setPhoneNumber(phone, dialcode);
 
 		code = (EditText) view.findViewById(R.id.assistant_code);
 		code.addTextChangedListener(new TextWatcher() {
@@ -89,56 +90,79 @@ public class CreateAccountCodeActivationFragment extends Fragment {
 			@Override
 			public void onClick(View v) {
 				checkAccount.setEnabled(false);
-				activateAccount(phone, username, code.getText().toString(), false);
-			}
-		});
-
-		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), getString(R.string.wizard_url));
-
-		return view;
-	}
-
-	private void activateAccount(final String phone, final String username, final String code, boolean suscribe) {
-		final Runnable runNotOk = new Runnable() {
-			public void run() {
-				Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show();
-			}
-		};
-		final Runnable runOk = new Runnable() {
-			public void run() {
-				checkAccount.setEnabled(true);
-				AssistantActivity.instance().saveCreatedAccount(username, null, null, ha1, getString(R.string.default_domain), null);
-				AssistantActivity.instance().isAccountVerified(username);
-			}
-		};
-		final Runnable runNotReachable = new Runnable() {
-			public void run() {
-				Toast.makeText(getActivity(), getString(R.string.wizard_server_unavailable), Toast.LENGTH_LONG).show();
-			}
-		};
-
-		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("activate_phone_account", LinphoneXmlRpcRequest.ArgType.String);
-		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
-			@Override
-			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
-				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
-					String response = request.getStringResponse();
-					if (response.contains("ERROR")) {
-						mHandler.post(runNotOk);
-					} else {
-						ha1 = response;
-						mHandler.post(runOk);
-					}
-				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
-					mHandler.post(runNotReachable);
+				accountCreator.setActivationCode(code.getText().toString());
+				if(linkAccount){
+					linkAccount();
+				} else {
+					activateAccount();
 				}
 			}
 		});
 
-		xmlRpcRequest.addStringArg(phone);
-		xmlRpcRequest.addStringArg(username);
-		xmlRpcRequest.addStringArg(code);
-		xmlRpcRequest.addStringArg(getString(R.string.default_domain));
-		xmlRpcSession.sendRequest(xmlRpcRequest);
+
+		return view;
+	}
+
+	private void linkAccount(){
+		accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
+		accountCreator.setHa1(LinphonePreferences.instance().getAccountHa1(LinphonePreferences.instance().getDefaultAccountIndex()));
+		accountCreator.activatePhoneNumberLink();
+	}
+
+	private void activateAccount() {
+		if(accountCreator.getUsername() == null){
+			accountCreator.setUsername(accountCreator.getPhoneNumber());
+		}
+		accountCreator.activateAccount();
+	}
+
+	@Override
+	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+	}
+
+	@Override
+	public void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+	}
+
+	@Override
+	public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if(status.equals(Status.AccountActivated)){
+			checkAccount.setEnabled(true);
+			if(accountCreator.getUsername() != null){
+				AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null , null, accountCreator.getHa1() , getString(R.string.default_domain), null);
+				AssistantActivity.instance().isAccountVerified(accountCreator.getUsername());
+			} else {
+				AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null , null, accountCreator.getHa1() , getString(R.string.default_domain), null);
+				AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber());
+			}
+
+		} else if (status.equals(LinphoneAccountCreator.Status.Failed)){
+			Toast.makeText(getActivity(), getString(R.string.wizard_server_unavailable), Toast.LENGTH_LONG).show();
+		} else {
+			Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show();
+		}
+	}
+
+	@Override
+	public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if(status.equals(LinphoneAccountCreator.Status.Ok)){
+			LinphonePreferences.instance().setLinkPopupTime("");
+			AssistantActivity.instance().hideKeyboard();
+			AssistantActivity.instance().finish();
+		}
+	}
+
+	@Override
+	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
 	}
 }
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index 85e6a9c41..9f2bdefec 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -17,31 +17,24 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.linphone.LinphoneManager;
+import org.linphone.LinphonePreferences;
 import org.linphone.R;
 import org.linphone.core.LinphoneAccountCreator;
 import org.linphone.core.LinphoneAccountCreatorImpl;
 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 org.linphone.xmlrpc.XmlRpcHelper;
 import org.linphone.mediastream.Log;
 
-import android.Manifest;
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.app.AlertDialog;
 import android.app.Fragment;
-import android.content.Context;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.os.Handler;
 import android.telephony.TelephonyManager;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -57,6 +50,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import static org.linphone.core.LinphoneAccountCreator.*;
 
@@ -64,92 +58,102 @@ import static org.linphone.core.LinphoneAccountCreator.*;
  * @author Sylvain Berfini
  */
 public class CreateAccountFragment extends Fragment implements CompoundButton.OnCheckedChangeListener, OnClickListener, LinphoneAccountCreatorListener {
-	private Handler mHandler = new Handler();
 	private EditText phoneNumberEdit, usernameEdit, passwordEdit, passwordConfirmEdit, emailEdit, dialCode;
-	private TextView phoneNumberError, usernameError, passwordError, passwordConfirmError, emailError, sipUri;
+	private TextView phoneNumberError, usernameError, passwordError, passwordConfirmError, emailError, assisstantTitle, sipUri;
+	private ImageView phoneNumberInfo;
 	
 	private boolean phoneNumberOk = false;
 	private boolean usernameOk = false;
 	private boolean passwordOk = false;
 	private boolean emailOk = false;
 	private boolean confirmPasswordOk = false;
+	private boolean linkAccount = false;
 	private Button createAccount, selectCountry;
 	private CheckBox useUsername, useEmail;
-	private LinearLayout phoneNumberLayout, usernameLayout, emailLayout;
+	private int countryCode;
+	private LinearLayout phoneNumberLayout, usernameLayout, emailLayout, passwordLayout, passwordConfirmLayout;
 	private final Pattern UPPER_CASE_REGEX = Pattern.compile("[A-Z]");
-	private LinphoneXmlRpcSession xmlRpcSession;
 	private CountryListFragment.Country country;
-
 	private LinphoneAccountCreator accountCreator;
-	
-	private String getUsername() {
-		if(usernameEdit != null) {
-			String username = usernameEdit.getText().toString();
-			return username.toLowerCase(Locale.getDefault());
-		}
-		return null;
-	}
 
-	private String getPhoneNumber(){
-		LinphoneProxyConfig proxyConfig = LinphoneManager.getLc().createProxyConfig();
-		String countryCode = dialCode.getText().toString();
-		if(countryCode != null && countryCode.startsWith("+")) {
-			countryCode = countryCode.substring(1);
-		}
-		proxyConfig.setDialPrefix(countryCode);
-		return proxyConfig.normalizePhoneNumber(phoneNumberEdit.getText().toString());
-	}
-	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.assistant_account_creation, container, false);
 
+		//Initialize accountCreator
 		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
 		accountCreator.setDomain(getResources().getString(R.string.default_domain));
 		accountCreator.setListener(this);
 
+		createAccount = (Button) view.findViewById(R.id.assistant_create);
+
+		phoneNumberLayout = (LinearLayout) view.findViewById(R.id.phone_number_layout);
+		usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
+		emailLayout = (LinearLayout) view.findViewById(R.id.email_layout);
+		passwordLayout = (LinearLayout) view.findViewById(R.id.password_layout);
+		passwordConfirmLayout = (LinearLayout) view.findViewById(R.id.password_confirm_layout);
+
+		useUsername = (CheckBox) view.findViewById(R.id.use_username);
+		useEmail = (CheckBox) view.findViewById(R.id.use_email);
+
+		usernameError = (TextView) view.findViewById(R.id.username_error);
+		usernameEdit = (EditText) view.findViewById(R.id.username);
+
 		phoneNumberError = (TextView) view.findViewById(R.id.phone_number_error);
 		phoneNumberEdit = (EditText) view.findViewById(R.id.phone_number);
-		phoneNumberLayout = (LinearLayout) view.findViewById(R.id.phone_number_layout);
-		addPhoneNumberHandler(phoneNumberEdit, null);
-
-		selectCountry = (Button) view.findViewById(R.id.select_country);
-		selectCountry.setOnClickListener(this);
-
-		dialCode = (EditText) view.findViewById(R.id.dial_code);
 		sipUri = (TextView) view.findViewById(R.id.sip_uri);
 
+		phoneNumberInfo = (ImageView) view.findViewById(R.id.info_phone_number);
 
-		if(getResources().getBoolean(R.bool.assistant_allow_username)) {
-			useUsername = (CheckBox) view.findViewById(R.id.use_username);
-			useUsername.setVisibility(View.VISIBLE);
-			useUsername.setOnCheckedChangeListener(this);
+		selectCountry = (Button) view.findViewById(R.id.select_country);
+		dialCode = (EditText) view.findViewById(R.id.dial_code);
+		assisstantTitle = (TextView) view.findViewById(R.id.assistant_title);
 
-			usernameError = (TextView) view.findViewById(R.id.username_error);
-			usernameEdit = (EditText) view.findViewById(R.id.username);
-			usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
+		passwordError = (TextView) view.findViewById(R.id.password_error);
+		passwordEdit = (EditText) view.findViewById(R.id.password);
 
-			addUsernameHandler(usernameEdit, null);
+		passwordConfirmError = (TextView) view.findViewById(R.id.confirm_password_error);
+		passwordConfirmEdit = (EditText) view.findViewById(R.id.confirm_password);
+
+		emailError = (TextView) view.findViewById(R.id.email_error);
+		emailEdit = (EditText) view.findViewById(R.id.email);
+
+		//Phone number
+		if(getResources().getBoolean(R.bool.use_phone_number_validation)){
+			//Automatically get the country code from the phone
+			TelephonyManager tm = (TelephonyManager) getActivity().getApplicationContext().getSystemService(getActivity().getApplicationContext().TELEPHONY_SERVICE);
+			String countryIso = tm.getNetworkCountryIso();
+			LinphoneProxyConfig proxyConfig = LinphoneManager.getLc().createProxyConfig();
+			countryCode = proxyConfig.lookupCCCFromIso(countryIso.toUpperCase());
+
+			phoneNumberLayout.setVisibility(View.VISIBLE);
+
+			phoneNumberInfo.setOnClickListener(this);
+			addPhoneNumberHandler(phoneNumberEdit, null);
+			addPhoneNumberHandler(dialCode, null);
+			selectCountry.setOnClickListener(this);
+
+			String previousPhone = AssistantActivity.instance().phone_number;
+			if(previousPhone != null ){
+				phoneNumberEdit.setText(previousPhone);
+			}
+			setCountry(AssistantActivity.instance().country);
+
+			//Allow user to enter a username instead use the phone number as username
+			if(getResources().getBoolean(R.bool.assistant_allow_username) ) {
+				useUsername.setVisibility(View.VISIBLE);
+				useUsername.setOnCheckedChangeListener(this);
+			}
 		}
 
-		if(getResources().getBoolean(R.bool.isTablet)){
+		//Password & email address
+		if (getResources().getBoolean(R.bool.isTablet) || !getResources().getBoolean(R.bool.use_phone_number_validation)){
 			useEmail.setVisibility(View.VISIBLE);
-			useEmail = (CheckBox) view.findViewById(R.id.use_email);
 			useEmail.setOnCheckedChangeListener(this);
 
-			passwordError = (TextView) view.findViewById(R.id.password_error);
-			passwordEdit = (EditText) view.findViewById(R.id.password);
-
-			passwordConfirmError = (TextView) view.findViewById(R.id.confirm_password_error);
-			passwordConfirmEdit = (EditText) view.findViewById(R.id.confirm_password);
-
-			emailError = (TextView) view.findViewById(R.id.email_error);
-			emailEdit = (EditText) view.findViewById(R.id.email);
-			emailLayout = (LinearLayout) view.findViewById(R.id.email_layout);
-
-			addXMLRPCPasswordHandler(passwordEdit, null);
-			addXMLRPCConfirmPasswordHandler(passwordEdit, passwordConfirmEdit, null);
-			addXMLRPCEmailHandler(emailEdit, null);
+			addPasswordHandler(passwordEdit, null);
+			addConfirmPasswordHandler(passwordEdit, passwordConfirmEdit, null);
+			addEmailHandler(emailEdit, null);
 
 			if (getResources().getBoolean(R.bool.pre_fill_email_in_assistant)) {
 				Account[] accounts = AccountManager.get(getActivity()).getAccountsByType("com.google");
@@ -158,6 +162,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 					if (isEmailCorrect(account.name)) {
 						String possibleEmail = account.name;
 						emailEdit.setText(possibleEmail);
+						accountCreator.setEmail(possibleEmail);
 						emailOk = true;
 						break;
 					}
@@ -165,77 +170,62 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			}
 		}
 
-		String previousPhone = AssistantActivity.instance().phone_number;
-		if(previousPhone != null ){
-			phoneNumberEdit.setText(previousPhone);
-		}
-		setCountry(AssistantActivity.instance().country);
-		updateApplyButton();
+		//Hide phone number and display username/email/password
+		if(!getResources().getBoolean(R.bool.use_phone_number_validation)){
+			useEmail.setVisibility(View.GONE);
+			useUsername.setVisibility(View.GONE);
+
+			usernameLayout.setVisibility(View.VISIBLE);
+			passwordLayout.setVisibility(View.VISIBLE);
+			passwordConfirmLayout.setVisibility(View.VISIBLE);
+			emailLayout.setVisibility(View.VISIBLE);
+		}
+
+		//Link account with phone number
+		if(getArguments().getBoolean("LinkPhoneNumber")){
+			linkAccount = true;
+			useEmail.setVisibility(View.GONE);
+			useUsername.setVisibility(View.GONE);
+
+			usernameLayout.setVisibility(View.GONE);
+			passwordLayout.setVisibility(View.GONE);
+			passwordConfirmLayout.setVisibility(View.GONE);
+			emailLayout.setVisibility(View.GONE);
+
+			createAccount.setText(getResources().getString(R.string.assistant_link_account));
+			assisstantTitle.setText(getResources().getString(R.string.assistant_link_account));
+		}
+		addUsernameHandler(usernameEdit, null);
 
-    	createAccount = (Button) view.findViewById(R.id.assistant_create);
     	createAccount.setEnabled(false);
-    	createAccount.setOnClickListener(new OnClickListener() {
-			public void onClick(View v) {
-				if(getResources().getBoolean(R.bool.isTablet)) {
-					if (useEmail.isChecked()) {
-						createAccountWithEmail(getUsername(), passwordEdit.getText().toString(), emailEdit.getText().toString(), false);
-					}
-				} else {
-					if(getResources().getBoolean(R.bool.assistant_allow_username)){
-						createAccountWithPhoneNumber(getUsername(), "", getPhoneNumber(), false);
-					} else {
-						createAccountWithPhoneNumber(getPhoneNumber(), "", getPhoneNumber(), false);
-					}
-				}
-			}
-		});
-    	
+    	createAccount.setOnClickListener(this);
 
-
-		int phoneStatePermission = getActivity().getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getActivity().getPackageName());
-
-		if (phoneStatePermission == PackageManager.PERMISSION_GRANTED) {
-			TelephonyManager mTelephonyManager;
-			mTelephonyManager = (TelephonyManager) getActivity().getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
-			String yourNumber = mTelephonyManager.getLine1Number();
-			String iso = mTelephonyManager.getNetworkCountryIso();
-		}
-
-		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), getString(R.string.wizard_url));
-    	
 		return view;
 	}
 
-	private void updateApplyButton() {
-
+	@Override
+	public void onPause() {
+		super.onPause();
+		accountCreator.setListener(null);
 	}
 
-	@Override
-	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-		if(buttonView.getId() == R.id.use_username) {
-			if(isChecked) {
-				usernameLayout.setVisibility(View.VISIBLE);
-				if(usernameEdit.getText().length() > 0){
-				}
-			} else {
-				usernameLayout.setVisibility(View.GONE);
-				if(phoneNumberEdit.getText().length() > 0){
-				}
-			}
-		} else if(buttonView.getId() == R.id.use_email){
-			if(isChecked) {
-				emailLayout.setVisibility(View.VISIBLE);
-				usernameLayout.setVisibility(View.VISIBLE);
-				useUsername.setEnabled(false);
-			} else {
-				if(!useUsername.isChecked()) {
-					usernameLayout.setVisibility(View.GONE);
-				}
-				emailLayout.setVisibility(View.GONE);
-				usernameLayout.setVisibility(View.GONE);
-				useUsername.setEnabled(true);
-			}
+	private String getUsername() {
+		if(usernameEdit != null) {
+			String username = usernameEdit.getText().toString();
+			return username.toLowerCase(Locale.getDefault());
 		}
+		return null;
+	}
+
+	private String getCountryCode() {
+		if(dialCode != null) {
+			String code = dialCode.getText().toString();
+			if(code != null && code.startsWith("+")) {
+				code = code.substring(1);
+			}
+			return code;
+		}
+		return null;
 	}
 
 	public void setCountry(CountryListFragment.Country c) {
@@ -243,6 +233,43 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		if( c!= null) {
 			dialCode.setText(c.dial_code);
 			selectCountry.setText(c.name);
+		} else {
+			if(countryCode != -1){
+				dialCode.setText("+" + countryCode);
+			} else {
+				dialCode.setText("+");
+			}
+		}
+	}
+
+	@Override
+	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+		if(buttonView.getId() == R.id.use_username) {
+			if(isChecked) {
+				usernameLayout.setVisibility(View.VISIBLE);
+				if(getResources().getBoolean(R.bool.isTablet)){
+					passwordLayout.setVisibility(View.INVISIBLE);
+				}
+			} else {
+				usernameLayout.setVisibility(View.GONE);
+			}
+		} else if(buttonView.getId() == R.id.use_email){
+			if(isChecked) {
+				emailLayout.setVisibility(View.VISIBLE);
+				passwordLayout.setVisibility(View.VISIBLE);
+				passwordConfirmLayout.setVisibility(View.VISIBLE);
+				usernameLayout.setVisibility(View.VISIBLE);
+				useUsername.setEnabled(false);
+			} else {
+				if(!useUsername.isChecked()) {
+					usernameLayout.setVisibility(View.GONE);
+				}
+				emailLayout.setVisibility(View.GONE);
+				passwordLayout.setVisibility(View.GONE);
+				passwordConfirmLayout.setVisibility(View.GONE);
+				usernameLayout.setVisibility(View.GONE);
+				useUsername.setEnabled(true);
+			}
 		}
 	}
 
@@ -251,6 +278,24 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		switch (v.getId()){
 			case R.id.select_country: {
 				AssistantActivity.instance().displayCountryChooser();
+				break;
+			}
+
+			case R.id.info_phone_number: {
+				new AlertDialog.Builder(getActivity())
+					.setTitle(getString(R.string.phone_number_info_title))
+					.setMessage(getString(R.string.phone_number_info_content))
+						.show();
+				break;
+			}
+
+			case R.id.assistant_create: {
+				if(linkAccount){
+					addAlias();
+				} else {
+					createAccount();
+				}
+				break;
 			}
 		}
 	}
@@ -267,58 +312,6 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		}
 	}
 	
-	private boolean isUsernameCorrect(String username) {
-		if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_assistant)) {
-			LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig();
-			return lpc.isPhoneNumber(username);
-		} else {
-			return username.matches("^[a-z]+[a-z0-9.\\-_]{2,}$");
-		}
-	}
-	
-	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, LinphoneManager.getInstance().getContext().getString(R.string.wizard_server_unavailable));
-				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
-			}
-		};
-		
-		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("is_account_used", LinphoneXmlRpcRequest.ArgType.String);
-		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
-			@Override
-			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
-				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
-					String response = request.getStringResponse();
-					if(response.equals(XmlRpcHelper.SERVER_ERROR_ACCOUNT_DOESNT_EXIST)) {
-						mHandler.post(runOk);
-					} else {
-						mHandler.post(runNotOk);
-					}
-				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
-					mHandler.post(runNotReachable);
-				}
-			}
-		});
-		xmlRpcRequest.addStringArg(username);
-		xmlRpcSession.sendRequest(xmlRpcRequest);
-	}
-	
 	private boolean isEmailCorrect(String email) {
     	Pattern emailPattern = Patterns.EMAIL_ADDRESS;
     	return emailPattern.matcher(email).matches();
@@ -327,114 +320,50 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	private boolean isPasswordCorrect(String password) {
 		return password.length() >= 1;
 	}
-	
-	private void createAccountWithPhoneNumber(final String username, final String password, final String phone, 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().displayAssistantCodeConfirm(username, phone, false);
-			}
-		};
-		final Runnable runNotReachable = new Runnable() {
-			public void run() {
-				//TODO errorMessage.setText(R.string.wizard_not_reachable);
-			}
-		};
-		
-		LinphoneXmlRpcRequest xmlRpcRequest = new LinphoneXmlRpcRequestImpl("create_phone_account", LinphoneXmlRpcRequest.ArgType.String);
-		xmlRpcRequest.setListener(new LinphoneXmlRpcRequestListener() {
-			@Override
-			public void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request) {
-				if (request.getStatus() == LinphoneXmlRpcRequest.Status.Ok) {
-					String response = request.getStringResponse();
-					if (response.contains("ERROR")) {
-						mHandler.post(runNotOk);
-					} else {
-						mHandler.post(runOk);
-					}
-				} else if (request.getStatus() == LinphoneXmlRpcRequest.Status.Failed) {
-					mHandler.post(runNotReachable);
-				}
-			}
-		});
-		xmlRpcRequest.addStringArg(phone);
-		xmlRpcRequest.addStringArg("");
-		xmlRpcRequest.addStringArg("");
-		xmlRpcRequest.addStringArg(LinphoneManager.getInstance().getUserAgent());
-		xmlRpcRequest.addStringArg("");
-		xmlRpcSession.sendRequest(xmlRpcRequest);
+	private void addAlias() {
+		accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
+		String countryCode = dialCode.getText().toString();
+		if(countryCode != null && countryCode.startsWith("+")) {
+			countryCode = countryCode.substring(1);
+		}
+		Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), countryCode);
+		if(status.equals(Status.Ok)){
+			accountCreator.linkPhoneNumberWithAccount();
+		}
 	}
 
-	private void createAccountWithEmail(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_not_reachable);
-			}
-		};
-
-		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);
-					}
-				} 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 createAccount() {
+		if(accountCreator.getUsername() == null && !useUsername.isChecked()){
+			accountCreator.setUsername(accountCreator.getPhoneNumber());
+		}
+		accountCreator.createAccount();
 	}
 
 	private void addPhoneNumberHandler(final EditText field, final ImageView icon) {
 		field.addTextChangedListener(new TextWatcher() {
-			public void afterTextChanged(Editable s) {
+			public void afterTextChanged(Editable s) {}
+
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+			public void onTextChanged(CharSequence s, int start, int count, int after) {
 				if (s.length() > 0) {
 					phoneNumberOk = false;
-					String countryCode = dialCode.getText().toString();
-					if(countryCode != null && countryCode.startsWith("+")) {
-						countryCode = countryCode.substring(1);
-					}
-					Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), countryCode);
+					Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), getCountryCode());
+
 					if(status.equals(Status.Ok)){
 						accountCreator.isAccountUsed();
+						if(useUsername.isChecked()){
+							accountCreator.setUsername(field.getText().toString());
+						}
 					} else {
 						displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
+						sipUri.setText("");
 					}
 				} else {
 					displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, "");
 				}
 			}
-
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			public void onTextChanged(CharSequence s, int start, int count, int after) {
-			}
 		});
 	}
 	
@@ -457,10 +386,10 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 					usernameOk = false;
 					Status status = accountCreator.setUsername(field.getText().toString());
 					if(status.equals(Status.Ok)){
-						accountCreator.setPhoneNumber(null,null);
 						accountCreator.isAccountUsed();
 					} else {
 						displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
+						sipUri.setText("");
 					}
 				} else {
 					displayError(true, usernameError, usernameEdit, "");
@@ -469,50 +398,48 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		});
 	}
 	
-	private void addXMLRPCEmailHandler(final EditText field, final ImageView icon) {
+	private void addEmailHandler(final EditText field, final ImageView icon) {
 		field.addTextChangedListener(new TextWatcher() {
 			public void afterTextChanged(Editable s) {
-				
 			}
 
 			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-				
 			}
 
 			public void onTextChanged(CharSequence s, int start, int count, int after) 
 			{
 				emailOk = false;
-				if (isEmailCorrect(field.getText().toString())) {
+				Status status = accountCreator.setEmail(field.getText().toString());
+				if (status.equals(Status.Ok)) {
 					emailOk = true;
 					displayError(emailOk, emailError, emailEdit, "");
 				}
 				else {
-					displayError(emailOk, emailError, emailEdit, getString(R.string.wizard_email_incorrect));
+					displayError(emailOk, emailError, emailEdit, errorForStatus(status));
 				}
 				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
 			}
 		});
 	}
 	
-	private void addXMLRPCPasswordHandler(final EditText field1, final ImageView icon) {
+	private void addPasswordHandler(final EditText field1, final ImageView icon) {
 		TextWatcher passwordListener = new TextWatcher() {
 			public void afterTextChanged(Editable s) {
-				
 			}
 
 			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-				
 			}
 
 			public void onTextChanged(CharSequence s, int start, int count, int after) 
 			{
 				passwordOk = false;
+				Status status = accountCreator.setPassword(field1.getText().toString());
 				if (isPasswordCorrect(field1.getText().toString())) {
 					passwordOk = true;
 					displayError(passwordOk, passwordError, passwordEdit, "");
 				}
 				else {
-					displayError(passwordOk, passwordError, passwordEdit, getString(R.string.wizard_password_incorrect));
+					displayError(passwordOk, passwordError, passwordEdit, errorForStatus(status));
 				}
 				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
 			}
@@ -521,50 +448,37 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		field1.addTextChangedListener(passwordListener);
 	}
 	
-	private void addXMLRPCConfirmPasswordHandler(final EditText field1, final EditText field2, final ImageView icon) {
+	private void addConfirmPasswordHandler(final EditText field1, final EditText field2, final ImageView icon) {
 		TextWatcher passwordListener = new TextWatcher() {
 			public void afterTextChanged(Editable s) {
-				
 			}
 
 			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-				
 			}
 
 			public void onTextChanged(CharSequence s, int start, int count, int after) 
 			{
-				field2.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-					@Override
-					public void onFocusChange(View v, boolean hasFocus) {
-						if (!hasFocus) {
-							confirmPasswordOk = false;
-							if (field1.getText().toString().equals(field2.getText().toString())) {
-								confirmPasswordOk = true;
-
-								if (!isPasswordCorrect(field1.getText().toString())) {
-									displayError(passwordOk, passwordError, passwordEdit, getString(R.string.wizard_password_incorrect));
-								} else {
-									displayError(confirmPasswordOk, passwordConfirmError, passwordConfirmEdit, "");
-								}
-							} else {
-								displayError(confirmPasswordOk, passwordConfirmError, passwordConfirmEdit, getString(R.string.wizard_passwords_unmatched));
-							}
-							createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
-						} else {
-							displayError(true, passwordConfirmError, passwordConfirmEdit, "");
-						}
+				confirmPasswordOk = false;
+				if (field1.getText().toString().equals(field2.getText().toString())) {
+					confirmPasswordOk = true;
+					if (!isPasswordCorrect(field1.getText().toString())) {
+						displayError(passwordOk, passwordError, passwordEdit, getString(R.string.wizard_password_incorrect));
+					} else {
+						displayError(confirmPasswordOk, passwordConfirmError, passwordConfirmEdit, "");
 					}
-				});
+				} else {
+					displayError(confirmPasswordOk, passwordConfirmError, passwordConfirmEdit, getString(R.string.wizard_passwords_unmatched));
+				}
+				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
+
 
 			}
 		};
-		
 		field1.addTextChangedListener(passwordListener);
 		field2.addTextChangedListener(passwordListener);
 	}
 
 	String errorForStatus(Status status) {
-		boolean isPhoneNumber = (phoneNumberEdit.getText().length() > 0);
 		if (status.equals(Status.EmailInvalid))
 				return getString(R.string.invalid_email);
 		if (status.equals(Status.UsernameInvalid)){
@@ -616,23 +530,38 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, final Status status) {
+		if(getResources().getBoolean(R.bool.isTablet) || useEmail.isChecked()){
+			if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) {
+				usernameOk = false;
+				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
+				sipUri.setText("");
+			} else {
+				usernameOk = true;
+				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
+				sipUri.setText("Sip uri is sip:" + accountCreator.getUsername() + "@" + getResources().getString(R.string.default_domain));
+			}
+			createAccount.setEnabled(usernameOk && emailOk);
+		}
 		if(getResources().getBoolean(R.bool.assistant_allow_username) && useUsername.isChecked()){
 			if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) {
 				usernameOk = false;
 				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
+				sipUri.setText("");
 			} else {
 				usernameOk = true;
 				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
+				sipUri.setText("Sip uri is sip:" + accountCreator.getUsername() + "@" + getResources().getString(R.string.default_domain));
 			}
-			createAccount.setEnabled(usernameOk && phoneNumberOk);
+			createAccount.setEnabled(usernameOk);
 		} else {
 			if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) {
 				phoneNumberOk = false;
 				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
-				phoneNumberOk = true;
+				sipUri.setText("");
 			} else {
 				phoneNumberOk = true;
 				displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
+				sipUri.setText("Sip uri is sip:" + accountCreator.getPhoneNumber() + "@" + getResources().getString(R.string.default_domain));
 			}
 			createAccount.setEnabled(phoneNumberOk);
 		}
@@ -640,6 +569,15 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, Status status) {
+		if(status.equals(Status.AccountCreated)) {
+			if(useEmail.isChecked()){
+				AssistantActivity.instance().displayAssistantConfirm(getUsername(), passwordEdit.getText().toString());
+			} else {
+				AssistantActivity.instance().displayAssistantCodeConfirm(getUsername(), phoneNumberEdit.getText().toString(), getCountryCode(), false);
+			}
+		} else {
+			Toast.makeText(getActivity().getApplicationContext(), errorForStatus(status), Toast.LENGTH_SHORT);
+		}
 	}
 
 	@Override
@@ -648,10 +586,16 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, Status status) {
+		if(status.equals(Status.Ok)){
+			AssistantActivity.instance().displayAssistantCodeConfirm(getUsername(), phoneNumberEdit.getText().toString(), getCountryCode(), false);
+		}
 	}
 
 	@Override
 	public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, Status status) {
+		if(status.equals(Status.Ok)){
+			AssistantActivity.instance().displayAssistantCodeConfirm(getUsername(), phoneNumberEdit.getText().toString(), getCountryCode(), false);
+		}
 	}
 
 	@Override
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index 898409c9b..bc20239c0 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -27,6 +27,7 @@ import org.linphone.mediastream.Log;
 
 import android.app.Fragment;
 import android.os.Bundle;
+import android.telephony.TelephonyManager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.text.method.LinkMovementMethod;
@@ -46,18 +47,15 @@ import android.widget.Toast;
  * @author Sylvain Berfini
  */
 public class LinphoneLoginFragment extends Fragment implements CompoundButton.OnCheckedChangeListener, OnClickListener, TextWatcher, LinphoneAccountCreator.LinphoneAccountCreatorListener {
-	private EditText login, password, displayName;
-	private Button apply;
+	private EditText login, password, phoneNumberEdit, dialCode, displayName;
+	private Button apply, selectCountry;
 	private CheckBox useUsername, usePassword;
 	private LinearLayout phoneNumberLayout, usernameLayout, passwordLayout;
 	private TextView forgotPassword;
-	private EditText phoneNumberEdit, usernameEdit, passwordEdit, passwordConfirmEdit, emailEdit, dialCode;
-	private TextView phoneNumberError, usernameError, passwordError, passwordConfirmError, emailError, sipUri;
 	private CountryListFragment.Country country;
-	private Boolean recoverAccount = true;
-
+	private Boolean recoverAccount = false;
 	private LinphoneAccountCreator accountCreator;
-
+	private int countryCode;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -78,20 +76,55 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 		phoneNumberLayout = (LinearLayout) view.findViewById(R.id.phone_number_layout);
 		addPhoneNumberHandler(phoneNumberEdit, null);
 
-		if(getResources().getBoolean(R.bool.assistant_allow_username)) {
-			useUsername = (CheckBox) view.findViewById(R.id.use_username);
-			useUsername.setVisibility(View.VISIBLE);
-			useUsername.setOnCheckedChangeListener(this);
+		useUsername = (CheckBox) view.findViewById(R.id.use_username);
+		usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
+		passwordLayout = (LinearLayout) view.findViewById(R.id.password_layout);
+		password = (EditText) view.findViewById(R.id.assistant_password);
+		displayName = (EditText) view.findViewById(R.id.assistant_display_name);
 
-			usernameLayout = (LinearLayout) view.findViewById(R.id.username_layout);
+		forgotPassword = (TextView) view.findViewById(R.id.forgot_password);
+		selectCountry = (Button) view.findViewById(R.id.select_country);
+
+		//Phone number
+		if(getResources().getBoolean(R.bool.use_phone_number_validation)){
+			//Automatically get the country code from the phone
+			TelephonyManager tm = (TelephonyManager) getActivity().getApplicationContext().getSystemService(getActivity().getApplicationContext().TELEPHONY_SERVICE);
+			String countryIso = tm.getNetworkCountryIso();
+			LinphoneProxyConfig proxyConfig = LinphoneManager.getLc().createProxyConfig();
+			countryCode = proxyConfig.lookupCCCFromIso(countryIso.toUpperCase());
+
+			phoneNumberLayout.setVisibility(View.VISIBLE);
+			selectCountry.setOnClickListener(this);
+
+			String previousPhone = AssistantActivity.instance().phone_number;
+			if(previousPhone != null ){
+				phoneNumberEdit.setText(previousPhone);
+			}
+			setCountry(AssistantActivity.instance().country);
+
+			//Allow user to enter a username instead use the phone number as username
+			if(getResources().getBoolean(R.bool.assistant_allow_username) ) {
+				useUsername.setVisibility(View.VISIBLE);
+				useUsername.setOnCheckedChangeListener(this);
+			}
 		}
 
-		password = (EditText) view.findViewById(R.id.assistant_password);
-		password.addTextChangedListener(this);
-		forgotPassword = (TextView) view.findViewById(R.id.forgot_password);
-		forgotPassword.setText(Compatibility.fromHtml("<a href=\"" + url + "\"'>"+ getString(R.string.forgot_password) + "</a>"));
-		forgotPassword.setMovementMethod(LinkMovementMethod.getInstance());
-		displayName = (EditText) view.findViewById(R.id.assistant_display_name);
+		if(getResources().getBoolean(R.bool.assistant_allow_username)) {
+			useUsername.setVisibility(View.VISIBLE);
+			useUsername.setOnCheckedChangeListener(this);
+			password.addTextChangedListener(this);
+			forgotPassword.setText(Compatibility.fromHtml("<a href=\"" + url + "\"'>" + getString(R.string.forgot_password) + "</a>"));
+			forgotPassword.setMovementMethod(LinkMovementMethod.getInstance());
+		}
+
+		//Hide phone number and display username/email/password
+		if(!getResources().getBoolean(R.bool.use_phone_number_validation)){
+			phoneNumberLayout.setVisibility(View.GONE);
+			useUsername.setVisibility(View.GONE);
+
+			usernameLayout.setVisibility(View.VISIBLE);
+			passwordLayout.setVisibility(View.VISIBLE);
+		}
 
 		apply = (Button) view.findViewById(R.id.assistant_apply);
 		apply.setEnabled(false);
@@ -100,6 +133,31 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 		return view;
 	}
 
+	private String getCountryCode() {
+		if(dialCode != null) {
+			String code = dialCode.getText().toString();
+			if(code != null && code.startsWith("+")) {
+				code = code.substring(1);
+			}
+			return code;
+		}
+		return null;
+	}
+
+	public void setCountry(CountryListFragment.Country c) {
+		country = c;
+		if( c!= null) {
+			dialCode.setText(c.dial_code);
+			selectCountry.setText(c.name);
+		} else {
+			if(countryCode != -1){
+				dialCode.setText("+" + countryCode);
+			} else {
+				dialCode.setText("+");
+			}
+		}
+	}
+
 	private String getPhoneNumber(){
 		LinphoneProxyConfig proxyConfig = LinphoneManager.getLc().createProxyConfig();
 		String countryCode = dialCode.getText().toString();
@@ -116,8 +174,7 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 			Toast.makeText(getActivity(), getString(R.string.first_launch_no_login_password), Toast.LENGTH_LONG).show();
 			return;
 		}
-		
-		AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), null, displayName.getText().toString(), getResources().getBoolean(R.bool.assistant_account_validation_mandatory));
+		AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), null, null, getResources().getBoolean(R.bool.assistant_account_validation_mandatory));
 	}
 
 	private void addPhoneNumberHandler(final EditText field, final ImageView icon) {
@@ -130,12 +187,10 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 						countryCode = countryCode.substring(1);
 					}
 					LinphoneAccountCreator.Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), countryCode);
-					Log.w("Set PhoneNmuber " + status.toString());
 					if (status.equals(LinphoneAccountCreator.Status.Ok)) {
 						status = accountCreator.isAccountUsed();
-						Log.w("Is account activated " + status.toString());
 						if (status.equals(LinphoneAccountCreator.Status.Ok)) {
-
+							recoverAccount = true;
 						}
 					} else {
 						//displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
@@ -164,10 +219,14 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 				linphoneLogIn();
 			}
 		}
+		if (id == R.id.select_country) {
+			AssistantActivity.instance().displayCountryChooser();
+		}
 	}
 
 	private void recoverAccount() {
-		accountCreator.recoverPhoneAccount();
+		//accountCreator.recoverPhoneAccount();
+		AssistantActivity.instance().displayAssistantCodeConfirm(accountCreator.getUsername(), phoneNumberEdit.getText().toString(), getCountryCode(), true);
 	}
 
 	@Override
@@ -183,12 +242,20 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-
+		if(buttonView.getId() == R.id.use_username) {
+			if(isChecked) {
+				usernameLayout.setVisibility(View.VISIBLE);
+				passwordLayout.setVisibility(View.VISIBLE);
+				recoverAccount = false;
+			} else {
+				usernameLayout.setVisibility(View.GONE);
+				passwordLayout.setVisibility(View.INVISIBLE);
+			}
+		}
 	}
 
 	@Override
 	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
-		recoverAccount = true;
 		apply.setEnabled(true);
 	}
 
@@ -214,13 +281,11 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
-		Log.w("IS ACTIVATED " + status.toString());
 		apply.setEnabled(true);
 	}
 
 	@Override
 	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
-		AssistantActivity.instance().displayAssistantCodeConfirm(getPhoneNumber(), getPhoneNumber(), true);
-
+		AssistantActivity.instance().displayAssistantCodeConfirm(accountCreator.getUsername(), phoneNumberEdit.getText().toString(), getCountryCode(), true);
 	}
 }

From 329d71627305671eeb4841d0d34c34e86ba95e58 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 2 Sep 2016 17:25:38 +0200
Subject: [PATCH 19/36] Fix subscription to friendlist

---
 src/org/linphone/LinphoneActivity.java | 12 ++++++++----
 src/org/linphone/LinphoneManager.java  |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index fca8471cc..a550e0085 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1113,7 +1113,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	protected void onPause() {
 		getIntent().putExtra("PreviousActivity", 0);
 
-		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled() && LinphoneManager.getLc().getDefaultProxyConfig() != null){
+		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled()){
 			LinphoneManager.getInstance().subscribeFriendList(!isApplicationBroughtToBackground(this));
 		}
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
@@ -1337,8 +1337,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 
 		updateMissedChatCount();
-		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled()){
+		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled() && LinphoneManager.getLc().getDefaultProxyConfig() != null){
 			LinphoneManager.getInstance().subscribeFriendList(true);
+		} else {
+			LinphoneManager.getInstance().subscribeFriendList(false);
 		}
 
 		displayMissedCalls(LinphoneManager.getLc().getMissedCallsCount());
@@ -1549,6 +1551,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			status.setVisibility(View.GONE);
 			address.setText("");
 			statusFragment.resetAccountStatus();
+			LinphoneManager.getInstance().subscribeFriendList(false);
 
 			defaultAccount.setOnClickListener(new OnClickListener() {
 				@Override
@@ -1672,6 +1675,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			accountCreator.setListener(this);
 			accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
 			accountCreator.isAccountUsed();
+		} else {
+			LinphonePreferences.instance().setInappPopupTime(null);
 		}
 	}
 
@@ -1754,8 +1759,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private void askLinkWithPhoneNumber(){
 		long now = Calendar.getInstance().getTimeInMillis();
 		long newDate = now + (getResources().getInteger(R.integer.popup_time_interval)*60);
-		Log.w(LinphonePreferences.instance().getLinkPopupTime());
-		Log.w(now);
 		if (LinphonePreferences.instance().getLinkPopupTime() != null &&  Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) > now) {
 			return;
 		} else {
@@ -1765,6 +1768,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		Button delete = (Button) dialog.findViewById(R.id.delete_button);
 		delete.setText(getResources().getString(R.string.link));
 		Button cancel = (Button) dialog.findViewById(R.id.cancel);
+		cancel.setText(getResources().getString(R.string.maybe_later));
 
 		delete.setOnClickListener(new OnClickListener() {
 			@Override
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 277c5e03f..a09ad9bda 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -994,6 +994,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 	public void registrationState(final LinphoneCore lc, final LinphoneProxyConfig proxy,final RegistrationState state,final String message) {
 		Log.i("New registration state ["+state+"]");
+		if(LinphoneManager.getLc().getDefaultProxyConfig() == null){
+			subscribeFriendList(false);
+		}
 	}
 
 	private int savedMaxCallWhileGsmIncall;

From adfa788a73d2c53c55d509f44fb7a47b185b4794 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 2 Sep 2016 17:26:09 +0200
Subject: [PATCH 20/36] Fix country code chooser

---
 res/layout/assistant_linphone_login.xml       |  6 +++--
 res/values/strings.xml                        |  2 ++
 .../linphone/assistant/AssistantActivity.java | 14 +++++++----
 .../CreateAccountCodeActivationFragment.java  | 23 ++++++++++---------
 .../assistant/LinphoneLoginFragment.java      |  3 +--
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml
index 3a130a6f4..2a17a5605 100644
--- a/res/layout/assistant_linphone_login.xml
+++ b/res/layout/assistant_linphone_login.xml
@@ -73,9 +73,11 @@
 							android:background="@drawable/resizable_textfield"
 							android:textColor="@color/colorB"
 							android:inputType="phone"
+							android:text="+"
 							android:layout_marginRight="10dp"
-							android:layout_width="50dp"
-							android:layout_height="40dp"
+							android:gravity="center"
+							android:layout_width="65dp"
+							android:layout_height="42dp"
 							android:singleLine="true"/>
 
 						<EditText
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1088d136d..a5330910c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,6 +51,7 @@
 	<string name="conference">Conference</string>
 	<string name="link">Link</string>
 	<string name="link_account_popup">Do you want to link the account %s with your phone number ?</string>
+	<string name="maybe_later">Maybe later</string>
 
 	<!-- Launch screen -->
 	<string name="app_description">the <i>libre</i> SIP client</string>
@@ -84,6 +85,7 @@
 	<string name="assistant_ec_calibration">Echo canceler calibration in progress</string>
 	<string name="assistant_remote_provisioning_login">Enter your login</string>
 	<string name="assistant_account_not_validated">Your account has not been validated yet.</string>
+	<string name="assistant_error_confirmation_code"></string>
 	<string name="assistant_account_validated">Your account has been validated.</string>
 	<string name="assistant_error_bad_credentials">Incorrect username or password</string>
 	<string name="assistant_codec_down_question">Do you agree to download OpenH264 Video Codec provided by Cisco Systems, Inc.?</string>
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index ed0bb2079..e11c3726e 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -69,6 +69,7 @@ public class AssistantActivity extends Activity implements OnClickListener, Acti
 private static AssistantActivity instance;
 	private ImageView back, cancel;
 	private AssistantFragmentsEnum currentFragment;
+	private AssistantFragmentsEnum lastFragment;
 	private AssistantFragmentsEnum firstFragment;
 	private Fragment fragment;
 	private LinphonePreferences mPrefs;
@@ -234,14 +235,15 @@ private static AssistantActivity instance;
 				|| currentFragment == AssistantFragmentsEnum.LINPHONE_LOGIN
 				|| currentFragment == AssistantFragmentsEnum.CREATE_ACCOUNT
 				|| currentFragment == AssistantFragmentsEnum.REMOTE_PROVISIONING) {
-			WelcomeFragment fragment = new WelcomeFragment();
-			changeFragment(fragment);
-			currentFragment = AssistantFragmentsEnum.WELCOME;
-			back.setVisibility(View.INVISIBLE);
+			displayMenu();
 		} else if (currentFragment == AssistantFragmentsEnum.WELCOME) {
 			finish();
 		} else if (currentFragment == AssistantFragmentsEnum.COUNTRY_CHOOSER){
-			displayCreateAccount();
+			if(lastFragment.equals(AssistantFragmentsEnum.LINPHONE_LOGIN)){
+				displayLoginLinphone();
+			} else {
+				displayCreateAccount();
+			}
 		}
 	}
 
@@ -344,6 +346,7 @@ private static AssistantActivity instance;
 	public void displayMenu() {
 		fragment = new WelcomeFragment();
 		changeFragment(fragment);
+		country = null;
 		currentFragment = AssistantFragmentsEnum.WELCOME;
 		back.setVisibility(View.INVISIBLE);
 	}
@@ -382,6 +385,7 @@ private static AssistantActivity instance;
 	public void displayCountryChooser() {
 		fragment = new CountryListFragment();
 		changeFragment(fragment);
+		lastFragment = currentFragment;
 		currentFragment = AssistantFragmentsEnum.COUNTRY_CHOOSER;
 		back.setVisibility(View.VISIBLE);
 	}
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index 4c0c00de9..f947f31aa 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -22,7 +22,6 @@ import android.app.Fragment;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
-import org.linphone.mediastream.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -35,6 +34,7 @@ import org.linphone.LinphoneManager;
 import org.linphone.LinphonePreferences;
 import org.linphone.R;
 import org.linphone.core.LinphoneAccountCreator;
+import org.linphone.mediastream.Log;
 import org.linphone.core.LinphoneAccountCreatorImpl;
 
 
@@ -126,20 +126,21 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 
 	@Override
 	public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
-		if(status.equals(Status.AccountActivated)){
+		if (status.equals(Status.AccountActivated)) {
 			checkAccount.setEnabled(true);
-			if(accountCreator.getUsername() != null){
-				AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null , null, accountCreator.getHa1() , getString(R.string.default_domain), null);
-				AssistantActivity.instance().isAccountVerified(accountCreator.getUsername());
+			if (accountCreator.getUsername() != null) {
+				AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null);
+				if(!recoverAccount)
+					AssistantActivity.instance().isAccountVerified(accountCreator.getUsername());
 			} else {
-				AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null , null, accountCreator.getHa1() , getString(R.string.default_domain), null);
-				AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber());
+				AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null);
+				if(!recoverAccount)
+					AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber());
 			}
-
-		} else if (status.equals(LinphoneAccountCreator.Status.Failed)){
+		} else if (status.equals(LinphoneAccountCreator.Status.Failed)) {
 			Toast.makeText(getActivity(), getString(R.string.wizard_server_unavailable), Toast.LENGTH_LONG).show();
-		} else {
-			Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show();
+		}else {
+			Toast.makeText(getActivity(), getString(R.string.assistant_error_confirmation_code), Toast.LENGTH_LONG).show();
 		}
 	}
 
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index bc20239c0..9423a0523 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -225,8 +225,7 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 	}
 
 	private void recoverAccount() {
-		//accountCreator.recoverPhoneAccount();
-		AssistantActivity.instance().displayAssistantCodeConfirm(accountCreator.getUsername(), phoneNumberEdit.getText().toString(), getCountryCode(), true);
+		accountCreator.recoverPhoneAccount();
 	}
 
 	@Override

From cc091eb746170118a3663d9b8b96a3a47aa68c28 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 2 Sep 2016 17:31:47 +0200
Subject: [PATCH 21/36] Finish activity

---
 .../assistant/CreateAccountCodeActivationFragment.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index f947f31aa..83d23e872 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -130,12 +130,18 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 			checkAccount.setEnabled(true);
 			if (accountCreator.getUsername() != null) {
 				AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null);
-				if(!recoverAccount)
+				if(!recoverAccount){
 					AssistantActivity.instance().isAccountVerified(accountCreator.getUsername());
+				} else {
+					AssistantActivity.instance().finish();
+				}
 			} else {
 				AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null);
-				if(!recoverAccount)
+				if(!recoverAccount) {
 					AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber());
+				} else {
+					AssistantActivity.instance().finish();
+				}
 			}
 		} else if (status.equals(LinphoneAccountCreator.Status.Failed)) {
 			Toast.makeText(getActivity(), getString(R.string.wizard_server_unavailable), Toast.LENGTH_LONG).show();

From 919d36c3f4f6ffece9e00942503ac509f1d27582 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 6 Sep 2016 17:26:01 +0200
Subject: [PATCH 22/36] Fix link account and fix some bugs in the assistant

---
 res/layout/dialer.xml                         |  1 -
 res/raw/linphonerc_factory                    |  1 +
 res/values/non_localizable_custom.xml         |  1 -
 res/values/strings.xml                        |  2 +-
 src/org/linphone/LinphoneActivity.java        | 27 ++++----
 src/org/linphone/LinphonePreferences.java     |  8 +++
 .../linphone/assistant/AssistantActivity.java | 61 ++++++++++++++++++-
 .../CreateAccountActivationFragment.java      |  3 +-
 .../CreateAccountCodeActivationFragment.java  |  4 +-
 .../assistant/CreateAccountFragment.java      |  9 ++-
 .../EchoCancellerCalibrationFragment.java     |  3 +-
 .../assistant/LinphoneLoginFragment.java      |  3 +-
 12 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index e82be91b9..015a512ac 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -9,7 +9,6 @@
 		android:background="@color/colorF"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
-		android:layout_marginBottom="10dp"
 		android:layout_alignParentTop="true">
 
 		<org.linphone.ui.EraseButton
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 63bc3f753..28f765950 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -49,3 +49,4 @@ username_length=-1
 username_max_length=64
 username_min_length=1
 username_regex=^[a-z0-9_.\-]*$
+xmlrpc_url=https://sip3.linphone.org:444/inapp.php
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index a3cb87fc9..b6cfed34a 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -15,7 +15,6 @@
 	<integer name="popup_time_interval">86400</integer><!-- Time between two inapp notifications in seconds -->
 
 	<!-- Assistant -->
-	<string name="wizard_url">https://sip3.linphone.org:444/wizard.php</string><!-- Url of the xmlrpc script -->
 	<bool name="assistant_allow_username">true</bool> <!-- Allow to use an username instead of the phone number for account creation -->
 	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool><!-- Start assistant in loginFragment view instead of menu -->
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a5330910c..1f6cd6dd7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,6 +52,7 @@
 	<string name="link">Link</string>
 	<string name="link_account_popup">Do you want to link the account %s with your phone number ?</string>
 	<string name="maybe_later">Maybe later</string>
+	<string name="link_account">Link account</string>
 
 	<!-- Launch screen -->
 	<string name="app_description">the <i>libre</i> SIP client</string>
@@ -60,7 +61,6 @@
 	<string name="welcome">Welcome</string>
 	<string name="assistant">Assistant</string>
 	<string name="assistant_create_account">Create account</string>
-	<string name="assistant_link_account">Link account</string>
 	<string name="assistant_continue">Continue</string>
 	<string name="assistant_activate">Activate account</string>
 	<string name="assistant_finish">Finish configuration</string>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index a05bb8b50..6fdf0dbcc 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -133,12 +133,12 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private LinearLayout mTabBar;
 
 	private DrawerLayout sideMenu;
-	private String[] sideMenuItems;
 	private RelativeLayout sideMenuContent, quitLayout, defaultAccount;
 	private ListView accountsList, sideMenuItemList;
 	private ImageView menu;
 	private boolean fetchedContactsOnce = false;
 	private boolean doNotGoToCallActivity = false;
+	private List<String> sideMenuItems;
 
 	static final boolean isInstanciated() {
 		return instance != null;
@@ -235,6 +235,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 				refreshAccounts();
 
+				if(state.equals(RegistrationState.RegistrationOk) && LinphonePreferences.instance().getLinkPopupTime() != ""){
+					if(getResources().getBoolean(R.bool.use_phone_number_validation)) {
+						if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null && !LinphonePreferences.instance().getLinkPopupTime().equals(""))){
+							isAccountWithAlias();
+						}
+					}
+				}
+
 				if(state.equals(RegistrationState.RegistrationFailed) && newProxyConfig) {
 					newProxyConfig = false;
 					if (proxy.getError() == Reason.BadCredentials) {
@@ -1346,12 +1354,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			isTrialAccount();
 		}
 
-		if(getResources().getBoolean(R.bool.use_phone_number_validation)) {
-			if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null && !LinphonePreferences.instance().getLinkPopupTime().equals(""))){
-				isAccountWithAlias();
-			}
-		}
-
 		updateMissedChatCount();
 		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled() && LinphoneManager.getLc().getDefaultProxyConfig() != null){
 			LinphoneManager.getInstance().subscribeFriendList(true);
@@ -1481,13 +1483,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	public void initSideMenu() {
-
 		sideMenu = (DrawerLayout) findViewById(R.id.side_menu);
+		sideMenuItems = new ArrayList<String>();
+		sideMenuItems.add(getResources().getString(R.string.menu_assistant));
+		sideMenuItems.add(getResources().getString(R.string.menu_settings));
 		if(getResources().getBoolean(R.bool.enable_in_app_purchase)){
-			sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.inapp), getResources().getString(R.string.menu_about)};
-		} else {
-			sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about)};
+			sideMenuItems.add(getResources().getString(R.string.inapp));
 		}
+		sideMenuItems.add(getResources().getString(R.string.menu_about));
 		sideMenuContent = (RelativeLayout) findViewById(R.id.side_menu_content);
 		sideMenuItemList = (ListView)findViewById(R.id.item_list);
 		menu = (ImageView) findViewById(R.id.side_menu_button);
@@ -1686,7 +1689,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private void isAccountWithAlias(){
 		if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
 			LinphoneAccountCreator accountCreator;
-			accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+			accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl());
 			accountCreator.setDomain(getResources().getString(R.string.default_domain));
 			accountCreator.setListener(this);
 			accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 99ff6cd56..8db511e99 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -1350,6 +1350,14 @@ public class LinphonePreferences {
 		return purchasables;
 	}
 
+	public String getXmlrpcUrl(){
+		return getConfig().getString("assistant", "xmlrpc_url", null);
+	}
+
+	public void setXmlrpcUrl(String url){
+		getConfig().setString("assistant", "xmlrpc_url", url);
+	}
+
 	public String getInappPopupTime(){
 		return getConfig().getString("app", "inapp_popup_time", null);
 	}
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index e11c3726e..853d67883 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -25,6 +25,8 @@ import org.linphone.LinphoneUtils;
 import org.linphone.LinphonePreferences.AccountBuilder;
 import org.linphone.R;
 import org.linphone.StatusFragment;
+import org.linphone.core.LinphoneAccountCreator;
+import org.linphone.core.LinphoneAccountCreatorImpl;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneAddress.TransportType;
 import org.linphone.core.LinphoneCore;
@@ -65,7 +67,7 @@ import android.widget.Toast;
 /**
  * @author Sylvain Berfini
  */
-public class AssistantActivity extends Activity implements OnClickListener, ActivityCompat.OnRequestPermissionsResultCallback {
+public class AssistantActivity extends Activity implements OnClickListener, ActivityCompat.OnRequestPermissionsResultCallback, LinphoneAccountCreator.LinphoneAccountCreatorListener {
 private static AssistantActivity instance;
 	private ImageView back, cancel;
 	private AssistantFragmentsEnum currentFragment;
@@ -82,6 +84,7 @@ private static AssistantActivity instance;
 	private boolean remoteProvisioningInProgress;
 	private boolean echoCancellerAlreadyDone;
 	private static final int PERMISSIONS_REQUEST_RECORD_AUDIO = 201;
+	private LinphoneAccountCreator accountCreator;
 
 	public CountryListFragment.Country country;
 	public String phone_number;
@@ -118,6 +121,10 @@ private static AssistantActivity instance;
 		}
         mPrefs = LinphonePreferences.instance();
 		status.enableSideMenu(false);
+
+		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl());
+		accountCreator.setDomain(getResources().getString(R.string.default_domain));
+		accountCreator.setListener(this);
         
         mListener = new LinphoneCoreListenerBase() {
         	@Override
@@ -133,7 +140,7 @@ private static AssistantActivity instance;
 						if (state == RegistrationState.RegistrationOk) {
 							if (progress != null) progress.dismiss();
 							if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
-								success();
+								accountCreator.isAccountUsed();
 							}
 						} else if (state == RegistrationState.RegistrationFailed) {
 							if (progress != null) progress.dismiss();
@@ -222,6 +229,9 @@ private static AssistantActivity instance;
 
 	@Override
 	public void onBackPressed() {
+		if(isLink){
+			return;
+		}
 		if (currentFragment == firstFragment) {
 			LinphonePreferences.instance().firstLaunchSuccessful();
 			if (getResources().getBoolean(R.bool.assistant_cancel_move_to_back)) {
@@ -435,6 +445,8 @@ private static AssistantActivity instance;
 			address.setDisplayName(displayName);
 		}
 
+
+
 		boolean isMainAccountLinphoneDotOrg = domain.equals(getString(R.string.default_domain));
 		AccountBuilder builder = new AccountBuilder(LinphoneManager.getLc())
 		.setUsername(username)
@@ -466,6 +478,10 @@ private static AssistantActivity instance;
 			
 			mPrefs.setStunServer(getString(R.string.default_stun));
 			mPrefs.setIceEnabled(true);
+
+			accountCreator.setPassword(password);
+			accountCreator.setHa1(ha1);
+			accountCreator.setUsername(username);
 		} else {
 			String forcedProxy = "";
 			if (!TextUtils.isEmpty(forcedProxy)) {
@@ -610,4 +626,45 @@ private static AssistantActivity instance;
 			status.setLinphoneCoreListener();
 		}
 	}
+
+	@Override
+	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if(status.equals(LinphoneAccountCreator.Status.AccountExistWithAlias)){
+			success();
+		} else {
+			isLink = true;
+			displayCreateAccount();
+		}
+
+	}
+
+	@Override
+	public void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
+
+	@Override
+	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+
+	}
 }
diff --git a/src/org/linphone/assistant/CreateAccountActivationFragment.java b/src/org/linphone/assistant/CreateAccountActivationFragment.java
index 102e99211..db3c732fe 100644
--- a/src/org/linphone/assistant/CreateAccountActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountActivationFragment.java
@@ -18,6 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 import org.linphone.LinphoneManager;
+import org.linphone.LinphonePreferences;
 import org.linphone.R;
 import org.linphone.core.LinphoneXmlRpcRequest;
 import org.linphone.core.LinphoneXmlRpcRequest.LinphoneXmlRpcRequestListener;
@@ -81,7 +82,7 @@ public class CreateAccountActivationFragment extends Fragment implements Linphon
 			}
 		};
 		
-		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), getString(R.string.wizard_url));
+		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), LinphonePreferences.instance().getXmlrpcUrl());
 		xmlRpcRequest = new LinphoneXmlRpcRequestImpl("check_account_validated", LinphoneXmlRpcRequest.ArgType.Int);
 		xmlRpcRequest.setListener(this);
 		
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index 83d23e872..db3d3e8b1 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -60,7 +60,7 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 		linkAccount = getArguments().getBoolean("LinkAccount");
 
 		code_length = LinphonePreferences.instance().getCodeLength();
-		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl());
 		accountCreator.setDomain(getResources().getString(R.string.default_domain));
 		accountCreator.setListener(this);
 		accountCreator.setUsername(username);
@@ -160,7 +160,7 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 		if(status.equals(LinphoneAccountCreator.Status.Ok)){
 			LinphonePreferences.instance().setLinkPopupTime("");
 			AssistantActivity.instance().hideKeyboard();
-			AssistantActivity.instance().finish();
+			AssistantActivity.instance().success();
 		}
 	}
 
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index 9f2bdefec..a2dabaf75 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -28,7 +28,6 @@ import org.linphone.R;
 import org.linphone.core.LinphoneAccountCreator;
 import org.linphone.core.LinphoneAccountCreatorImpl;
 import org.linphone.core.LinphoneProxyConfig;
-import org.linphone.mediastream.Log;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -81,7 +80,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		View view = inflater.inflate(R.layout.assistant_account_creation, container, false);
 
 		//Initialize accountCreator
-		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl());
 		accountCreator.setDomain(getResources().getString(R.string.default_domain));
 		accountCreator.setListener(this);
 
@@ -192,8 +191,8 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			passwordConfirmLayout.setVisibility(View.GONE);
 			emailLayout.setVisibility(View.GONE);
 
-			createAccount.setText(getResources().getString(R.string.assistant_link_account));
-			assisstantTitle.setText(getResources().getString(R.string.assistant_link_account));
+			createAccount.setText(getResources().getString(R.string.link_account));
+			assisstantTitle.setText(getResources().getString(R.string.link_account));
 		}
 		addUsernameHandler(usernameEdit, null);
 
@@ -570,7 +569,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	@Override
 	public void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, Status status) {
 		if(status.equals(Status.AccountCreated)) {
-			if(useEmail.isChecked()){
+			if(useEmail.isChecked() || !getResources().getBoolean(R.bool.use_phone_number_validation)){
 				AssistantActivity.instance().displayAssistantConfirm(getUsername(), passwordEdit.getText().toString());
 			} else {
 				AssistantActivity.instance().displayAssistantCodeConfirm(getUsername(), phoneNumberEdit.getText().toString(), getCountryCode(), false);
diff --git a/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java b/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
index c7f2016ac..7bcbbbb7e 100644
--- a/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
+++ b/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 import org.linphone.LinphoneManager;
+import org.linphone.LinphonePreferences;
 import org.linphone.R;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
@@ -73,7 +74,7 @@ public class EchoCancellerCalibrationFragment extends Fragment implements Linpho
 			}
 		};
 		
-		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), getString(R.string.wizard_url));
+		xmlRpcSession = new LinphoneXmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), LinphonePreferences.instance().getXmlrpcUrl());
 		xmlRpcRequest = new LinphoneXmlRpcRequestImpl("add_ec_calibration_result", LinphoneXmlRpcRequest.ArgType.None);
 		xmlRpcRequest.setListener(this);
 
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index 9423a0523..44aab5560 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -18,6 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 import org.linphone.LinphoneManager;
+import org.linphone.LinphonePreferences;
 import org.linphone.R;
 import org.linphone.compatibility.Compatibility;
 import org.linphone.core.LinphoneAccountCreator;
@@ -62,7 +63,7 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 			Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.assistant_linphone_login, container, false);
 
-		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), getResources().getString(R.string.wizard_url));
+		accountCreator = new LinphoneAccountCreatorImpl(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl());
 		accountCreator.setListener(this);
 
 		String url = "http://linphone.org/free-sip-service.html&action=recover";

From f5a9be9432e798ab34fcaf23081133943a6a6062 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 7 Sep 2016 18:22:52 +0200
Subject: [PATCH 23/36] Add new strings and fix issues

---
 res/layout/assistant_account_creation.xml     | 16 ++++++-
 ...stant_account_creation_code_activation.xml |  9 ----
 res/layout/assistant_linphone_login.xml       |  3 +-
 res/raw/linphonerc_factory                    |  2 +-
 res/values/strings.xml                        | 18 ++++----
 .../assistant/CreateAccountFragment.java      | 42 ++++++++++++++-----
 6 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index fa2d37c04..6655308d3 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -22,7 +22,7 @@
 			android:text="@string/assistant_create_account_part_1"
 			style="@style/font11"
 			android:paddingTop="10dp"
-			android:layout_gravity="center_horizontal"
+			android:gravity="center_horizontal"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"/>
 
@@ -300,7 +300,7 @@
 
 			<Button
 				android:id="@+id/assistant_create"
-				android:text="@string/assistant_continue"
+				android:text="@string/assistant_create_account"
 				android:background="@drawable/assistant_button"
 				android:textColor="@drawable/assistant_button_text_color"
 				style="@style/font8"
@@ -310,6 +310,18 @@
 				android:paddingRight="10dp"
 				android:layout_marginTop="20dp"/>
 
+			<TextView
+				android:id="@+id/assistant_skip"
+				android:visibility="gone"
+				android:text="@string/maybe_later"
+				android:textColor="@drawable/assistant_button_text_color"
+				style="@style/font10"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingLeft="10dp"
+				android:paddingRight="10dp"
+				android:layout_marginTop="20dp"/>
+
 		</LinearLayout>
 	</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/assistant_account_creation_code_activation.xml b/res/layout/assistant_account_creation_code_activation.xml
index 47a8a13f1..4c5900b60 100644
--- a/res/layout/assistant_account_creation_code_activation.xml
+++ b/res/layout/assistant_account_creation_code_activation.xml
@@ -24,15 +24,6 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"/>
 
-		<TextView
-			android:text="@string/assistant_validate_code"
-			style="@style/font11"
-			android:paddingTop="10dp"
-			android:gravity="center"
-			android:layout_gravity="center"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
-
 		<EditText
 			android:id="@+id/assistant_code"
 			android:background="@drawable/resizable_textfield"
diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml
index 2a17a5605..5abe5acf4 100644
--- a/res/layout/assistant_linphone_login.xml
+++ b/res/layout/assistant_linphone_login.xml
@@ -19,7 +19,7 @@
 			android:layout_gravity="center"/>
 
 		<TextView
-			android:text="@string/assistant_linphone_login_desc"
+			android:text="@string/assistant_create_account_part_1"
 			style="@style/font11"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -98,6 +98,7 @@
 			<CheckBox
 				android:id="@+id/use_username"
 				android:visibility="visible"
+				android:layout_marginTop="20dp"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/login_with_username"/>
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 28f765950..324c8a5cb 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -49,4 +49,4 @@ username_length=-1
 username_max_length=64
 username_min_length=1
 username_regex=^[a-z0-9_.\-]*$
-xmlrpc_url=https://sip3.linphone.org:444/inapp.php
+xmlrpc_url=https://sip3.linphone.org:444/wizard.php
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1f6cd6dd7..ba91d141f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -65,8 +65,7 @@
 	<string name="assistant_activate">Activate account</string>
 	<string name="assistant_finish">Finish configuration</string>
 	<string name="assistant_validate_account">Your account is created. Please check your mails to validate your account. Once it is done, come back here and click on the button.</string>
-	<string name="assistant_validate_code">Enter your activation code</string>
-	<string name="assistant_welcome_desc">This assistant will help you to use a SIP account for your calls.</string>
+	<string name="assistant_welcome_desc">This assistant will help you configure and use your SIP account.</string>
 	<string name="assistant_linphone_login_desc">Enter your username and password of Linphone account</string>
 	<string name="assistant_login_desc">Enter your username and password with your SIP domain</string>
 	<string name="assistant_remote_provisioning_desc">Please provide your provisioning URL</string>
@@ -74,10 +73,10 @@
 	<string name="assistant_login_linphone">Use Linphone account</string>
 	<string name="assistant_login_generic">Use SIP account</string>
 	<string name="assistant_remote_provisioning">Fetch remote configuration</string>
-	<string name="assistant_create_account_part_1">1/2</string>
-	<string name="assistant_create_account_part_2">2/2</string>
+	<string name="assistant_create_account_part_1">Please confirm your country code and enter your phone number</string>
+	<string name="assistant_create_account_part_2">We have sent you a SMS with a validation code.\n\nTo complete your phone number verification, please enter the %i digit code below:\n</string>
 	<string name="assistant_display_name_optional">Display name (optional)</string>
-	<string name="assistant_linphone_account">Configure Linphone account</string>
+	<string name="assistant_linphone_account">Use your Linphone account</string>
 	<string name="assistant_generic_account">Configure SIP account</string>
 	<string name="assistant_remote_provisioning_title">Fetch remote configuration</string>
 	<string name="assistant_fetch_apply">Fetch and apply</string>
@@ -106,11 +105,12 @@
 	<string name="assistant_choose_country">Choose a country</string>
 	<string name="select_your_country">Select your Country</string>
 	<string name="country_code">(%s)</string>
-	<string name="use_username_instead_or_phone_number">Don\'t use phone number as username</string>
+	<string name="use_username_instead_or_phone_number">Use a username (optional)</string>
 	<string name="use_email_for_validation">Use email address for account validation</string>
-	<string name="login_with_username">Log in with username</string>
-	<string name="phone_number_info_title">What is my phone number for?</string>
-	<string name="phone_number_info_content">A SMS code will be sent to your phone number to validate your account.</string>
+	<string name="login_with_username">Use your username and password instead of your phone number</string>
+	<string name="phone_number_info_title">What will my phone number be used for?</string>
+	<string name="phone_number_info_content">\nThanks to your phone number, your friends will find you more easily.\n\nYou will see in your addressbook who is using Linphone and your friends will know that they can rach you on Linphone as well.\n</string>
+	<string name="phone_number_link_info_content">\nYour friends will find your more easily if you link your account to your phone number\n\nYou will see in your addressbook who is using Linphone and your friends will know that they can rach you on Linphone as well.\n</string>
 
 	<!-- Status -->
 	<string name="invalid_email">Invalid email</string>
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index a2dabaf75..49d3a1bab 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -28,6 +28,7 @@ import org.linphone.R;
 import org.linphone.core.LinphoneAccountCreator;
 import org.linphone.core.LinphoneAccountCreatorImpl;
 import org.linphone.core.LinphoneProxyConfig;
+import org.linphone.mediastream.Log;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -58,7 +59,7 @@ import static org.linphone.core.LinphoneAccountCreator.*;
  */
 public class CreateAccountFragment extends Fragment implements CompoundButton.OnCheckedChangeListener, OnClickListener, LinphoneAccountCreatorListener {
 	private EditText phoneNumberEdit, usernameEdit, passwordEdit, passwordConfirmEdit, emailEdit, dialCode;
-	private TextView phoneNumberError, usernameError, passwordError, passwordConfirmError, emailError, assisstantTitle, sipUri;
+	private TextView phoneNumberError, usernameError, passwordError, passwordConfirmError, emailError, assisstantTitle, sipUri, skip;
 	private ImageView phoneNumberInfo;
 	
 	private boolean phoneNumberOk = false;
@@ -117,6 +118,8 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		emailError = (TextView) view.findViewById(R.id.email_error);
 		emailEdit = (EditText) view.findViewById(R.id.email);
 
+		skip = (TextView) view.findViewById(R.id.assistant_skip);
+
 		//Phone number
 		if(getResources().getBoolean(R.bool.use_phone_number_validation)){
 			//Automatically get the country code from the phone
@@ -141,6 +144,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			//Allow user to enter a username instead use the phone number as username
 			if(getResources().getBoolean(R.bool.assistant_allow_username) ) {
 				useUsername.setVisibility(View.VISIBLE);
+				useUsername.setEnabled(false);
 				useUsername.setOnCheckedChangeListener(this);
 			}
 		}
@@ -191,6 +195,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 			passwordConfirmLayout.setVisibility(View.GONE);
 			emailLayout.setVisibility(View.GONE);
 
+			skip.setVisibility(View.VISIBLE);
+			skip.setOnClickListener(this);
+
 			createAccount.setText(getResources().getString(R.string.link_account));
 			assisstantTitle.setText(getResources().getString(R.string.link_account));
 		}
@@ -251,6 +258,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				}
 			} else {
 				usernameLayout.setVisibility(View.GONE);
+				accountCreator.setUsername(null);
 			}
 		} else if(buttonView.getId() == R.id.use_email){
 			if(isChecked) {
@@ -280,11 +288,23 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				break;
 			}
 
+			case R.id.assistant_skip: {
+				AssistantActivity.instance().success();
+				break;
+			}
+
 			case R.id.info_phone_number: {
-				new AlertDialog.Builder(getActivity())
-					.setTitle(getString(R.string.phone_number_info_title))
-					.setMessage(getString(R.string.phone_number_info_content))
-						.show();
+				if(linkAccount){
+					new AlertDialog.Builder(getActivity())
+							.setTitle(getString(R.string.phone_number_info_title))
+							.setMessage(getString(R.string.phone_number_link_info_content))
+							.show();
+				} else {
+					new AlertDialog.Builder(getActivity())
+							.setTitle(getString(R.string.phone_number_info_title))
+							.setMessage(getString(R.string.phone_number_info_content))
+							.show();
+				}
 				break;
 			}
 
@@ -326,7 +346,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 		if(countryCode != null && countryCode.startsWith("+")) {
 			countryCode = countryCode.substring(1);
 		}
-		Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), countryCode);
+		Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), getCountryCode());
 		if(status.equals(Status.Ok)){
 			accountCreator.linkPhoneNumberWithAccount();
 		}
@@ -349,17 +369,18 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				if (s.length() > 0) {
 					phoneNumberOk = false;
 					Status status = accountCreator.setPhoneNumber(phoneNumberEdit.getText().toString(), getCountryCode());
-
 					if(status.equals(Status.Ok)){
-						accountCreator.isAccountUsed();
 						if(useUsername.isChecked()){
-							accountCreator.setUsername(field.getText().toString());
+							accountCreator.setUsername(usernameEdit.getText().toString());
 						}
+						accountCreator.isAccountUsed();
 					} else {
+						useUsername.setEnabled(phoneNumberOk);
 						displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, errorForStatus(status));
 						sipUri.setText("");
 					}
 				} else {
+					useUsername.setEnabled(phoneNumberOk);
 					displayError(phoneNumberOk, phoneNumberError, phoneNumberEdit, "");
 				}
 			}
@@ -551,7 +572,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));
 				sipUri.setText("Sip uri is sip:" + accountCreator.getUsername() + "@" + getResources().getString(R.string.default_domain));
 			}
-			createAccount.setEnabled(usernameOk);
+			createAccount.setEnabled(usernameOk && phoneNumberOk);
 		} else {
 			if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) {
 				phoneNumberOk = false;
@@ -563,6 +584,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				sipUri.setText("Sip uri is sip:" + accountCreator.getPhoneNumber() + "@" + getResources().getString(R.string.default_domain));
 			}
 			createAccount.setEnabled(phoneNumberOk);
+			useUsername.setEnabled(phoneNumberOk);
 		}
 	}
 

From 4e58b33673640a704cd3d9939b15ff6d976249be Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 8 Sep 2016 12:25:43 +0200
Subject: [PATCH 24/36] implement a new way to know whether the app is in
 background

---
 src/org/linphone/CallOutgoingActivity.java |   2 -
 src/org/linphone/LinphoneActivity.java     | 168 +++++++++++++++++----
 src/org/linphone/LinphoneManager.java      |   1 +
 3 files changed, 142 insertions(+), 29 deletions(-)

diff --git a/src/org/linphone/CallOutgoingActivity.java b/src/org/linphone/CallOutgoingActivity.java
index 4e890e39e..75f2e739f 100644
--- a/src/org/linphone/CallOutgoingActivity.java
+++ b/src/org/linphone/CallOutgoingActivity.java
@@ -122,8 +122,6 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 				}
 			}
 		};
-
-		super.onCreate(savedInstanceState);
 		instance = this;
 	}
 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 6fdf0dbcc..0bfe6ef5c 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -63,6 +63,7 @@ import android.app.Dialog;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.app.Application;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -73,6 +74,7 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.provider.Settings;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -140,6 +142,113 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private boolean doNotGoToCallActivity = false;
 	private List<String> sideMenuItems;
 
+	private Application.ActivityLifecycleCallbacks activityCallbacks;
+	private Handler mHandler;
+
+
+	/*Believe me or not, but knowing the application visibility state on Android is a nightmare.
+	After two days of hard work I ended with the following class, that does the job more or less reliabily.
+	*/
+	class ActivityMonitor implements Application.ActivityLifecycleCallbacks {
+		private ArrayList<Activity> activities = new ArrayList<Activity>();
+		private boolean mActive = false;
+		private int mRunningActivities = 0;
+
+		class InactivityChecker implements Runnable {
+			private boolean isCanceled;
+
+			public void cancel() {
+				isCanceled = true;
+			}
+
+			@Override
+			public void run() {
+				if (!isCanceled) {
+					if (ActivityMonitor.this.mRunningActivities == 0) {
+						mActive = false;
+						LinphoneActivity.this.onBackgroundMode();
+					}
+				}
+			}
+		};
+
+		private InactivityChecker mLastChecker;
+
+		@Override
+		public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+			Log.i("Activity created:" + activity);
+			if (!activities.contains(activity))
+				activities.add(activity);
+		}
+
+		@Override
+		public void onActivityStarted(Activity activity) {
+			Log.i("Activity started:" + activity);
+		}
+
+		@Override
+		public void onActivityResumed(Activity activity) {
+			Log.i("Activity resumed:" + activity);
+			if (activities.contains(activity)) {
+				mRunningActivities++;
+				Log.i("runningActivities=" + mRunningActivities);
+				checkActivity();
+			}
+
+		}
+
+		@Override
+		public void onActivityPaused(Activity activity) {
+			Log.i("Activity paused:" + activity);
+			if (activities.contains(activity)) {
+				mRunningActivities--;
+				Log.i("runningActivities=" + mRunningActivities);
+				checkActivity();
+			}
+
+		}
+
+		@Override
+		public void onActivityStopped(Activity activity) {
+			Log.i("Activity stopped:" + activity);
+		}
+
+		@Override
+		public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+		}
+
+		@Override
+		public void onActivityDestroyed(Activity activity) {
+			Log.i("Activity destroyed:" + activity);
+			if (activities.contains(activity)) {
+				activities.remove(activity);
+			}
+		}
+
+		void startInactivityChecker() {
+			if (mLastChecker != null) mLastChecker.cancel();
+			LinphoneActivity.this.mHandler.postDelayed(
+					(mLastChecker = new InactivityChecker()), 2000);
+		}
+
+		void checkActivity() {
+
+			if (mRunningActivities == 0) {
+				if (mActive) startInactivityChecker();
+			} else if (mRunningActivities > 0) {
+				if (!mActive) {
+					mActive = true;
+					LinphoneActivity.this.onForegroundMode();
+				}
+				if (mLastChecker != null) {
+					mLastChecker.cancel();
+					mLastChecker = null;
+				}
+			}
+		}
+	}
+
 	static final boolean isInstanciated() {
 		return instance != null;
 	}
@@ -150,9 +259,33 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		throw new RuntimeException("LinphoneActivity not instantiated yet");
 	}
 
+	protected void onBackgroundMode(){
+		Log.i("App has entered background mode");
+		if (LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
+			if (LinphoneManager.isInstanciated())
+				LinphoneManager.getInstance().subscribeFriendList(false);
+		}
+	}
+
+	protected void onForegroundMode() {
+		Log.i("App has left background mode");
+	}
+
+	/*the purpose of this method is to monitor activities started after the LinphoneActivity (but including LinphoneActivity)
+	in order to just be able to determine whether the application is in foreground or not.
+	Believe me or not, this information is not something provided by the current android apis.
+	 */
+	private void setupActivityMonitor(){
+		if (activityCallbacks != null) return;
+		getApplication().registerActivityLifecycleCallbacks(activityCallbacks = new ActivityMonitor());
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		//This must be done before calling super.onCreate().
+		setupActivityMonitor();
 		super.onCreate(savedInstanceState);
+		mHandler = new Handler();
 
         if (getResources().getBoolean(R.bool.orientation_portrait_only)) {
         	setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -1121,37 +1254,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	protected void onPause() {
 		getIntent().putExtra("PreviousActivity", 0);
 
-		if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled()){
-			LinphoneManager.getInstance().subscribeFriendList(!isApplicationBroughtToBackground(this));
-		}
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 		if (lc != null) {
 			lc.removeListener(mListener);
 		}
 
 		super.onPause();
-	}
 
-	@SuppressWarnings("deprecation")
-	public static boolean isApplicationBroughtToBackground(final Activity activity) {
-		ActivityManager activityManager = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
-		List<ActivityManager.RunningTaskInfo> tasks = activityManager.getRunningTasks(1);
-
-		// Check the top Activity against the list of Activities contained in the Application's package.
-		if (!tasks.isEmpty()) {
-			ComponentName topActivity = tasks.get(0).topActivity;
-			try {
-				PackageInfo pi = activity.getPackageManager().getPackageInfo(activity.getPackageName(), PackageManager.GET_ACTIVITIES);
-				for (ActivityInfo activityInfo : pi.activities) {
-					if(topActivity.getClassName().equals(activityInfo.name)) {
-						return false;
-					}
-				}
-			} catch( PackageManager.NameNotFoundException e) {
-				return false; // Never happens.
-			}
-		}
-		return true;
 	}
 
 	public boolean checkAndRequestOverlayPermission() {
@@ -1168,7 +1277,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	public void checkAndRequestReadPhoneStatePermission() {
 		checkAndRequestPermission(Manifest.permission.READ_PHONE_STATE, 0);
 	}
-	
+
 	public void checkAndRequestReadExternalStoragePermission() {
 		checkAndRequestPermission(Manifest.permission.READ_EXTERNAL_STORAGE, 0);
 	}
@@ -1188,7 +1297,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	public void checkAndRequestInappPermission() {
 		checkAndRequestPermission(Manifest.permission.GET_ACCOUNTS, PERMISSIONS_REQUEST_CONTACTS);
 	}
-	
+
 	private boolean willContactsPermissionBeAsked() {
 		return LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.READ_CONTACTS, false) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_CONTACTS);
 	}
@@ -1301,7 +1410,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 		int readPhone = getPackageManager().checkPermission(Manifest.permission.READ_PHONE_STATE, getPackageName());
 		Log.i("[Permission] Read phone state permission is " + (readPhone == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
-		
+
 		if (contacts == PackageManager.PERMISSION_GRANTED) {
 			if (readPhone == PackageManager.PERMISSION_DENIED) {
 				checkAndRequestReadPhoneStatePermission();
@@ -1389,6 +1498,11 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			mOrientationHelper = null;
 		}
 
+		if (activityCallbacks != null){
+			getApplication().unregisterActivityLifecycleCallbacks(activityCallbacks);
+			activityCallbacks = null;
+		}
+
 		instance = null;
 		super.onDestroy();
 
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 983000d46..3ff96b00d 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -432,6 +432,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		LinphoneCore lc = getLcIfManagerNotDestroyedOrNull();
 		if(lc != null ) {
 			LinphoneFriendList mFriendList = (lc.getFriendLists())[0];
+			Log.i("Presence list subscription is " + (enabled ? "enabled" : "disabled"));
 			mFriendList.enableSubscriptions(enabled);
 		}
 	}

From bc08f8da6cdcada0264ced7c8485426ac98fa64b Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 12 Sep 2016 17:14:16 +0200
Subject: [PATCH 25/36] Add link button in account settings and fix some bugs

---
 ...stant_account_creation_code_activation.xml |  2 +-
 res/layout/assistant_codec_downloader.xml     | 73 ++++++++++---------
 res/values/non_localizable_strings.xml        |  1 +
 res/values/strings.xml                        |  5 ++
 .../linphone/AccountPreferencesFragment.java  | 10 +++
 src/org/linphone/LinphoneActivity.java        |  5 +-
 6 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/res/layout/assistant_account_creation_code_activation.xml b/res/layout/assistant_account_creation_code_activation.xml
index 4c5900b60..d9609bfcb 100644
--- a/res/layout/assistant_account_creation_code_activation.xml
+++ b/res/layout/assistant_account_creation_code_activation.xml
@@ -29,7 +29,7 @@
 			android:background="@drawable/resizable_textfield"
 			android:textColor="@color/colorB"
 			android:contentDescription="@string/content_description_activation_code_field"
-			android:inputType="text|textNoSuggestions"
+			android:inputType="number"
 			android:gravity="center_vertical|center_horizontal"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
diff --git a/res/layout/assistant_codec_downloader.xml b/res/layout/assistant_codec_downloader.xml
index 4f991e5b0..c1f78dd7a 100644
--- a/res/layout/assistant_codec_downloader.xml
+++ b/res/layout/assistant_codec_downloader.xml
@@ -32,7 +32,7 @@
 		android:layout_height="wrap_content"
 		android:id="@+id/progressBar"
 		android:layout_marginBottom="50dp"
-		android:layout_above="@+id/answerNo"
+		android:layout_above="@+id/buttons"
 		android:layout_alignParentLeft="true"
 		android:layout_alignParentStart="true"
 		android:layout_alignParentRight="true"
@@ -50,43 +50,46 @@
 		android:layout_alignParentLeft="true"
 		android:layout_alignParentStart="true"/>
 
-	<Button
-		style="@style/font7"
-		android:text="No"
-		android:textAllCaps="true"
-		android:layout_width="wrap_content"
+	<RelativeLayout
+		android:id="@+id/buttons"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:gravity="center"
-		android:id="@+id/answerNo"
-		android:layout_marginBottom="35dp"
-		android:layout_alignParentBottom="true"
-		android:layout_toLeftOf="@+id/imageView"
-		android:layout_toStartOf="@+id/imageView"
-		android:layout_marginRight="26dp"
-		android:layout_marginEnd="26dp"/>
+		android:layout_alignParentBottom="true">
 
-	<Button
-		style="@style/font7"
-		android:text="Yes"
-		android:textAllCaps="true"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:gravity="center"
-		android:id="@+id/answerYes"
-		android:layout_below="@+id/progressBar"
-		android:layout_toRightOf="@+id/imageView"
-		android:layout_toEndOf="@+id/imageView"/>
+		<Button
+			android:id="@+id/answerNo"
+			android:text="@string/no"
+			android:background="@drawable/assistant_button"
+			android:textColor="@drawable/assistant_button_text_color"
+			style="@style/font8"
+			android:layout_alignParentLeft="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center"/>
 
-	<Button
-		style="@style/font7"
-		android:text="Ok"
-		android:textAllCaps="true"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:gravity="center"
-		android:id="@+id/answerOk"
-		android:layout_alignTop="@+id/answerYes"
-		android:layout_centerHorizontal="true"/>
+		<Button
+			android:id="@+id/answerOk"
+			android:text="@string/ok"
+			android:background="@drawable/assistant_button"
+			android:textColor="@drawable/assistant_button_text_color"
+			style="@style/font8"
+			android:layout_centerInParent="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center"/>
+
+		<Button
+			android:id="@+id/answerYes"
+			android:text="@string/yes"
+			android:background="@drawable/assistant_button"
+			android:textColor="@drawable/assistant_button_text_color"
+			style="@style/font8"
+			android:layout_alignParentRight="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center"/>
+
+	</RelativeLayout>
 
 	<TextView
 		style="@style/font7"
diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index dcbc04bec..69e3a26cc 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -75,6 +75,7 @@
     <string name="pref_service_notification_key">pref_service_notification_key</string>
     <string name="pref_escape_plus_key">pref_escape_plus_key</string>
     <string name="pref_friendlist_subscribe_key">pref_friendlist_subscribe_key</string>
+    <string name="pref_link_account_key">pref_link_account_key</string>
     <string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string>
     <string name="pref_autostart_key">pref_autostart_key</string>
     <string name="pref_enable_outbound_proxy_key">Outbound proxy</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba91d141f..399b24e36 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,6 +52,10 @@
 	<string name="link">Link</string>
 	<string name="link_account_popup">Do you want to link the account %s with your phone number ?</string>
 	<string name="maybe_later">Maybe later</string>
+	<string name="later">Later</string>
+	<string name="no">No</string>
+	<string name="ok">Ok</string>
+	<string name="yes">Yes</string>
 	<string name="link_account">Link account</string>
 
 	<!-- Launch screen -->
@@ -251,6 +255,7 @@
 	<string name="pref_avpf_rr_interval"> AVPF regular RTCP interval in seconds (between 1 and 5)</string>
 	<string name="pref_escape_plus">Replace + by 00</string>
 	<string name="pref_friendlist_subscribe">Friendlist subscribe</string>
+	<string name="pref_link_account">Link account</string>
 	<string name="pref_auth_userid">Auth userid</string>
 	<string name="pref_help_auth_userid">Enter authentication userid (optional)</string>
 	<string name="pref_display_name">Display name</string>
diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java
index 5d52619d1..cbc02fced 100644
--- a/src/org/linphone/AccountPreferencesFragment.java
+++ b/src/org/linphone/AccountPreferencesFragment.java
@@ -240,6 +240,13 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
 			return true;
 		}
 	};
+	OnPreferenceClickListener linkAccountListener = new OnPreferenceClickListener() {
+		@Override
+		public boolean onPreferenceClick(Preference preference) {
+			LinphoneActivity.instance().displayLinkPhoneNumber();
+			return true;
+		}
+	};
 	OnPreferenceChangeListener disableChangedListener = new OnPreferenceChangeListener() {
 		@Override
 		public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -371,6 +378,9 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
 		if(!isNewAccount){
 			friendlistSubscribe.setChecked(mPrefs.isFriendlistsubscriptionEnabled());
 		}
+
+		Preference linkAccount = advanced.getPreference(9);
+		linkAccount.setOnPreferenceClickListener(linkAccountListener);
     	
     	PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key));
     	final CheckBoxPreference disable = (CheckBoxPreference) manage.getPreference(0);
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 963a5d52b..505e24de1 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -370,7 +370,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 				if(state.equals(RegistrationState.RegistrationOk) && LinphonePreferences.instance().getLinkPopupTime() != ""){
 					if(getResources().getBoolean(R.bool.use_phone_number_validation)) {
-						if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null && !LinphonePreferences.instance().getLinkPopupTime().equals(""))){
+						if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null)){
 							isAccountWithAlias();
 						}
 					}
@@ -566,7 +566,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	private void changeFragment(Fragment newFragment, FragmentsAvailable newFragmentType, boolean withoutAnimation) {
-
 		FragmentManager fm = getFragmentManager();
 		FragmentTransaction transaction = fm.beginTransaction();
 
@@ -1813,7 +1812,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
 			accountCreator.isAccountUsed();
 		} else {
-			LinphonePreferences.instance().setInappPopupTime(null);
+			LinphonePreferences.instance().setLinkPopupTime(null);
 		}
 	}
 

From ca13ff87b969ca6854ac738e12c5ca72bc817ca4 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 13 Sep 2016 14:21:45 +0200
Subject: [PATCH 26/36] Add link account in xml

---
 res/xml/account_preferences.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/res/xml/account_preferences.xml b/res/xml/account_preferences.xml
index 41141d672..9c2182909 100644
--- a/res/xml/account_preferences.xml
+++ b/res/xml/account_preferences.xml
@@ -91,6 +91,11 @@
 			android:title="@string/pref_friendlist_subscribe"
 			android:key="@string/pref_friendlist_subscribe_key"
             android:persistent="false"/>
+
+		<Preference
+			android:title="@string/pref_link_account"
+			android:key="@string/pref_link_account_key"
+			android:persistent="false"/>
         
     </PreferenceCategory>
     

From a3c681dd0dccf1a815d92c95d41cc623758874d1 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 13 Sep 2016 14:27:01 +0200
Subject: [PATCH 27/36] Change test for the new assistant

---
 .../src/org/linphone/test/AccountAssistant.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/src/org/linphone/test/AccountAssistant.java b/tests/src/org/linphone/test/AccountAssistant.java
index ab029d5e4..6f4a51ec3 100644
--- a/tests/src/org/linphone/test/AccountAssistant.java
+++ b/tests/src/org/linphone/test/AccountAssistant.java
@@ -26,6 +26,7 @@ public class AccountAssistant extends SampleTest {
 	@MediumTest
 	@LargeTest
 	public void testAWizardDisplayedAfterInstall() {
+		LinphonePreferences.instance().setXmlrpcUrl("https://sip3.linphone.org:444/inapp.php");
 		solo.waitForActivity("AssistantActivity", 3000);
 		solo.assertCurrentActivity("Expected Assistant Activity", AssistantActivity.class);
 	}
@@ -38,16 +39,19 @@ public class AccountAssistant extends SampleTest {
 		solo.assertCurrentActivity("Expected Assistant Activity", AssistantActivity.class);
 
 		solo.clickOnView(solo.getView(org.linphone.R.id.login_linphone));
+		solo.clickOnView(solo.getView(org.linphone.R.id.use_username));
 		solo.enterText((EditText) solo.getView(org.linphone.R.id.assistant_username), iContext.getString(R.string.account_linphone_login));
 		solo.enterText((EditText) solo.getView(org.linphone.R.id.assistant_password), iContext.getString(R.string.account_linphone_pwd));
-		solo.enterText((EditText) solo.getView(org.linphone.R.id.assistant_display_name), iContext.getString(R.string.account_linphone_display_name));
 		solo.clickOnView(solo.getView(org.linphone.R.id.assistant_apply));
 
+		solo.clickOnView(solo.getView(org.linphone.R.id.assistant_skip));
+
 		solo.sleep(1000);
 
 		//Test echo calibration launch at first start
-		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.assistant_ec_calibration)));
-				
+		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.assistant_codec_down_question)));
+		solo.clickOnView(solo.getView(org.linphone.R.id.answerNo));
+
 		solo.waitForActivity("LinphoneActivity", 8000);
 		Assert.assertTrue(solo.searchText(iContext.getString(R.string.account_linphone_login) + "@sip.linphone.org"));
 
@@ -68,8 +72,8 @@ public class AccountAssistant extends SampleTest {
 		String proxy = prefs.getAccountProxy(0);
 		Assert.assertEquals("<sip:" + aContext.getString(org.linphone.R.string.default_domain) + ";transport=tls>", proxy);
 
-		String display_name = prefs.getAccountDisplayName(0);
-		Assert.assertEquals(iContext.getString(R.string.account_linphone_display_name), display_name);
+		String username = prefs.getAccountUsername(0);
+		Assert.assertEquals(iContext.getString(R.string.account_linphone_login), username);
 				
 		boolean ice = prefs.isIceEnabled();
 		Assert.assertEquals(ice, true);
@@ -119,8 +123,6 @@ public class AccountAssistant extends SampleTest {
 		Assert.assertEquals(error.getText(), aContext.getString(org.linphone.R.string.wizard_username_incorrect));
 		Assert.assertFalse(createAccount.isEnabled());
 
-
-
 		solo.clearEditText((EditText) solo.getView(org.linphone.R.id.username));
 		solo.enterText((EditText) solo.getView(org.linphone.R.id.username), iContext.getString(R.string.account_linphone_login));
 		solo.sleep(sleepingTime * 2);

From e7ece223e57b875b8b68231b82035ababe02c734 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 13 Sep 2016 18:06:23 +0200
Subject: [PATCH 28/36] fix list subscription setting not stored and improve
 background/foreground activity manager by moving it into the LinphoneService.

---
 .../linphone/AccountPreferencesFragment.java  |   1 +
 src/org/linphone/LinphoneActivity.java        | 136 +-----------------
 src/org/linphone/LinphoneService.java         | 135 +++++++++++++++++
 3 files changed, 137 insertions(+), 135 deletions(-)

diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java
index cbc02fced..627524584 100644
--- a/src/org/linphone/AccountPreferencesFragment.java
+++ b/src/org/linphone/AccountPreferencesFragment.java
@@ -236,6 +236,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
 		@Override
 		public boolean onPreferenceChange(Preference preference, Object newValue) {
 			boolean value = (Boolean) newValue;
+			mPrefs.enabledFriendlistSubscription(value);
 			LinphoneManager.getInstance().subscribeFriendList(value);
 			return true;
 		}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 505e24de1..9733e90b2 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -142,112 +142,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private boolean doNotGoToCallActivity = false;
 	private List<String> sideMenuItems;
 
-	private Application.ActivityLifecycleCallbacks activityCallbacks;
-	private Handler mHandler;
-
-
-	/*Believe me or not, but knowing the application visibility state on Android is a nightmare.
-	After two days of hard work I ended with the following class, that does the job more or less reliabily.
-	*/
-	class ActivityMonitor implements Application.ActivityLifecycleCallbacks {
-		private ArrayList<Activity> activities = new ArrayList<Activity>();
-		private boolean mActive = false;
-		private int mRunningActivities = 0;
-
-		class InactivityChecker implements Runnable {
-			private boolean isCanceled;
-
-			public void cancel() {
-				isCanceled = true;
-			}
-
-			@Override
-			public void run() {
-				if (!isCanceled) {
-					if (ActivityMonitor.this.mRunningActivities == 0) {
-						mActive = false;
-						LinphoneActivity.this.onBackgroundMode();
-					}
-				}
-			}
-		};
-
-		private InactivityChecker mLastChecker;
-
-		@Override
-		public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-			Log.i("Activity created:" + activity);
-			if (!activities.contains(activity))
-				activities.add(activity);
-		}
-
-		@Override
-		public void onActivityStarted(Activity activity) {
-			Log.i("Activity started:" + activity);
-		}
-
-		@Override
-		public void onActivityResumed(Activity activity) {
-			Log.i("Activity resumed:" + activity);
-			if (activities.contains(activity)) {
-				mRunningActivities++;
-				Log.i("runningActivities=" + mRunningActivities);
-				checkActivity();
-			}
-
-		}
-
-		@Override
-		public void onActivityPaused(Activity activity) {
-			Log.i("Activity paused:" + activity);
-			if (activities.contains(activity)) {
-				mRunningActivities--;
-				Log.i("runningActivities=" + mRunningActivities);
-				checkActivity();
-			}
-
-		}
-
-		@Override
-		public void onActivityStopped(Activity activity) {
-			Log.i("Activity stopped:" + activity);
-		}
-
-		@Override
-		public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-
-		}
-
-		@Override
-		public void onActivityDestroyed(Activity activity) {
-			Log.i("Activity destroyed:" + activity);
-			if (activities.contains(activity)) {
-				activities.remove(activity);
-			}
-		}
-
-		void startInactivityChecker() {
-			if (mLastChecker != null) mLastChecker.cancel();
-			LinphoneActivity.this.mHandler.postDelayed(
-					(mLastChecker = new InactivityChecker()), 2000);
-		}
-
-		void checkActivity() {
-
-			if (mRunningActivities == 0) {
-				if (mActive) startInactivityChecker();
-			} else if (mRunningActivities > 0) {
-				if (!mActive) {
-					mActive = true;
-					LinphoneActivity.this.onForegroundMode();
-				}
-				if (mLastChecker != null) {
-					mLastChecker.cancel();
-					mLastChecker = null;
-				}
-			}
-		}
-	}
 
 	static final boolean isInstanciated() {
 		return instance != null;
@@ -259,33 +153,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		throw new RuntimeException("LinphoneActivity not instantiated yet");
 	}
 
-	protected void onBackgroundMode(){
-		Log.i("App has entered background mode");
-		if (LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
-			if (LinphoneManager.isInstanciated())
-				LinphoneManager.getInstance().subscribeFriendList(false);
-		}
-	}
-
-	protected void onForegroundMode() {
-		Log.i("App has left background mode");
-	}
-
-	/*the purpose of this method is to monitor activities started after the LinphoneActivity (but including LinphoneActivity)
-	in order to just be able to determine whether the application is in foreground or not.
-	Believe me or not, this information is not something provided by the current android apis.
-	 */
-	private void setupActivityMonitor(){
-		if (activityCallbacks != null) return;
-		getApplication().registerActivityLifecycleCallbacks(activityCallbacks = new ActivityMonitor());
-	}
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		//This must be done before calling super.onCreate().
-		setupActivityMonitor();
 		super.onCreate(savedInstanceState);
-		mHandler = new Handler();
 
         if (getResources().getBoolean(R.bool.orientation_portrait_only)) {
         	setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -1440,7 +1311,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	protected void onResume() {
 		super.onResume();
 
-		if (!LinphoneService.isReady())  {
+		if (!LinphoneService.isReady()) {
 			startService(new Intent(Intent.ACTION_MAIN).setClass(this, LinphoneService.class));
 		}
 
@@ -1501,11 +1372,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			mOrientationHelper = null;
 		}
 
-		if (activityCallbacks != null){
-			getApplication().unregisterActivityLifecycleCallbacks(activityCallbacks);
-			activityCallbacks = null;
-		}
-
 		instance = null;
 		super.onDestroy();
 
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 60039a8ff..fefd737c9 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -20,6 +20,7 @@ package org.linphone;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 
 import org.linphone.compatibility.Compatibility;
 import org.linphone.core.LinphoneAddress;
@@ -40,6 +41,7 @@ import org.linphone.ui.LinphoneOverlay;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlarmManager;
+import android.app.Application;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -52,6 +54,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.SystemClock;
@@ -121,6 +124,131 @@ public final class LinphoneService extends Service {
 	public static int notifcationsPriority = (Version.sdkAboveOrEqual(Version.API16_JELLY_BEAN_41) ? Notification.PRIORITY_MIN : 0);
 	private WindowManager mWindowManager;
 	private LinphoneOverlay mOverlay;
+	private Application.ActivityLifecycleCallbacks activityCallbacks;
+
+
+
+	/*Believe me or not, but knowing the application visibility state on Android is a nightmare.
+	After two days of hard work I ended with the following class, that does the job more or less reliabily.
+	*/
+	class ActivityMonitor implements Application.ActivityLifecycleCallbacks {
+		private ArrayList<Activity> activities = new ArrayList<Activity>();
+		private boolean mActive = false;
+		private int mRunningActivities = 0;
+
+		class InactivityChecker implements Runnable {
+			private boolean isCanceled;
+
+			public void cancel() {
+				isCanceled = true;
+			}
+
+			@Override
+			public void run() {
+				synchronized(LinphoneService.this) {
+					if (!isCanceled) {
+						if (ActivityMonitor.this.mRunningActivities == 0 && mActive) {
+							mActive = false;
+							LinphoneService.this.onBackgroundMode();
+						}
+					}
+				}
+			}
+		};
+
+		private InactivityChecker mLastChecker;
+
+		@Override
+		public synchronized void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+			Log.i("Activity created:" + activity);
+			if (!activities.contains(activity))
+				activities.add(activity);
+		}
+
+		@Override
+		public void onActivityStarted(Activity activity) {
+			Log.i("Activity started:" + activity);
+		}
+
+		@Override
+		public synchronized void onActivityResumed(Activity activity) {
+			Log.i("Activity resumed:" + activity);
+			if (activities.contains(activity)) {
+				mRunningActivities++;
+				Log.i("runningActivities=" + mRunningActivities);
+				checkActivity();
+			}
+
+		}
+
+		@Override
+		public synchronized void onActivityPaused(Activity activity) {
+			Log.i("Activity paused:" + activity);
+			if (activities.contains(activity)) {
+				mRunningActivities--;
+				Log.i("runningActivities=" + mRunningActivities);
+				checkActivity();
+			}
+
+		}
+
+		@Override
+		public void onActivityStopped(Activity activity) {
+			Log.i("Activity stopped:" + activity);
+		}
+
+		@Override
+		public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+		}
+
+		@Override
+		public synchronized void onActivityDestroyed(Activity activity) {
+			Log.i("Activity destroyed:" + activity);
+			if (activities.contains(activity)) {
+				activities.remove(activity);
+			}
+		}
+
+		void startInactivityChecker() {
+			if (mLastChecker != null) mLastChecker.cancel();
+			LinphoneService.this.mHandler.postDelayed(
+					(mLastChecker = new InactivityChecker()), 2000);
+		}
+
+		void checkActivity() {
+
+			if (mRunningActivities == 0) {
+				if (mActive) startInactivityChecker();
+			} else if (mRunningActivities > 0) {
+				if (!mActive) {
+					mActive = true;
+					LinphoneService.this.onForegroundMode();
+				}
+				if (mLastChecker != null) {
+					mLastChecker.cancel();
+					mLastChecker = null;
+				}
+			}
+		}
+	}
+
+	protected void onBackgroundMode(){
+		Log.i("App has entered background mode");
+		if (LinphonePreferences.instance() != null && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
+			if (LinphoneManager.isInstanciated())
+				LinphoneManager.getInstance().subscribeFriendList(false);
+		}
+	}
+
+	protected void onForegroundMode() {
+		Log.i("App has left background mode");
+	}
+
+	private void setupActivityMonitor(){
+		if (activityCallbacks != null) return;
+		getApplication().registerActivityLifecycleCallbacks(activityCallbacks = new ActivityMonitor());
+	}
 
 	public int getMessageNotifCount() {
 		return mMsgNotifCount;
@@ -160,6 +288,7 @@ public final class LinphoneService extends Service {
 	public void onCreate() {
 		super.onCreate();
 
+		setupActivityMonitor();
 		// In case restart after a crash. Main in LinphoneActivity
 		mNotificationTitle = getString(R.string.service_name);
 
@@ -629,6 +758,12 @@ public final class LinphoneService extends Service {
 
 	@Override
 	public synchronized void onDestroy() {
+
+		if (activityCallbacks != null){
+			getApplication().unregisterActivityLifecycleCallbacks(activityCallbacks);
+			activityCallbacks = null;
+		}
+
 		destroyOverlay();
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 		if (lc != null) {

From fbaef3ccdf8968a45d417c3603c7fae651810a21 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 13 Sep 2016 22:29:36 +0200
Subject: [PATCH 29/36] fix enablement of rls, which must be done in factory
 file to allow upgrades.

---
 res/raw/linphonerc_default | 2 +-
 res/raw/linphonerc_factory | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default
index 4d6c28236..e390d294d 100644
--- a/res/raw/linphonerc_default
+++ b/res/raw/linphonerc_default
@@ -7,7 +7,7 @@ contact="Linphone Android" <sip:linphone.android@unknown-host>
 use_info=0
 use_ipv6=0
 keepalive_period=30000
-use_rls_presence=1
+
 
 [video]
 size=qvga
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 324c8a5cb..9fa9d8182 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -13,6 +13,7 @@ auto_net_state_mon=0
 auto_answer_replacing_calls=1
 ping_with_options=0
 rls_uri=sip:rls@sip.linphone.org
+use_rls_presence=1
 
 [rtp]
 audio_rtp_port=7076

From 5565dc623457587532b7f46fca5459bfcd329500 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 13 Sep 2016 17:15:06 +0200
Subject: [PATCH 30/36] Fix assistant create account

---
 .../assistant/CreateAccountFragment.java      | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index 49d3a1bab..9dd377494 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -421,13 +421,6 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	private void addEmailHandler(final EditText field, final ImageView icon) {
 		field.addTextChangedListener(new TextWatcher() {
 			public void afterTextChanged(Editable s) {
-			}
-
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			public void onTextChanged(CharSequence s, int start, int count, int after) 
-			{
 				emailOk = false;
 				Status status = accountCreator.setEmail(field.getText().toString());
 				if (status.equals(Status.Ok)) {
@@ -439,19 +432,18 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				}
 				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
 			}
+
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+			}
+
+			public void onTextChanged(CharSequence s, int start, int count, int after) {
+			}
 		});
 	}
 	
 	private void addPasswordHandler(final EditText field1, final ImageView icon) {
 		TextWatcher passwordListener = new TextWatcher() {
 			public void afterTextChanged(Editable s) {
-			}
-
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			public void onTextChanged(CharSequence s, int start, int count, int after) 
-			{
 				passwordOk = false;
 				Status status = accountCreator.setPassword(field1.getText().toString());
 				if (isPasswordCorrect(field1.getText().toString())) {
@@ -463,6 +455,12 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 				}
 				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
 			}
+
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+			}
+
+			public void onTextChanged(CharSequence s, int start, int count, int after) {
+			}
 		};
 		
 		field1.addTextChangedListener(passwordListener);
@@ -471,13 +469,6 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	private void addConfirmPasswordHandler(final EditText field1, final EditText field2, final ImageView icon) {
 		TextWatcher passwordListener = new TextWatcher() {
 			public void afterTextChanged(Editable s) {
-			}
-
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			public void onTextChanged(CharSequence s, int start, int count, int after) 
-			{
 				confirmPasswordOk = false;
 				if (field1.getText().toString().equals(field2.getText().toString())) {
 					confirmPasswordOk = true;
@@ -490,9 +481,12 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 					displayError(confirmPasswordOk, passwordConfirmError, passwordConfirmEdit, getString(R.string.wizard_passwords_unmatched));
 				}
 				createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
-
-
 			}
+
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+			}
+
+			public void onTextChanged(CharSequence s, int start, int count, int after) {}
 		};
 		field1.addTextChangedListener(passwordListener);
 		field2.addTextChangedListener(passwordListener);
@@ -550,7 +544,7 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, final Status status) {
-		if(getResources().getBoolean(R.bool.isTablet) || useEmail.isChecked()){
+		if(getResources().getBoolean(R.bool.isTablet) || useEmail.isChecked() || !getResources().getBoolean(R.bool.use_phone_number_validation)){
 			if (status.equals(Status.AccountExist) || status.equals(Status.AccountExistWithAlias)) {
 				usernameOk = false;
 				displayError(usernameOk, usernameError, usernameEdit, errorForStatus(status));

From cfee90d5ea180f37d1b0695f524cc8e54145ed10 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 14 Sep 2016 14:13:54 +0200
Subject: [PATCH 31/36] Add prefix in proxy config for phone numbers

---
 ...tant_account_creation_email_activation.xml |  7 ----
 res/layout/assistant_login.xml                |  2 +
 res/values/strings.xml                        |  2 +-
 src/org/linphone/LinphonePreferences.java     | 11 ++++++
 .../linphone/assistant/AssistantActivity.java | 39 +++++++++----------
 .../CreateAccountCodeActivationFragment.java  |  4 +-
 src/org/linphone/assistant/LoginFragment.java |  2 +-
 7 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/res/layout/assistant_account_creation_email_activation.xml b/res/layout/assistant_account_creation_email_activation.xml
index f3d795e41..a2fcc8b53 100644
--- a/res/layout/assistant_account_creation_email_activation.xml
+++ b/res/layout/assistant_account_creation_email_activation.xml
@@ -17,13 +17,6 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"/>
 
-		<TextView
-			android:text="@string/assistant_create_account_part_2"
-			style="@style/font11"
-			android:paddingTop="10dp"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
-
 		<TextView
 			android:text="@string/assistant_validate_account"
 			style="@style/font11"
diff --git a/res/layout/assistant_login.xml b/res/layout/assistant_login.xml
index 1b031ee94..f45069c6c 100644
--- a/res/layout/assistant_login.xml
+++ b/res/layout/assistant_login.xml
@@ -87,6 +87,7 @@
 				android:singleLine="true"/>
 
 			<TextView
+				android:visibility="gone"
 				android:text="@string/assistant_display_name_optional"
 				style="@style/font13"
 				android:textAllCaps="true"
@@ -95,6 +96,7 @@
 				android:layout_height="wrap_content"/>
 
 			<EditText
+				android:visibility="gone"
 				android:id="@+id/assistant_display_name"
 				android:background="@drawable/resizable_textfield"
 				android:textColor="@color/colorB"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dc501c5b9..e85010c2b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -78,7 +78,7 @@
 	<string name="assistant_login_generic">Use SIP account</string>
 	<string name="assistant_remote_provisioning">Fetch remote configuration</string>
 	<string name="assistant_create_account_part_1">Please confirm your country code and enter your phone number</string>
-	<string name="assistant_create_account_part_2">We have sent you a SMS with a validation code.\n\nTo complete your phone number verification, please enter the %i digit code below:\n</string>
+	<string name="assistant_create_account_part_2">We have sent you a SMS with a validation code.\n\nTo complete your phone number verification, please enter the 4 digit code below:\n</string>
 	<string name="assistant_display_name_optional">Display name (optional)</string>
 	<string name="assistant_linphone_account">Use your Linphone account</string>
 	<string name="assistant_generic_account">Configure SIP account</string>
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 8db511e99..7970a119b 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -209,6 +209,7 @@ public class LinphonePreferences {
 		private String tempDomain;
 		private String tempProxy;
 		private String tempRealm;
+		private String tempPrefix;
 		private boolean tempOutboundProxy;
 		private String tempContactsParams;
 		private String tempExpire;
@@ -301,6 +302,11 @@ public class LinphonePreferences {
 			return this;
 		}
 
+		public AccountBuilder setPrefix(String prefix) {
+			tempPrefix = prefix;
+			return this;
+		}
+
 		public AccountBuilder setQualityReportingEnabled(boolean enable) {
 			tempQualityReportingEnabled = enable;
 			return this;
@@ -373,6 +379,11 @@ public class LinphonePreferences {
 			prxCfg.setQualityReportingCollector(tempQualityReportingCollector);
 			prxCfg.setQualityReportingInterval(tempQualityReportingInterval);
 
+			if(tempPrefix != null){
+				prxCfg.setDialPrefix(tempPrefix);
+			}
+
+
 			if(tempRealm != null)
 				prxCfg.setRealm(tempRealm);
 
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 853d67883..97a469a02 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -312,31 +312,31 @@ private static AssistantActivity instance;
 		}
 	}
 
-	private void logIn(String username, String password, String ha1, String displayName, String domain, TransportType transport, boolean sendEcCalibrationResult) {
-		saveCreatedAccount(username, password, displayName, ha1, domain, transport);
+	private void logIn(String username, String password, String ha1, String prefix, String domain, TransportType transport, boolean sendEcCalibrationResult) {
+		saveCreatedAccount(username, password, ha1, prefix, domain, transport);
 	}
 
-	public void checkAccount(String username, String password, String displayName, String domain) {
-		saveCreatedAccount(username, password, displayName, null, domain, null);
+	public void checkAccount(String username, String password, String prefix, String domain) {
+		saveCreatedAccount(username, password, null, prefix, domain, null);
 	}
 
-	public void linphoneLogIn(String username, String password, String ha1,  String displayName, boolean validate) {
+	public void linphoneLogIn(String username, String password, String ha1,  String prefix, boolean validate) {
 		if (validate) {
-			checkAccount(username, password, displayName, getString(R.string.default_domain));
+			checkAccount(username, password, prefix, getString(R.string.default_domain));
 		} else {
 			if(accountCreated) {
-				retryLogin(username, password, displayName, getString(R.string.default_domain), null);
+				retryLogin(username, password, prefix, getString(R.string.default_domain), null);
 			} else {
-				logIn(username, password, ha1,  displayName, getString(R.string.default_domain), null, true);
+				logIn(username, password, ha1,  prefix, getString(R.string.default_domain), null, true);
 			}
 		}
 	}
 
-	public void genericLogIn(String username, String password, String displayName, String domain, TransportType transport) {
+	public void genericLogIn(String username, String password, String prefix, String domain, TransportType transport) {
 		if (accountCreated) {
-			retryLogin(username, password, displayName, domain, transport);
+			retryLogin(username, password, prefix, domain, transport);
 		} else {
-			logIn(username, password, null, displayName, domain, transport, false);
+			logIn(username, password, null, prefix, domain, transport, false);
 		}
 	}
 
@@ -400,9 +400,9 @@ private static AssistantActivity instance;
 		back.setVisibility(View.VISIBLE);
 	}
 
-	public void retryLogin(String username, String password, String displayName, String domain, TransportType transport) {
+	public void retryLogin(String username, String password, String prefix, String domain, TransportType transport) {
 		accountCreated = false;
-		saveCreatedAccount(username, password, displayName, null, domain, transport);
+		saveCreatedAccount(username, password, null, prefix, domain, transport);
 	}
 
 	private void launchDownloadCodec() {
@@ -427,7 +427,7 @@ private static AssistantActivity instance;
 		return phoneNumberWithCountry;
 	}
 
-	public void saveCreatedAccount(String username, String password, String displayName, String ha1, String domain, TransportType transport) {
+	public void saveCreatedAccount(String username, String password, String prefix, String ha1, String domain, TransportType transport) {
 		if (accountCreated)
 			return;
 
@@ -441,19 +441,16 @@ private static AssistantActivity instance;
 			Log.e(e);
 		}
 
-		if(address != null && displayName != null && !displayName.equals("")){
-			address.setDisplayName(displayName);
-		}
-
-
-
 		boolean isMainAccountLinphoneDotOrg = domain.equals(getString(R.string.default_domain));
 		AccountBuilder builder = new AccountBuilder(LinphoneManager.getLc())
 		.setUsername(username)
 		.setDomain(domain)
-		.setDisplayName(displayName)
 		.setHa1(ha1)
 		.setPassword(password);
+
+		if(prefix != null){
+			builder.setPrefix(prefix);
+		}
 		
 		if (isMainAccountLinphoneDotOrg) {
 			if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) {
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index db3d3e8b1..6dc8a9ba6 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -129,14 +129,14 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 		if (status.equals(Status.AccountActivated)) {
 			checkAccount.setEnabled(true);
 			if (accountCreator.getUsername() != null) {
-				AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null);
+				AssistantActivity.instance().saveCreatedAccount(accountCreator.getUsername(), null , dialcode, accountCreator.getHa1(), getString(R.string.default_domain), null);
 				if(!recoverAccount){
 					AssistantActivity.instance().isAccountVerified(accountCreator.getUsername());
 				} else {
 					AssistantActivity.instance().finish();
 				}
 			} else {
-				AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, null, accountCreator.getHa1(), getString(R.string.default_domain), null);
+				AssistantActivity.instance().saveCreatedAccount(accountCreator.getPhoneNumber(), null, dialcode, accountCreator.getHa1(), getString(R.string.default_domain), null);
 				if(!recoverAccount) {
 					AssistantActivity.instance().isAccountVerified(accountCreator.getPhoneNumber());
 				} else {
diff --git a/src/org/linphone/assistant/LoginFragment.java b/src/org/linphone/assistant/LoginFragment.java
index f107d2981..1b2d3df51 100644
--- a/src/org/linphone/assistant/LoginFragment.java
+++ b/src/org/linphone/assistant/LoginFragment.java
@@ -82,7 +82,7 @@ public class LoginFragment extends Fragment implements OnClickListener, TextWatc
 				}
 			}
 
-			AssistantActivity.instance().genericLogIn(login.getText().toString(), password.getText().toString(), displayName.getText().toString(), domain.getText().toString(), transport);
+			AssistantActivity.instance().genericLogIn(login.getText().toString(), password.getText().toString(), null, domain.getText().toString(), transport);
 		}
 	}
 

From d18480b126bbc2fa4ce03938545d940ec1f40ae9 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 14 Sep 2016 16:57:44 +0200
Subject: [PATCH 32/36] fix migration to presence list, fix crash in linphone
 submodule

---
 res/raw/linphonerc_factory                |  2 +-
 src/org/linphone/LinphoneManager.java     |  1 +
 src/org/linphone/PreferencesMigrator.java | 16 ++++++++++++++++
 submodules/linphone                       |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 9fa9d8182..45bd4f494 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -13,7 +13,7 @@ auto_net_state_mon=0
 auto_answer_replacing_calls=1
 ping_with_options=0
 rls_uri=sip:rls@sip.linphone.org
-use_rls_presence=1
+
 
 [rtp]
 audio_rtp_port=7076
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 93abf091f..b0222136d 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -716,6 +716,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		PreferencesMigrator prefMigrator = new PreferencesMigrator(mServiceContext);
 		prefMigrator.migrateRemoteProvisioningUriIfNeeded();
 		prefMigrator.migrateSharingServerUrlIfNeeded();
+		prefMigrator.doPresenceMigrationIfNeeded();
 		
 		if (prefMigrator.isMigrationNeeded()) {
 			prefMigrator.doMigration();
diff --git a/src/org/linphone/PreferencesMigrator.java b/src/org/linphone/PreferencesMigrator.java
index 0d2c3cc73..69ece6d8d 100644
--- a/src/org/linphone/PreferencesMigrator.java
+++ b/src/org/linphone/PreferencesMigrator.java
@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import org.linphone.LinphonePreferences.AccountBuilder;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
+import org.linphone.core.LinphoneProxyConfig;
+import org.linphone.core.LpConfig;
 import org.linphone.mediastream.Log;
 
 import android.content.Context;
@@ -163,6 +165,20 @@ public class PreferencesMigrator {
 		}
 	}
 
+	public void doPresenceMigrationIfNeeded() {
+		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+		LpConfig cfg = lc.getConfig();
+		if (cfg.getString("app", "friendlist_subscription_enabled", null) == null){
+			LinphoneProxyConfig proxy = lc.getDefaultProxyConfig();
+			if (proxy != null) {
+				String domain = proxy.getDomain();
+				if (domain!=null && domain.equals(getString(R.string.default_domain))) {
+					cfg.setBool("app", "friendlist_subscription_enabled", true);
+				}
+			}
+		}
+	}
+
 	private void deleteAllOldPreferences() {
 		Editor editor = mOldPrefs.edit();
 		editor.clear();
diff --git a/submodules/linphone b/submodules/linphone
index a6e7eec3b..332246314 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a6e7eec3b3ec268e7d86f85ae268b53eca5c10de
+Subproject commit 332246314846ed07cace73e53733cc3a60b0e86c

From 11e0181e6fee54daabb38b6ca50bd25e9a26c2e9 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 15 Sep 2016 11:36:51 +0200
Subject: [PATCH 33/36] update linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 332246314..1be0484d4 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 332246314846ed07cace73e53733cc3a60b0e86c
+Subproject commit 1be0484d43764853b93783a920253f957b08ca9c

From 698a136a1243e515bdba8cdb026a3268e16efd60 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 15 Sep 2016 15:11:29 +0200
Subject: [PATCH 34/36] Manage linphone contact from presence model

---
 res/layout/contact_control_row.xml           | 35 +++++++++++++++-----
 src/org/linphone/ContactDetailsFragment.java | 24 ++++++++++++--
 src/org/linphone/ContactsManager.java        |  2 +-
 src/org/linphone/LinphoneContact.java        |  7 ++++
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index fac6b763a..03d21fda1 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -17,14 +17,33 @@
 			android:layout_marginRight="10dp"
 			android:background="@color/colorE"/>
 
-		<TextView
-			android:id="@+id/address_label"
-			android:layout_marginTop="10dp"
-			android:layout_gravity="center"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAllCaps="true"
-			android:textColor="@color/colorE" />
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+
+			<TextView
+				android:id="@+id/address_label"
+				android:layout_marginTop="10dp"
+				android:layout_centerInParent="true"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAllCaps="true"
+				android:textColor="@color/colorE" />
+
+
+			<ImageView
+				android:id="@+id/friendLinphone"
+				android:visibility="gone"
+				android:layout_width="20dp"
+				android:layout_height="20dp"
+				android:layout_alignParentRight="true"
+				android:layout_centerVertical="true"
+				android:adjustViewBounds="true"
+				android:layout_marginRight="10dp"
+				android:scaleType="centerInside"
+				android:src="@drawable/linphone_user" />
+		</RelativeLayout>
 
 		<TextView
 			android:id="@+id/numeroOrAddress"
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index 1b43f9254..e9488576a 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -133,10 +133,19 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			TextView tv = (TextView) v.findViewById(R.id.numeroOrAddress);
 			tv.setText(displayednumberOrAddress);
 			tv.setSelected(true);
+
+			String contactAddress = contact.getPresenceModelForUri(noa.getValue());
+			if(contactAddress != null) {
+				v.findViewById(R.id.friendLinphone).setVisibility(View.VISIBLE);
+			}
 			
 			if (!displayChatAddressOnly) {
 				v.findViewById(R.id.contact_call).setOnClickListener(dialListener);
-				v.findViewById(R.id.contact_call).setTag(displayednumberOrAddress);
+				if(contactAddress != null){
+					v.findViewById(R.id.contact_call).setTag(contact.getPresenceModelForUri(noa.getValue()));
+				} else {
+					v.findViewById(R.id.contact_call).setTag(displayednumberOrAddress);
+				}
 			} else {
 				v.findViewById(R.id.contact_call).setVisibility(View.GONE);
 			}
@@ -146,9 +155,18 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			if (lpc != null) {
 				String username = lpc.normalizePhoneNumber(LinphoneUtils.getUsernameFromAddress(noa.getValue()));
 				String tag = LinphoneUtils.getFullAddressFromUsername(username);
-				v.findViewById(R.id.contact_chat).setTag(tag);
+
+				if(contactAddress != null){
+					v.findViewById(R.id.contact_chat).setTag(contact.getPresenceModelForUri(noa.getValue()));
+				} else {
+					v.findViewById(R.id.contact_chat).setTag(tag);
+				}
 			} else {
-				v.findViewById(R.id.contact_chat).setTag(noa.getValue());
+				if(contactAddress != null){
+					v.findViewById(R.id.contact_chat).setTag(contact.getPresenceModelForUri(noa.getValue()));
+				} else {
+					v.findViewById(R.id.contact_chat).setTag(noa.getValue());
+				}
 			}
 			
 			if (getResources().getBoolean(R.bool.disable_chat)) {
diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index f36f83896..9ac69ca72 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -217,7 +217,7 @@ public class ContactsManager extends ContentObserver {
 		contacts = c;
 		sipContacts = new ArrayList<LinphoneContact>();
 		for (LinphoneContact contact : contacts) {
-			if (contact.hasAddress()) {
+			if (contact.hasAddress() || contact.isInLinphoneFriendList()) {
 				sipContacts.add(contact);
 			}
 		}
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index ef7f2fa48..d909c952d 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -635,6 +635,13 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		return (friend != null && friend.getPresenceModel() != null &&  friend.getPresenceModel().getBasicStatus().equals(PresenceBasicStatus.Open));
 	}
 
+	public String getPresenceModelForUri(String uri) {
+		if (friend != null && friend.getPresenceModelForUri(uri) != null){
+			return friend.getPresenceModelForUri(uri).getContact();
+		}
+		return null;
+	}
+
 	public void setFriend(LinphoneFriend f) {
 		friend = f;
 	}

From cf172a208bb417abc66323f680173ab510f8187a Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 16 Sep 2016 16:24:32 +0200
Subject: [PATCH 35/36] add use_rls_presence to factory.

---
 res/raw/linphonerc_factory | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 45bd4f494..bfb8f2740 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -13,6 +13,7 @@ auto_net_state_mon=0
 auto_answer_replacing_calls=1
 ping_with_options=0
 rls_uri=sip:rls@sip.linphone.org
+use_rls_presence=1
 
 
 [rtp]

From fef4779e0c171ebf017f04a1b46d850c0f7753c3 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 23 Sep 2016 13:03:25 +0200
Subject: [PATCH 36/36] update submodules (fixes memory leaks)

---
 submodules/bctoolbox | 2 +-
 submodules/belle-sip | 2 +-
 submodules/linphone  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index bc85d6a84..dd095f5c1 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit bc85d6a842ce94a59a01698fd4373b162b53c2b9
+Subproject commit dd095f5c12af3f78905eaeb15a4e91098e8d856f
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 580af25d0..990ab5fa3 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 580af25d04fcedfa1eafe28a24fa514dc7c91994
+Subproject commit 990ab5fa309cb312a9ef2cd1a84bc2738e14475d
diff --git a/submodules/linphone b/submodules/linphone
index 05d712ecd..638c77300 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 05d712ecdd58c1613f688a33a697b1d795ce8caf
+Subproject commit 638c77300b5c32250b50a8d7a9fae05904dd0b91