From 6b0e06782e3442af397c1360d80252cfad6cb0f2 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 25 Jul 2017 17:11:44 +0200
Subject: [PATCH] Fix merge

---
 src/android/org/linphone/ChatFragment.java                | 1 -
 src/android/org/linphone/assistant/AssistantActivity.java | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/android/org/linphone/ChatFragment.java b/src/android/org/linphone/ChatFragment.java
index 404231f71..b534e8f3d 100644
--- a/src/android/org/linphone/ChatFragment.java
+++ b/src/android/org/linphone/ChatFragment.java
@@ -75,7 +75,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.linphone.compatibility.Compatibility;
-import org.linphone.core.LinphoneAccountCreator;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneBuffer;
 import org.linphone.core.LinphoneChatMessage;
diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index 5e3ff02d2..0fa653f0e 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -548,6 +548,7 @@ private static AssistantActivity instance;
 			if (!newAccount) {
 				displayRegistrationInProgressDialog();
 			}
+			accountCreated = true;
 		} catch (LinphoneCoreException e) {
 			Log.e(e);
 		}