From 2fe1bcbdffbd82860ca96acb445b1cf670ccf3e3 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 4 Sep 2023 14:22:09 +0200
Subject: [PATCH] Started account creation

---
 app/src/main/AndroidManifest.xml              |   2 +-
 .../ui/assistant/fragment/LoginFragment.kt    |  24 +-
 .../RegisterCodeConfirmationFragment.kt       | 100 +++++
 .../ui/assistant/fragment/RegisterFragment.kt |  79 +++-
 .../model/ConfirmPhoneNumberDialogModel.kt    |  46 ++
 .../viewmodel/AccountCreationViewModel.kt     | 409 ++++++++++++++++++
 ...tViewModel.kt => AccountLoginViewModel.kt} |  23 +-
 .../org/linphone/utils/DataBindingUtils.kt    |  35 ++
 .../java/org/linphone/utils/DialogUtils.kt    |  18 +
 .../org/linphone/utils/PhoneNumberUtils.kt    |  23 +
 .../assistant_sms_confirmation_code_color.xml |   5 +
 .../res/drawable/confirm_sms_code_illu.png    | Bin 0 -> 18364 bytes
 app/src/main/res/drawable/separator.xml       |  13 +
 .../shape_assistant_sms_code_confirmation.xml |   7 +
 .../shape_edit_text_error_background.xml      |   6 +
 .../res/layout/assistant_login_fragment.xml   |   9 +-
 ...ant_register_confirm_sms_code_fragment.xml | 194 +++++++++
 .../layout/assistant_register_fragment.xml    | 100 ++++-
 ...nt_create_account_confirm_phone_number.xml | 126 ++++++
 .../res/navigation/assistant_nav_graph.xml    |  26 +-
 20 files changed, 1220 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/java/org/linphone/ui/assistant/fragment/RegisterCodeConfirmationFragment.kt
 create mode 100644 app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt
 create mode 100644 app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
 rename app/src/main/java/org/linphone/ui/assistant/viewmodel/{AssistantViewModel.kt => AccountLoginViewModel.kt} (86%)
 create mode 100644 app/src/main/res/color/assistant_sms_confirmation_code_color.xml
 create mode 100644 app/src/main/res/drawable/confirm_sms_code_illu.png
 create mode 100644 app/src/main/res/drawable/separator.xml
 create mode 100644 app/src/main/res/drawable/shape_assistant_sms_code_confirmation.xml
 create mode 100644 app/src/main/res/drawable/shape_edit_text_error_background.xml
 create mode 100644 app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
 create mode 100644 app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index edf5c21fd..c185168d8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 
     <!-- Needed for full screen intent in incoming call notifications -->
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <!-- To vibrate when pressing DTMF keys on numpad & incoming calls -->
+    <!-- To vibrate while receiving an incoming call -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <!-- Needed for foreground service
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
index 9114bf21a..b20b6d588 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/LoginFragment.kt
@@ -19,6 +19,8 @@
  */
 package org.linphone.ui.assistant.fragment
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -27,10 +29,13 @@ import androidx.annotation.UiThread
 import androidx.core.content.ContextCompat
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.navGraphViewModels
+import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
+import org.linphone.core.tools.Log
 import org.linphone.databinding.AssistantLoginFragmentBinding
-import org.linphone.ui.assistant.viewmodel.AssistantViewModel
+import org.linphone.ui.assistant.viewmodel.AccountLoginViewModel
 import org.linphone.ui.main.fragment.GenericFragment
