Fix merge

This commit is contained in:
Erwan Croze 2017-07-25 17:11:44 +02:00
parent 657c729eb7
commit 6b0e06782e
2 changed files with 1 additions and 1 deletions

View file

@ -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;

View file

@ -548,6 +548,7 @@ private static AssistantActivity instance;
if (!newAccount) {
displayRegistrationInProgressDialog();
}
accountCreated = true;
} catch (LinphoneCoreException e) {
Log.e(e);
}