From 822367b271634020b6d54c4e9e59c4b7d7dea741 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 4 Jan 2017 15:43:36 +0100
Subject: [PATCH] Fixing some bugs on Assistant Update application version
 Update linphone

---
 AndroidManifest.xml                               |  4 ++--
 .../CreateAccountActivationFragment.java          |  3 +++
 .../CreateAccountCodeActivationFragment.java      |  6 ++++++
 .../linphone/assistant/CreateAccountFragment.java | 15 +++++++++++++++
 .../linphone/assistant/LinphoneLoginFragment.java | 12 ++++++++++++
 submodules/linphone                               |  2 +-
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fcc84342a..c652f6d2b 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.linphone"
           android:installLocation="auto"
-          android:versionCode="3214"
-          android:versionName="3.2.1">
+          android:versionCode="3220"
+          android:versionName="3.2.2">
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/src/org/linphone/assistant/CreateAccountActivationFragment.java b/src/org/linphone/assistant/CreateAccountActivationFragment.java
index 97a4c7840..297406538 100644
--- a/src/org/linphone/assistant/CreateAccountActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountActivationFragment.java
@@ -97,6 +97,9 @@ public class CreateAccountActivationFragment extends Fragment implements OnClick
 
 	@Override
 	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if (AssistantActivity.instance() == null) {
+			return;
+		}
 		if (status.equals(LinphoneAccountCreator.Status.AccountNotActivated)) {
 			Toast.makeText(getActivity(), getString(R.string.assistant_account_not_validated), Toast.LENGTH_LONG).show();
 		} else if (status.equals(LinphoneAccountCreator.Status.AccountActivated)) {
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index 0d38be00a..7957c51b2 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -142,6 +142,9 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 
 	@Override
 	public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if (AssistantActivity.instance() == null) {
+			return;
+		}
 		if (status.equals(Status.AccountActivated)) {
 			checkAccount.setEnabled(true);
 			if (accountCreator.getUsername() != null) {
@@ -174,6 +177,9 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 
 	@Override
 	public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if (AssistantActivity.instance() == null) {
+			return;
+		}
 		if(status.equals(LinphoneAccountCreator.Status.Ok)){
 			LinphonePreferences.instance().setLinkPopupTime("");
 			AssistantActivity.instance().hideKeyboard();
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index da7576973..39732523d 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -626,6 +626,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, Status status) {
+		if (AssistantActivity.instance() == null) {
+			return;
+		}
 		if (status.equals(Status.Ok)) {
 			AssistantActivity.instance().displayAssistantCodeConfirm(getUsername()
 					, phoneNumberEdit.getText().toString()
@@ -635,6 +638,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, Status status) {
+		if (AssistantActivity.instance() == null) {
+			return;
+		}
 		if (status.equals(Status.Ok)) {
 			AssistantActivity.instance().displayAssistantCodeConfirm(getUsername()
 					, phoneNumberEdit.getText().toString()
@@ -644,6 +650,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, Status status) {
+		if (AssistantActivity.instance() == null) {
+			return;
+		}
 		if (status.equals(Status.AccountNotActivated)) {
 			if (getResources().getBoolean(R.bool.isTablet)
 					|| !getResources().getBoolean(R.bool.use_phone_number_validation)) {
@@ -660,6 +669,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, Status status) {
+		if (AssistantActivity.instance() == null) {
+			return;
+		}
 		if (status.equals(Status.Ok)) {
 			AssistantActivity.instance().displayAssistantCodeConfirm(getUsername()
 					, dialCode.getText().toString() , phoneNumberEdit.getText().toString(), false);
@@ -677,6 +689,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator ac, Status status) {
+		if (AssistantActivity.instance() == null) {
+			return;
+		}
 		if (status.equals(Status.PhoneNumberUsedAccount) || status.equals(Status.PhoneNumberUsedAlias)) {
 			if (accountCreator.getPhoneNumber() != null && accountCreator.getUsername() != null
 					&& accountCreator.getPhoneNumber().compareTo(accountCreator.getUsername()) == 0) {
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index 190e10183..9dba2d01c 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -321,6 +321,10 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if (AssistantActivity.instance() == null) {
+			apply.setEnabled(true);
+			return;
+		}
 		if (status.equals(LinphoneAccountCreator.Status.AccountExist) || status.equals(LinphoneAccountCreator.Status.AccountExistWithAlias)) {
 			String phone = accountCreator.getPhoneNumber();
 			String dial = null;
@@ -355,6 +359,10 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if (AssistantActivity.instance() == null) {
+			apply.setEnabled(true);
+			return;
+		}
 		if (status.equals(LinphoneAccountCreator.Status.ErrorServer)) {
 			LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(LinphoneAccountCreator.Status.Failed), AssistantActivity.instance());
 			apply.setEnabled(true);
@@ -369,6 +377,10 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 
 	@Override
 	public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {
+		if (AssistantActivity.instance() == null) {
+			apply.setEnabled(true);
+			return;
+		}
 		if (status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAccount) || status.equals(LinphoneAccountCreator.Status.PhoneNumberUsedAlias)) {
 			accountCreator.recoverPhoneAccount();
 		} else {
diff --git a/submodules/linphone b/submodules/linphone
index 19007584c..0a88099a5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 19007584c4d7e93b18b525285de24da209e27afe
+Subproject commit 0a88099a5a52fdf6f97a405d51b1ee48edde16e9