+import org.linphone.utils.PhoneNumberUtils
 
 @UiThread
 class LoginFragment : GenericFragment() {
@@ -40,7 +45,7 @@ class LoginFragment : GenericFragment() {
 
     private lateinit var binding: AssistantLoginFragmentBinding
 
-    private val viewModel: AssistantViewModel by navGraphViewModels(
+    private val viewModel: AccountLoginViewModel by navGraphViewModels(
         R.id.loginFragment
     )
 
@@ -72,6 +77,16 @@ class LoginFragment : GenericFragment() {
             findNavController().navigate(action)
         }
 
+        binding.setForgottenPasswordClickListener {
+            try {
+                val url = "https://subscribe.linphone.org"
+                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                startActivity(browserIntent)
+            } catch (ise: IllegalStateException) {
+                Log.e("$TAG Can't start ACTION_VIEW intent, IllegalStateException: $ise")
+            }
+        }
+
         binding.setQrCodeClickListener {
             val action = LoginFragmentDirections.actionLoginFragmentToQrCodeScannerFragment()
             findNavController().navigate(action)
@@ -87,6 +102,11 @@ class LoginFragment : GenericFragment() {
                 goBack()
             }
         }
+
+        coreContext.postOnCoreThread {
+            val prefix = PhoneNumberUtils.getDeviceInternationalPrefix(requireContext())
+            viewModel.internationalPrefix.postValue(prefix)
+        }
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterCodeConfirmationFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterCodeConfirmationFragment.kt
new file mode 100644
index 000000000..d80d4f478
--- /dev/null
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterCodeConfirmationFragment.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2010-2023 Belledonne Communications SARL.
+ *
+ * This file is part of linphone-android
+ * (see https://www.linphone.org).
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+package org.linphone.ui.assistant.fragment
+
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.UiThread
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.navGraphViewModels
+import org.linphone.R
+import org.linphone.core.tools.Log
+import org.linphone.databinding.AssistantRegisterConfirmSmsCodeFragmentBinding
+import org.linphone.ui.assistant.viewmodel.AccountCreationViewModel
+import org.linphone.ui.main.fragment.GenericFragment
+
+@UiThread
+class RegisterCodeConfirmationFragment : GenericFragment() {
+    companion object {
+        private const val TAG = "[Register Code Confirmation Fragment]"
+    }
+
+    private lateinit var binding: AssistantRegisterConfirmSmsCodeFragmentBinding
+
+    private val viewModel: AccountCreationViewModel by navGraphViewModels(
+        R.id.registerCodeConfirmationFragment
+    )
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = AssistantRegisterConfirmSmsCodeFragmentBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun goBack() {
+        findNavController().popBackStack()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.lifecycleOwner = viewLifecycleOwner
+        binding.viewModel = viewModel
+
+        binding.setBackClickListener {
+            goBack()
+        }
+
+        viewModel.goToLoginPageEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                Log.i("$TAG Going to login fragment")
+                val action = RegisterCodeConfirmationFragmentDirections.actionRegisterCodeConfirmationFragmentToLoginFragment()
+                findNavController().navigate(action)
+            }
+        }
+
+        // This won't work starting Android 10 as clipboard access is denied unless app has focus,
+        // which won't be the case when the SMS arrives unless it is added into clipboard from a notification
+        val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        clipboard.addPrimaryClipChangedListener {
+            val data = clipboard.primaryClip
+            if (data != null && data.itemCount > 0) {
+                val clip = data.getItemAt(0).text.toString()
+                if (clip.length == 4) {
+                    Log.i(
+                        "$TAG Found 4 digits [$clip] as primary clip in clipboard, using it and clear it"
+                    )
+                    viewModel.smsCodeFirstDigit.value = clip[0].toString()
+                    viewModel.smsCodeSecondDigit.value = clip[1].toString()
+                    viewModel.smsCodeThirdDigit.value = clip[2].toString()
+                    viewModel.smsCodeLastDigit.value = clip[3].toString()
+                    clipboard.clearPrimaryClip()
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
index 5ea6fd233..9d8bc0889 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
@@ -22,14 +22,23 @@ package org.linphone.ui.assistant.fragment
 import android.content.Intent
 import android.net.Uri
 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 androidx.annotation.UiThread
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.navGraphViewModels
+import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.R
 import org.linphone.core.tools.Log
 import org.linphone.databinding.AssistantRegisterFragmentBinding
+import org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel
+import org.linphone.ui.assistant.viewmodel.AccountCreationViewModel
 import org.linphone.ui.main.fragment.GenericFragment
+import org.linphone.utils.DialogUtils
+import org.linphone.utils.PhoneNumberUtils
 
 @UiThread
 class RegisterFragment : GenericFragment() {
@@ -39,6 +48,10 @@ class RegisterFragment : GenericFragment() {
 
     private lateinit var binding: AssistantRegisterFragmentBinding
 
+    private val viewModel: AccountCreationViewModel by navGraphViewModels(
+        R.id.registerFragment
+    )
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -56,6 +69,7 @@ class RegisterFragment : GenericFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.lifecycleOwner = viewLifecycleOwner
+        binding.viewModel = viewModel
 
         binding.setBackClickListener {
             goBack()
@@ -65,6 +79,10 @@ class RegisterFragment : GenericFragment() {
             goBack()
         }
 
+        binding.setShowCountryPickerClickListener {
+            // TODO FIXME
+        }
+
         binding.setOpenSubscribeWebPageClickListener {
             try {
                 val url = "https://subscribe.linphone.org"
@@ -75,7 +93,66 @@ class RegisterFragment : GenericFragment() {
             }
         }
 
-        binding.setCreateClickListener {
+        binding.username.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                viewModel.usernameError.value = ""
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        })
+
+        binding.phoneNumber.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                viewModel.phoneNumberError.value = ""
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        })
+
+        viewModel.normalizedPhoneNumberEvent.observe(viewLifecycleOwner) {
+            it.consume { number ->
+                showPhoneNumberConfirmationDialog(number)
+            }
+        }
+
+        viewModel.goToSmsCodeConfirmationViewEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                Log.i("$TAG Going to SMS code confirmation fragment")
+                val action = RegisterFragmentDirections.actionRegisterFragmentToRegisterCodeConfirmationFragment()
+                findNavController().navigate(action)
+            }
+        }
+
+        coreContext.postOnCoreThread {
+            val prefix = PhoneNumberUtils.getDeviceInternationalPrefix(requireContext())
+            viewModel.internationalPrefix.postValue("+$prefix")
         }
     }
+
+    private fun showPhoneNumberConfirmationDialog(number: String) {
+        val model = ConfirmPhoneNumberDialogModel(number)
+        val dialog = DialogUtils.getAccountCreationPhoneNumberConfirmationDialog(
+            requireActivity(),
+            model
+        )
+
+        model.dismissEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                dialog.dismiss()
+            }
+        }
+
+        model.confirmPhoneNumberEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                viewModel.requestToken()
+                dialog.dismiss()
+            }
+        }
+
+        dialog.show()
+    }
 }
