Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Quick fix to prevent registration process in case of error in accountCreator

Browse source
This commit is contained in:
Sylvain Berfini 2021-03-16 16:02:11 +01:00
parent e9abb5cef4
commit a03206bdd7
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
View file

@ -145,10 +145,21 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
fun login() { fun login() {
if (loginWithUsernamePassword.value == true) { if (loginWithUsernamePassword.value == true) {
accountCreator.username = username.value val result = accountCreator.setUsername(username.value)
accountCreator.password = password.value if (result != AccountCreator.UsernameStatus.Ok) {
Log.e("[Assistant] [Account Login] Error [${result.name}] setting the username: ${username.value}")
// TODO: show error
return
}
Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}") Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}")
val result2 = accountCreator.setPassword(password.value)
if (result2 != AccountCreator.PasswordStatus.Ok) {
Log.e("[Assistant] [Account Login] Error [${result2.name}] setting the password")
// TODO: show error
return
}
waitForServerAnswer.value = true waitForServerAnswer.value = true
coreContext.core.addListener(coreListener) coreContext.core.addListener(coreListener)
if (!createProxyConfig()) { if (!createProxyConfig()) {
@ -157,10 +168,22 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
// TODO: show error // TODO: show error
} }
} else { } else {
accountCreator.setPhoneNumber(phoneNumber.value, prefix.value) val result = accountCreator.setPhoneNumber(phoneNumber.value, prefix.value)
accountCreator.username = accountCreator.phoneNumber if (result != AccountCreator.PhoneNumberStatus.Ok.toInt()) {
Log.e("[Assistant] [Account Login] Error [$result] setting the phone number: ${phoneNumber.value} with prefix: ${prefix.value}")
// TODO: show error
return
}
Log.i("[Assistant] [Account Login] Phone number is ${accountCreator.phoneNumber}") Log.i("[Assistant] [Account Login] Phone number is ${accountCreator.phoneNumber}")
val result2 = accountCreator.setUsername(accountCreator.phoneNumber)
if (result2 != AccountCreator.UsernameStatus.Ok) {
Log.e("[Assistant] [Account Login] Error [${result2.name}] setting the username: ${accountCreator.phoneNumber}")
// TODO: show error
return
}
Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}")
waitForServerAnswer.value = true waitForServerAnswer.value = true
val status = accountCreator.recoverAccount() val status = accountCreator.recoverAccount()
Log.i("[Assistant] [Account Login] Recover account returned $status") Log.i("[Assistant] [Account Login] Recover account returned $status")