From 29817f91f53b4dae00361a34ef080c8ed280720a Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 12 Oct 2016 15:18:37 +0200
Subject: [PATCH] Adding new error msg in assistant

---
 res/values/strings.xml                             |  1 +
 src/org/linphone/LinphoneUtils.java                | 14 +++++++++-----
 .../linphone/assistant/LinphoneLoginFragment.java  |  9 +++++++--
 submodules/linphone                                |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b307d1d56..b3ee1b5df 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,6 +122,7 @@
 	<!-- Status -->
 	<string name="invalid_email">Invalid email</string>
 	<string name="account_already_exist">Account already exist</string>
+	<string name="phone_number_not_exist">This account does not exist</string>
 	<string name="invalid_username">Invalid username</string>
 	<string name="invalid_domain">Invalid domain</string>
 	<string name="invalid_route">Invalid route</string>
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index c12ed3f9f..0844ca22e 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -617,23 +617,27 @@ public final class LinphoneUtils {
 				return ctxt.getString(R.string.invalid_display_name);
 			if (status.equals(LinphoneAccountCreator.Status.Failed))
 				return ctxt.getString(R.string.request_failed);
+			if (status.equals(LinphoneAccountCreator.Status.ErrorServeur))
+				return ctxt.getString(R.string.wizard_failed);
 			if (status.equals(LinphoneAccountCreator.Status.TransportNotSupported))
 				return ctxt.getString(R.string.transport_unsupported);
 			if (status.equals(LinphoneAccountCreator.Status.AccountExist))
 				return ctxt.getString(R.string.account_already_exist);
-			if (status.equals(LinphoneAccountCreator.Status.AccountExistWithAlias))
-				return ctxt.getString(R.string.account_already_exist);
 			if (status.equals(LinphoneAccountCreator.Status.CountryCodeInvalid))
 				return ctxt.getString(R.string.country_code_invalid);
 			if (status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAccount)
-					|| status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAlias))
+					|| status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAlias)
+					|| status.equals(LinphoneAccountCreator.Status.AccountExistWithAlias))
 				return ctxt.getString(R.string.assistant_phone_number_unavailable);
+			if (status.equals(LinphoneAccountCreator.Status.AccountNotExist))
+				return ctxt.getString(R.string.assistant_error_bad_credentials);
+			if (status.equals(LinphoneAccountCreator.Status.PhoneNumberNotUsed))
+				return ctxt.getString(R.string.phone_number_not_exist);
 			if (status.equals(LinphoneAccountCreator.Status.PhoneNumberNotUsed)
-					|| status.equals(LinphoneAccountCreator.Status.AccountNotCreated)
-					|| status.equals(LinphoneAccountCreator.Status.AccountNotExist)
 					|| status.equals(LinphoneAccountCreator.Status.AccountNotActivated)
 					|| status.equals(LinphoneAccountCreator.Status.AccountAlreadyActivated)
 					|| status.equals(LinphoneAccountCreator.Status.AccountActivated)
+					|| status.equals(LinphoneAccountCreator.Status.AccountNotCreated)
 					|| status.equals(LinphoneAccountCreator.Status.Ok))
 				return "";
 		}
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index 1e8eeed12..b408d268e 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -249,7 +249,7 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 			LinphoneAccountCreator.Status status = getPhoneNumberStatus();
 			boolean isOk = status.equals(LinphoneAccountCreator.Status.Ok);
 			if (isOk) {
-				accountCreator.recoverPhoneAccount();
+				accountCreator.isPhoneNumberUsed();
 			} else {
 				apply.setEnabled(true);
 				LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), getContext());
@@ -351,6 +351,11 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
-
+		if (status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAccount) || status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAlias)) {
+			accountCreator.recoverPhoneAccount();
+		} else {
+			apply.setEnabled(true);
+			LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), getContext());
+		}
 	}
 }
diff --git a/submodules/linphone b/submodules/linphone
index 3e7b6b90b..788f6cc4f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 3e7b6b90b5f5c70847b55b406221cd27c8ea307f
+Subproject commit 788f6cc4fc57b99d44cfde041623dfe781bf0251