diff --git a/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt b/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt
new file mode 100644
index 000000000..022bc63de
--- /dev/null
+++ b/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010-2023 Belledonne Communications SARL.
+ *
+ * This file is part of linphone-android
+ * (see https://www.linphone.org).
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+package org.linphone.ui.assistant.model
+
+import androidx.annotation.UiThread
+import androidx.lifecycle.MutableLiveData
+import org.linphone.utils.Event
+
+class ConfirmPhoneNumberDialogModel @UiThread constructor(phoneNumber: String) {
+    val message = MutableLiveData<String>()
+
+    val dismissEvent = MutableLiveData<Event<Boolean>>()
+
+    val confirmPhoneNumberEvent = MutableLiveData<Event<Boolean>>()
+
+    init {
+        message.value = "Are you sure you want to use $phoneNumber phone number?"
+    }
+
+    @UiThread
+    fun dismiss() {
+        dismissEvent.value = Event(true)
+    }
+
+    @UiThread
+    fun confirmPhoneNumber() {
+        confirmPhoneNumberEvent.value = Event(true)
+    }
+}
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
new file mode 100644
index 000000000..a0db119c2
--- /dev/null
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
@@ -0,0 +1,409 @@
+/*
+ * Copyright (c) 2010-2023 Belledonne Communications SARL.
+ *
+ * This file is part of linphone-android
+ * (see https://www.linphone.org).
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+package org.linphone.ui.assistant.viewmodel
+
+import androidx.annotation.UiThread
+import androidx.annotation.WorkerThread
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.json.JSONException
+import org.json.JSONObject
+import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.core.AccountCreator
+import org.linphone.core.AccountCreatorListenerStub
+import org.linphone.core.Core
+import org.linphone.core.CoreListenerStub
+import org.linphone.core.tools.Log
+import org.linphone.utils.Event
+
+class AccountCreationViewModel @UiThread constructor() : ViewModel() {
+    companion object {
+        private const val TAG = "[Account Creation ViewModel]"
+    }
+
+    val username = MutableLiveData<String>()
+
+    val usernameError = MutableLiveData<String>()
+
+    val password = MutableLiveData<String>()
+
+    val phoneNumber = MutableLiveData<String>()
+
+    val phoneNumberError = MutableLiveData<String>()
+
+    val internationalPrefix = MutableLiveData<String>()
+
+    val showPassword = MutableLiveData<Boolean>()
+
+    val createEnabled = MediatorLiveData<Boolean>()
+
+    val smsCodeFirstDigit = MutableLiveData<String>()
+    val smsCodeSecondDigit = MutableLiveData<String>()
+    val smsCodeThirdDigit = MutableLiveData<String>()
+    val smsCodeLastDigit = MutableLiveData<String>()
+
+    val operationInProgress = MutableLiveData<Boolean>()
+
+    val normalizedPhoneNumberEvent = MutableLiveData<Event<String>>()
+
+    val goToSmsCodeConfirmationViewEvent = MutableLiveData<Event<Boolean>>()
+
+    val goToLoginPageEvent = MutableLiveData<Event<Boolean>>()
+
+    private var waitingForFlexiApiPushToken = false
+    private var waitForPushJob: Job? = null
+
+    private lateinit var accountCreator: AccountCreator
+
+    private val accountCreatorListener = object : AccountCreatorListenerStub() {
+        @WorkerThread
+        override fun onIsAccountExist(
+            creator: AccountCreator,
+            status: AccountCreator.Status,
+            response: String?
+        ) {
+            Log.i("$TAG onIsAccountExist status [$status] ($response)")
+
+            when (status) {
+                AccountCreator.Status.AccountExist, AccountCreator.Status.AccountExistWithAlias -> {
+                    operationInProgress.postValue(false)
+                    createEnabled.postValue(false)
+                    usernameError.postValue("Account already exists")
+                }
+                AccountCreator.Status.AccountNotExist -> {
+                    operationInProgress.postValue(false)
+                    checkPhoneNumber()
+                }
+                else -> {
+                    operationInProgress.postValue(false)
+                    createEnabled.postValue(false)
+                    phoneNumberError.postValue(status.name)
+                }
+            }
+        }
+
+        @WorkerThread
+        override fun onIsAliasUsed(
+            creator: AccountCreator,
+            status: AccountCreator.Status,
+            response: String?
+        ) {
+            Log.i("$TAG onIsAliasUsed status [$status] ($response)")
+            when (status) {
+                AccountCreator.Status.AliasExist, AccountCreator.Status.AliasIsAccount -> {
+                    operationInProgress.postValue(false)
+                    createEnabled.postValue(false)
+                    phoneNumberError.postValue("Phone number already used")
+                }
+                AccountCreator.Status.AliasNotExist -> {
+                    operationInProgress.postValue(false)
+                    createAccount()
+                }
+                else -> {
+                    operationInProgress.postValue(false)
+                    createEnabled.postValue(false)
+                    phoneNumberError.postValue(status.name)
+                }
+            }
+        }
+
+        @WorkerThread
+        override fun onCreateAccount(
+            creator: AccountCreator,
+            status: AccountCreator.Status,
+            response: String?
+        ) {
+            Log.i("$TAG onCreateAccount status [$status] ($response)")
+            operationInProgress.postValue(false)
+
+            when (status) {
+                AccountCreator.Status.AccountCreated -> {
+                    goToSmsCodeConfirmationViewEvent.postValue(Event(true))
+                }
+                else -> {
+                    // TODO
+                }
+            }
+        }
+
+        @WorkerThread
+        override fun onActivateAccount(
+            creator: AccountCreator,
+            status: AccountCreator.Status,
+            response: String?
+        ) {
+            Log.i("$TAG onActivateAccount status [$status] ($response)")
+            operationInProgress.postValue(false)
+
+            if (status == AccountCreator.Status.AccountActivated) {
+                Log.i("$TAG Account has been successfully activated, going to login page")
+                goToLoginPageEvent.postValue(Event(true))
+            } else {
+                // TODO
+            }
+        }
+    }
+
+    private val coreListener = object : CoreListenerStub() {
+        @WorkerThread
+        override fun onPushNotificationReceived(core: Core, payload: String?) {
+            Log.i("$TAG Push received: [$payload]")
+
+            val data = payload.orEmpty()
+            if (data.isNotEmpty()) {
+                try {
+                    // This is because JSONObject.toString() done by the SDK will result in payload looking like {"custom-payload":"{\"token\":\"value\"}"}
+                    val cleanPayload = data
+                        .replace("\\\"", "\"")
+                        .replace("\"{", "{")
+                        .replace("}\"", "}")
+                    Log.i("$TAG Cleaned payload is: [$cleanPayload]")
+
+                    val json = JSONObject(cleanPayload)
+                    val customPayload = json.getJSONObject("custom-payload")
+                    if (customPayload.has("token")) {
+                        waitForPushJob?.cancel()
+                        waitingForFlexiApiPushToken = false
+                        operationInProgress.postValue(false)
+
+                        val token = customPayload.getString("token")
+                        if (token.isNotEmpty()) {
+                            Log.i("$TAG Extracted token [$token] from push payload")
+                            accountCreator.token = token
+                            checkUsername()
+                        } else {
+                            Log.e("$TAG Push payload JSON object has an empty 'token'!")
+                            onFlexiApiTokenRequestError()
+                        }
+                    } else {
+                        Log.e("$TAG Push payload JSON object has no 'token' key!")
+                        onFlexiApiTokenRequestError()
+                    }
+                } catch (e: JSONException) {
+                    Log.e("$TAG Exception trying to parse push payload as JSON: [$e]")
+                    onFlexiApiTokenRequestError()
+                }
+            } else {
+                Log.e("$TAG Push payload is null or empty, can't extract auth token!")
+                onFlexiApiTokenRequestError()
+            }
+        }
+    }
+
+    init {
+        coreContext.postOnCoreThread { core ->
+            accountCreator = core.createAccountCreator(core.accountCreatorUrl)
+            accountCreator.addListener(accountCreatorListener)
+            core.addListener(coreListener)
+        }
+
+        showPassword.value = false
+
+        createEnabled.addSource(username) {
+            createEnabled.value = isCreateButtonEnabled()
+        }
+        createEnabled.addSource(password) {
+            createEnabled.value = isCreateButtonEnabled()
+        }
+        createEnabled.addSource(internationalPrefix) {
+            createEnabled.value = isCreateButtonEnabled()
+        }
+        createEnabled.addSource(phoneNumber) {
+            createEnabled.value = isCreateButtonEnabled()
+        }
+    }
+
+    @UiThread
+    override fun onCleared() {
+        coreContext.postOnCoreThread { core ->
+            if (::accountCreator.isInitialized) {
+                accountCreator.removeListener(accountCreatorListener)
+            }
+            core.removeListener(coreListener)
+        }
+        waitForPushJob?.cancel()
+
+        super.onCleared()
+    }
+
+    @UiThread
+    fun confirmPhoneNumber() {
+        coreContext.postOnCoreThread {
+            if (::accountCreator.isInitialized) {
+                val prefix = internationalPrefix.value.orEmpty()
+                val digitsPrefix = if (prefix.startsWith("+")) {
+                    prefix.substring(1)
+                } else {
+                    prefix
+                }
+                val number = phoneNumber.value.orEmpty()
+                accountCreator.setPhoneNumber(number, digitsPrefix)
+
+                val normalizedPhoneNumber = accountCreator.phoneNumber
+                if (!normalizedPhoneNumber.isNullOrEmpty()) {
+                    normalizedPhoneNumberEvent.postValue(Event(normalizedPhoneNumber))
+                } else {
+                    Log.e(
+                        "$TAG Failed to compute phone number using international prefix [$digitsPrefix] and number [$number]"
+                    )
+                    operationInProgress.postValue(false)
+                    phoneNumberError.postValue("Wrong international prefix / local phone number")
+                }
+            } else {
+                Log.e("$TAG Account creator hasn't been initialized!")
+            }
+        }
+    }
+
+    @UiThread
+    fun requestToken() {
+        coreContext.postOnCoreThread {
+            requestFlexiApiToken()
+        }
+    }
+
+    @UiThread
+    fun toggleShowPassword() {
+        showPassword.value = showPassword.value == false
+    }
+
+    @UiThread
+    private fun isCreateButtonEnabled(): Boolean {
+        return username.value.orEmpty().isNotEmpty() && password.value.orEmpty().isNotEmpty() && phoneNumber.value.orEmpty().isNotEmpty() && internationalPrefix.value.orEmpty().isNotEmpty()
+    }
+
+    @UiThread
+    fun validateCode() {
+        operationInProgress.value = true
+        val code = "${smsCodeFirstDigit.value}${smsCodeSecondDigit.value}${smsCodeThirdDigit.value}${smsCodeLastDigit.value}"
+        Log.i("$TAG Activating account using code [$code]")
+        accountCreator.activationCode = code
+
+        coreContext.postOnCoreThread {
+            val status = accountCreator.activateAccount()
+            Log.i("$TAG activateAccount returned $status")
+            if (status != AccountCreator.Status.RequestOk) {
+                Log.e("$TAG Can't activate account [$status]")
+                operationInProgress.postValue(false)
+            }
+        }
+    }
+
+    @WorkerThread
+    private fun checkUsername() {
+        usernameError.postValue("")
+        accountCreator.username = username.value.orEmpty()
+
+        operationInProgress.postValue(true)
+        val status = accountCreator.isAccountExist
+        Log.i("$TAG isAccountExist returned $status")
+        if (status != AccountCreator.Status.RequestOk) {
+            Log.e("$TAG Can't check if account already exists [$status]")
+            operationInProgress.postValue(false)
+        }
+    }
+
+    @WorkerThread
+    private fun checkPhoneNumber() {
+        operationInProgress.postValue(true)
+
+        val status = accountCreator.isAliasUsed
+        Log.i("$TAG isAliasUsed returned $status")
+        if (status != AccountCreator.Status.RequestOk) {
+            Log.e("$TAG Can't check if phone number is already used [$status]")
+            operationInProgress.postValue(false)
+        }
+    }
+
+    @WorkerThread
+    private fun createAccount() {
+        operationInProgress.postValue(true)
+        accountCreator.password = password.value.orEmpty()
+        val status = accountCreator.createAccount()
+
+        Log.i("$TAG createAccount returned $status")
+        if (status != AccountCreator.Status.RequestOk) {
+            Log.e("$TAG Can't create account [$status]")
+            operationInProgress.postValue(false)
+        }
+    }
+
+    @WorkerThread
+    private fun requestFlexiApiToken() {
+        if (!coreContext.core.isPushNotificationAvailable) {
+            Log.e(
+                "$TAG Core says push notification aren't available, can't request a token from FlexiAPI"
+            )
+            onFlexiApiTokenRequestError()
+            return
+        }
+
+        val pushConfig = coreContext.core.pushNotificationConfig
+        if (pushConfig != null) {
+            Log.i(
+                "$TAG Found push notification info: provider [${pushConfig.provider}], param [${pushConfig.param}] and prid [${pushConfig.prid}]"
+            )
+            accountCreator.pnProvider = pushConfig.provider
+            accountCreator.pnParam = pushConfig.param
+            accountCreator.pnPrid = pushConfig.prid
+
+            // Request an auth token, will be sent by push
+            val result = accountCreator.requestAuthToken()
+            if (result == AccountCreator.Status.RequestOk) {
+                val waitFor = 5000
+                waitingForFlexiApiPushToken = true
+                waitForPushJob?.cancel()
+
+                Log.i("$TAG Waiting push with auth token for $waitFor ms")
+                waitForPushJob = viewModelScope.launch {
+                    withContext(Dispatchers.IO) {
+                        delay(waitFor.toLong())
+                    }
+                    withContext(Dispatchers.Main) {
+                        if (waitingForFlexiApiPushToken) {
+                            waitingForFlexiApiPushToken = false
+                            Log.e("$TAG Auth token wasn't received by push in $waitFor ms")
+                            onFlexiApiTokenRequestError()
+                        }
+                    }
+                }
+            } else {
+                Log.e("$TAG Failed to require a push with an auth token: [$result]")
+                onFlexiApiTokenRequestError()
+            }
+        } else {
+            Log.e("$TAG No push configuration object in Core, shouldn't happen!")
+            onFlexiApiTokenRequestError()
+        }
+    }
+
+    @WorkerThread
+    private fun onFlexiApiTokenRequestError() {
+        Log.e("$TAG Flexi API token request by push error!")
+        operationInProgress.postValue(false)
+    }
+}
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AssistantViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
similarity index 86%
rename from app/src/main/java/org/linphone/ui/assistant/viewmodel/AssistantViewModel.kt
rename to app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
index 53eedeb8c..9ee3546c4 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AssistantViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
@@ -35,14 +35,17 @@ import org.linphone.core.RegistrationState
 import org.linphone.core.tools.Log
 import org.linphone.utils.Event
 
-class AssistantViewModel @UiThread constructor() : ViewModel() {
+class AccountLoginViewModel @UiThread constructor() : ViewModel() {
     companion object {
-        private const val TAG = "[Assistant ViewModel]"
+        private const val TAG = "[Account Login ViewModel]"
     }
+
     val username = MutableLiveData<String>()
 
     val password = MutableLiveData<String>()
 
+    val internationalPrefix = MutableLiveData<String>()
+
     val showPassword = MutableLiveData<Boolean>()
 
     val loginEnabled = MediatorLiveData<Boolean>()
@@ -119,9 +122,21 @@ class AssistantViewModel @UiThread constructor() : ViewModel() {
             val accountParams = core.createAccountParams()
             val identityAddress = Factory.instance().createAddress("sip:$user@$domain")
             accountParams.identityAddress = identityAddress
-            newlyCreatedAccount = core.createAccount(accountParams)
 
-            // TODO: set international prefix if detected
+            val prefix = internationalPrefix.value.orEmpty()
+            if (prefix.isNotEmpty()) {
+                val prefixDigits = if (prefix.startsWith("+")) {
+                    prefix.substring(1)
+                } else {
+                    prefix
+                }
+                if (prefixDigits.isNotEmpty()) {
+                    Log.i("$TAG Setting international prefix [$prefixDigits] in account params")
+                    accountParams.internationalPrefix = prefixDigits
+                }
+            }
+
+            newlyCreatedAccount = core.createAccount(accountParams)
 
             registrationInProgress.postValue(true)
             core.addListener(coreListener)
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index b5f65a2a6..affc759b6 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -26,7 +26,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
+import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
 import android.widget.ImageView
 import androidx.annotation.ColorInt
 import androidx.annotation.UiThread
@@ -326,3 +328,36 @@ fun setInflatedViewStubLifecycleOwner(view: View, enable: Boolean) {
         binding?.lifecycleOwner = view.context as? LifecycleOwner
     }
 }
+
+@BindingAdapter("focusNextOnInput")
+fun focusNextOnInput(editText: EditText, enabled: Boolean) {
+    if (!enabled) return
+
+    editText.addTextChangedListener(object : TextWatcher {
+        override fun afterTextChanged(s: Editable?) {
+            if (!s.isNullOrEmpty()) {
+                editText.onEditorAction(EditorInfo.IME_ACTION_NEXT)
+            }
+        }
+
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+    })
+}
+
+@BindingAdapter("validateOnInput")
+fun validateOnInput(editText: EditText, onValidate: () -> (Unit)) {
+    editText.addTextChangedListener(object : TextWatcher {
+        override fun afterTextChanged(s: Editable?) {
+            if (!s.isNullOrEmpty()) {
+                editText.onEditorAction(EditorInfo.IME_ACTION_DONE)
+                onValidate.invoke()
+            }
+        }
+
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+    })
+}
diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt
index 8aa58ac98..30e14f697 100644
--- a/app/src/main/java/org/linphone/utils/DialogUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt
@@ -31,12 +31,14 @@ import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import org.linphone.R
+import org.linphone.databinding.DialogAssistantCreateAccountConfirmPhoneNumberBinding
 import org.linphone.databinding.DialogCancelContactChangesBinding
 import org.linphone.databinding.DialogConfirmZrtpSasBinding
 import org.linphone.databinding.DialogContactConfirmTrustCallBinding
 import org.linphone.databinding.DialogContactTrustProcessBinding
 import org.linphone.databinding.DialogPickNumberOrAddressBinding
 import org.linphone.databinding.DialogRemoveAllCallLogsBinding
+import org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel
 import org.linphone.ui.main.calls.model.ConfirmationDialogModel
 import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
 import org.linphone.ui.main.contacts.model.TrustCallDialogModel
@@ -44,6 +46,22 @@ import org.linphone.ui.voip.model.ZrtpSasConfirmationDialogModel
 
 class DialogUtils {
     companion object {
+        @UiThread
+        fun getAccountCreationPhoneNumberConfirmationDialog(
+            context: Context,
+            viewModel: ConfirmPhoneNumberDialogModel
+        ): Dialog {
+            val binding: DialogAssistantCreateAccountConfirmPhoneNumberBinding = DataBindingUtil.inflate(
+                LayoutInflater.from(context),
+                R.layout.dialog_assistant_create_account_confirm_phone_number,
+                null,
+                false
+            )
+            binding.viewModel = viewModel
+
+            return getDialog(context, binding)
+        }
+
         @UiThread
         fun getNumberOrAddressPickerDialog(
             context: Context,
diff --git a/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt b/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt
index ef44a5be8..9fdc999f0 100644
--- a/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt
+++ b/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt
@@ -19,12 +19,35 @@
  */
 package org.linphone.utils
 
+import android.content.Context
 import android.content.res.Resources
 import android.provider.ContactsContract
+import android.telephony.TelephonyManager
 import androidx.annotation.AnyThread
+import androidx.annotation.WorkerThread
+import org.linphone.core.Factory
+import org.linphone.core.tools.Log
 
 class PhoneNumberUtils {
     companion object {
+        private const val TAG = "[Phone Number Utils]"
+
+        @WorkerThread
+        fun getDeviceInternationalPrefix(context: Context): String? {
+            val telephonyManager = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+            val countryIso = telephonyManager.networkCountryIso
+            for (dp in Factory.instance().dialPlans) {
+                if (dp.isoCountryCode.equals(countryIso, true)) {
+                    val prefix = dp.countryCallingCode
+                    Log.i(
+                        "$TAG Found matching entry [$prefix] in dialplan for network country iso [$countryIso]"
+                    )
+                    return prefix
+                }
+            }
+            return null
+        }
+
         @AnyThread
         fun addressBookLabelTypeToVcardParamString(type: Int, default: String?): String {
             return when (type) {
diff --git a/app/src/main/res/color/assistant_sms_confirmation_code_color.xml b/app/src/main/res/color/assistant_sms_confirmation_code_color.xml
new file mode 100644
index 000000000..46e40e914
--- /dev/null
+++ b/app/src/main/res/color/assistant_sms_confirmation_code_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:color="@color/primary_color" />
+    <item android:color="@color/gray_1"/>
+</selector>
diff --git a/app/src/main/res/drawable/confirm_sms_code_illu.png b/app/src/main/res/drawable/confirm_sms_code_illu.png
new file mode 100644
index 0000000000000000000000000000000000000000..e25974c02e227acb5c0c169c8ae0250cec0c6837
GIT binary patch
literal 18364
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
XI4yEpN4jd)00000NkvXXu0mjf535Sb

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/separator.xml b/app/src/main/res/drawable/separator.xml
new file mode 100644
index 000000000..cc7426e20
--- /dev/null
+++ b/app/src/main/res/drawable/separator.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="2dp"
+    android:height="28dp"
+    android:viewportWidth="2"
+    android:viewportHeight="28">
+    <path
+        android:name="path"
+        android:pathData="M 0.627 0 L 1.773 0 L 1.773 28 L 0.627 28 L 0.627 0 Z"
+        android:fillColor="#4e6074"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/shape_assistant_sms_code_confirmation.xml b/app/src/main/res/drawable/shape_assistant_sms_code_confirmation.xml
new file mode 100644
index 000000000..6401b0ec9
--- /dev/null
+++ b/app/src/main/res/drawable/shape_assistant_sms_code_confirmation.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="15dp" />
+    <size android:width="73dp" android:height="73dp" />
+    <solid android:color="@color/white" />
+    <stroke android:width="1dp" android:color="@color/assistant_sms_confirmation_code_color"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_edit_text_error_background.xml b/app/src/main/res/drawable/shape_edit_text_error_background.xml
new file mode 100644
index 000000000..ff2e4875f
--- /dev/null
+++ b/app/src/main/res/drawable/shape_edit_text_error_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="63dp" />
+    <solid android:color="@color/white"/>
+    <stroke android:width="1dp" android:color="@color/red_danger" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_login_fragment.xml b/app/src/main/res/layout/assistant_login_fragment.xml
index 223d47e8e..7a5687552 100644
--- a/app/src/main/res/layout/assistant_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_login_fragment.xml
@@ -12,6 +12,9 @@
         <variable
             name="registerClickListener"
             type="View.OnClickListener" />
+        <variable
+            name="forgottenPasswordClickListener"
+            type="View.OnClickListener" />
         <variable
             name="thirdPartySipAccountLoginClickListener"
             type="View.OnClickListener" />
@@ -20,7 +23,7 @@
             type="View.OnClickListener" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.assistant.viewmodel.AssistantViewModel" />
+            type="org.linphone.ui.assistant.viewmodel.AccountLoginViewModel" />
     </data>
 
     <ScrollView
@@ -97,6 +100,8 @@
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
                 android:background="@drawable/edit_text_background"
+                android:inputType="text"
+                android:hint="Username"
                 app:layout_constraintTop_toBottomOf="@id/username_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -128,6 +133,7 @@
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
                 android:background="@drawable/edit_text_background"
+                android:hint="Password"
                 android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                 app:layout_constraintTop_toBottomOf="@id/password_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -170,6 +176,7 @@
                 app:layout_constraintEnd_toEndOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{forgottenPasswordClickListener}"
                 style="@style/default_text_style_600"
                 android:id="@+id/forgotten_password"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
new file mode 100644
index 000000000..713ea9513
--- /dev/null
+++ b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="android.text.InputType" />
+        <variable
+            name="backClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.assistant.viewmodel.AccountCreationViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:onClick="@{backClickListener}"
+            android:id="@+id/back"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="@dimen/icon_size"
+            android:layout_marginTop="7dp"
+            android:layout_marginStart="15dp"
+            android:src="@drawable/caret_left"
+            app:tint="@color/gray_1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:src="@drawable/header"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/back"
+            app:layout_constraintBottom_toBottomOf="@id/title"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_800"
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="100dp"
+            android:paddingBottom="30dp"
+            android:text="Register"
+            android:textSize="20sp"
+            android:textColor="@color/white"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/message"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="100dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="We have sent a verification code on your phone number “06945345435”.\n\nPlease enter the verification code below:"
+            android:textSize="14sp"
+            android:textColor="@color/gray_9"
+            android:gravity="center_horizontal"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <ImageView
+            android:id="@+id/illu"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="100dp"
+            android:adjustViewBounds="true"
+            android:src="@drawable/confirm_sms_code_illu"
+            app:layout_constraintTop_toBottomOf="@id/wrong_number"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            focusNextOnInput="@{true}"
+            style="@style/default_text_style_300"
+            android:id="@+id/code_first_digit"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="32dp"
+            android:background="@drawable/shape_assistant_sms_code_confirmation"
+            android:text="@={viewModel.smsCodeFirstDigit, default=`1`}"
+            android:maxLength="1"
+            android:textColor="@color/assistant_sms_confirmation_code_color"
+            android:textSize="50sp"
+            android:textCursorDrawable="@color/transparent_color"
+            android:gravity="center"
+            android:inputType="number"
+            android:imeOptions="actionNext"
+            android:nextFocusDown="@id/code_second_digit"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toBottomOf="@id/message"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/code_second_digit" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            focusNextOnInput="@{true}"
+            style="@style/default_text_style_300"
+            android:id="@+id/code_second_digit"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="32dp"
+            android:background="@drawable/shape_assistant_sms_code_confirmation"
+            android:text="@={viewModel.smsCodeSecondDigit, default=`2`}"
+            android:maxLength="1"
+            android:textColor="@color/assistant_sms_confirmation_code_color"
+            android:textSize="50sp"
+            android:textCursorDrawable="@color/transparent_color"
+            android:gravity="center"
+            android:inputType="number"
+            android:imeOptions="actionNext"
+            android:nextFocusDown="@id/code_third_digit"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toBottomOf="@id/message"
+            app:layout_constraintStart_toEndOf="@id/code_first_digit"
+            app:layout_constraintEnd_toStartOf="@id/code_third_digit" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            focusNextOnInput="@{true}"
+            style="@style/default_text_style_300"
+            android:id="@+id/code_third_digit"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="32dp"
+            android:background="@drawable/shape_assistant_sms_code_confirmation"
+            android:text="@={viewModel.smsCodeThirdDigit, default=`3`}"
+            android:maxLength="1"
+            android:textColor="@color/assistant_sms_confirmation_code_color"
+            android:textSize="50sp"
+            android:textCursorDrawable="@color/transparent_color"
+            android:gravity="center"
+            android:inputType="number"
+            android:imeOptions="actionNext"
+            android:nextFocusDown="@id/code_last_digit"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toBottomOf="@id/message"
+            app:layout_constraintStart_toEndOf="@id/code_second_digit"
+            app:layout_constraintEnd_toStartOf="@id/code_last_digit" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            validateOnInput="@{() -> viewModel.validateCode()}"
+            style="@style/default_text_style_300"
+            android:id="@+id/code_last_digit"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="32dp"
+            android:background="@drawable/shape_assistant_sms_code_confirmation"
+            android:text="@={viewModel.smsCodeLastDigit, default=`4`}"
+            android:maxLength="1"
+            android:textColor="@color/assistant_sms_confirmation_code_color"
+            android:textSize="50sp"
+            android:textCursorDrawable="@color/transparent_color"
+            android:gravity="center"
+            android:inputType="number"
+            android:imeOptions="actionDone"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toBottomOf="@id/message"
+            app:layout_constraintStart_toEndOf="@id/code_third_digit"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_600"
+            android:id="@+id/wrong_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="51dp"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:text="Wrong number?"
+            android:textSize="13sp"
+            android:textColor="@color/secondary_button_label_color"
+            android:gravity="center"
+            android:background="@drawable/secondary_button_background"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/code_first_digit" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index 893ec776f..eb66470e9 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -5,11 +5,15 @@
 
     <data>
         <import type="android.view.View" />
+        <import type="android.text.InputType" />
         <variable
             name="backClickListener"
             type="View.OnClickListener" />
         <variable
-            name="createClickListener"
+            name="createAccountClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="showCountryPickerClickListener"
             type="View.OnClickListener" />
         <variable
             name="openSubscribeWebPageClickListener"
@@ -17,6 +21,9 @@
         <variable
             name="loginClickListener"
             type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.assistant.viewmodel.AccountCreationViewModel" />
     </data>
 
     <ScrollView
@@ -89,14 +96,29 @@
                 android:layout_marginEnd="16dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
-                android:text="John Doe"
+                android:text="@={viewModel.username, default=`johndoe`}"
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
-                android:background="@drawable/edit_text_background"
+                android:background="@{viewModel.usernameError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}"
+                android:inputType=""
+                android:hint="Username"
                 app:layout_constraintTop_toBottomOf="@id/username_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_600"
+                android:visibility="@{viewModel.usernameError.length() == 0 ? View.GONE : View.VISIBLE, default=gone}"
+                android:id="@+id/username_error"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@{viewModel.usernameError, default=`Error`}"
+                android:textSize="13sp"
+                android:textColor="@color/red_danger"
+                app:layout_constraintTop_toBottomOf="@id/username"
+                app:layout_constraintStart_toStartOf="@id/username"
+                app:layout_constraintEnd_toEndOf="@id/username"/>
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/phone_number_label"
                 style="@style/default_text_style_700"
@@ -108,7 +130,8 @@
                 android:text="Phone Number*"
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
-                app:layout_constraintTop_toBottomOf="@id/username"
+                android:inputType="text"
+                app:layout_constraintTop_toBottomOf="@id/username_error"
                 app:layout_constraintStart_toStartOf="parent"/>
 
             <androidx.appcompat.widget.AppCompatEditText
@@ -116,18 +139,52 @@
                 android:id="@+id/phone_number"
                 android:layout_width="0dp"
                 android:layout_height="50dp"
-                android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
+                android:paddingStart="90dp"
                 android:paddingEnd="20dp"
-                android:text="+33 6 01 02 03 04 05"
+                android:text="@={viewModel.phoneNumber, default=`6 01 02 03 04 05`}"
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
-                android:background="@drawable/edit_text_background"
+                android:background="@{viewModel.phoneNumberError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}"
+                android:inputType="phone"
+                android:drawableStart="@drawable/separator"
+                android:drawablePadding="10dp"
+                android:hint="Phone number"
                 app:layout_constraintTop_toBottomOf="@id/phone_number_label"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@id/prefix"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{showCountryPickerClickListener}"
+                style="@style/default_text_style"
+                android:id="@+id/prefix"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginStart="16dp"
+                android:paddingStart="20dp"
+                android:text="@{viewModel.internationalPrefix, default=`+33`}"
+                android:textSize="14sp"
+                android:textColor="@color/gray_9"
+                android:gravity="center_vertical"
+                android:drawableEnd="@drawable/caret_down"
+                android:drawablePadding="10dp"
+                app:layout_constraintTop_toTopOf="@id/phone_number"
+                app:layout_constraintBottom_toBottomOf="@id/phone_number"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_600"
+                android:visibility="@{viewModel.phoneNumberError.length() == 0 ? View.GONE : View.VISIBLE, default=gone}"
+                android:id="@+id/phone_number_error"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@{viewModel.phoneNumberError, default=`Error`}"
+                android:textSize="13sp"
+                android:textColor="@color/red_danger"
+                app:layout_constraintTop_toBottomOf="@id/prefix"
+                app:layout_constraintStart_toStartOf="@id/prefix"
+                app:layout_constraintEnd_toEndOf="@id/phone_number"/>
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/password_label"
                 style="@style/default_text_style_700"
@@ -139,7 +196,7 @@
                 android:text="Password*"
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
-                app:layout_constraintTop_toBottomOf="@id/phone_number"
+                app:layout_constraintTop_toBottomOf="@id/phone_number_error"
                 app:layout_constraintStart_toStartOf="parent"/>
 
             <androidx.appcompat.widget.AppCompatEditText
@@ -151,19 +208,32 @@
                 android:layout_marginEnd="16dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
-                android:text="John Doe"
+                android:text="@={viewModel.password, default=`johndoe`}"
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
                 android:background="@drawable/edit_text_background"
-                android:inputType="textPassword"
-                android:drawableEnd="@drawable/eye"
-                android:drawableTint="@color/gray_1"
+                android:hint="Password"
+                android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                 app:layout_constraintTop_toBottomOf="@id/password_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
+            <ImageView
+                android:onClick="@{() -> viewModel.toggleShowPassword()}"
+                android:id="@+id/eye"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="0dp"
+                android:padding="4dp"
+                android:layout_marginEnd="20dp"
+                android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
+                app:tint="@color/gray_1"
+                app:layout_constraintEnd_toEndOf="@id/password"
+                app:layout_constraintTop_toTopOf="@id/password"
+                app:layout_constraintBottom_toBottomOf="@id/password" />
+
             <androidx.appcompat.widget.AppCompatTextView
-                android:onClick="@{createClickListener}"
+                android:onClick="@{() -> viewModel.confirmPhoneNumber()}"
+                android:enabled="@{viewModel.createEnabled &amp;&amp; !viewModel.operationInProgress, default=false}"
                 style="@style/default_text_style_600"
                 android:id="@+id/create"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml b/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
new file mode 100644
index 000000000..4986a5d15
--- /dev/null
+++ b/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:onClick="@{() -> viewModel.dismiss()}"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="true"
+        android:focusable="true">
+
+        <ImageView
+            android:id="@+id/dialog_background_shadow"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:src="@drawable/shape_dialog_orange_shadow"
+            app:layout_constraintBottom_toBottomOf="@id/anchor"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintTop_toTopOf="@id/dialog_background" />
+
+        <ImageView
+            android:id="@+id/dialog_background"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="2dp"
+            android:src="@drawable/shape_dialog_background"
+            app:layout_constraintBottom_toBottomOf="@id/anchor"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_800"
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:paddingTop="@dimen/dialog_top_bottom_margin"
+            android:text="Confirm phone number"
+            android:textSize="16sp"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintBottom_toTopOf="@id/message"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/message"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginTop="10dp"
+            android:text="@{viewModel.message, default=`Are you sure you want to use this phone number?`}"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toTopOf="@id/cancel"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.dismiss()}"
+            style="@style/default_text_style_600"
+            android:id="@+id/cancel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
+            android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
+            android:gravity="center"
+            android:background="@drawable/secondary_button_background"
+            android:text="Cancel"
+            android:textSize="18sp"
+            android:textColor="@color/secondary_button_label_color"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/message"
+            app:layout_constraintBottom_toTopOf="@id/confirm"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirmPhoneNumber()}"
+            style="@style/default_text_style_600"
+            android:id="@+id/confirm"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
+            android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
+            android:gravity="center"
+            android:background="@drawable/primary_button_background"
+            android:text="Continue"
+            android:textSize="18sp"
+            android:textColor="@color/primary_button_label_color"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/cancel"
+            app:layout_constraintBottom_toTopOf="@id/anchor"/>
+
+        <View
+            android:id="@+id/anchor"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dialog_top_bottom_margin"
+            app:layout_constraintTop_toBottomOf="@id/confirm"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/assistant_nav_graph.xml b/app/src/main/res/navigation/assistant_nav_graph.xml
index b5055b548..c9b05ccef 100644
--- a/app/src/main/res/navigation/assistant_nav_graph.xml
+++ b/app/src/main/res/navigation/assistant_nav_graph.xml
@@ -40,7 +40,16 @@
         android:id="@+id/registerFragment"
         android:name="org.linphone.ui.assistant.fragment.RegisterFragment"
         android:label="RegisterFragment"
-        tools:layout="@layout/assistant_register_fragment" />
+        tools:layout="@layout/assistant_register_fragment" >
+        <action
+            android:id="@+id/action_registerFragment_to_registerCodeConfirmationFragment"
+            app:destination="@id/registerCodeConfirmationFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right"
+            app:launchSingleTop="true" />
+    </fragment>
 
     <fragment
         android:id="@+id/qrCodeScannerFragment"
@@ -54,4 +63,19 @@
         android:label="ThirdPartySipAccountLoginFragment"
         tools:layout="@layout/assistant_third_party_sip_account_login_fragment" />
 
+    <fragment
+        android:id="@+id/registerCodeConfirmationFragment"
+        android:name="org.linphone.ui.assistant.fragment.RegisterCodeConfirmationFragment"
+        android:label="RegisterCodeConfirmationFragment"
+        tools:layout="@layout/assistant_register_confirm_sms_code_fragment" >
+        <action
+            android:id="@+id/action_registerCodeConfirmationFragment_to_loginFragment"
+            app:destination="@id/loginFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right"
+            app:launchSingleTop="true" />
+    </fragment>
+
 </navigation>
\ No newline at end of file