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

Display error to user in Linphone login assistant form

Browse source
This commit is contained in:
Sylvain Berfini 2021-03-16 16:25:14 +01:00
parent a03206bdd7
commit cc7befe62b
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,8 +39,10 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
val loginWithUsernamePassword = MutableLiveData<Boolean>() val loginWithUsernamePassword = MutableLiveData<Boolean>()
val username = MutableLiveData<String>() val username = MutableLiveData<String>()
val usernameError = MutableLiveData<String>()
val password = MutableLiveData<String>() val password = MutableLiveData<String>()
val passwordError = MutableLiveData<String>()
val loginEnabled: MediatorLiveData<Boolean> = MediatorLiveData() val loginEnabled: MediatorLiveData<Boolean> = MediatorLiveData()
@ -148,7 +150,7 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
val result = accountCreator.setUsername(username.value) val result = accountCreator.setUsername(username.value)
if (result != AccountCreator.UsernameStatus.Ok) { if (result != AccountCreator.UsernameStatus.Ok) {
Log.e("[Assistant] [Account Login] Error [${result.name}] setting the username: ${username.value}") Log.e("[Assistant] [Account Login] Error [${result.name}] setting the username: ${username.value}")
// TODO: show error usernameError.value = result.name
return return
} }
Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}") Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}")
@ -156,7 +158,7 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
val result2 = accountCreator.setPassword(password.value) val result2 = accountCreator.setPassword(password.value)
if (result2 != AccountCreator.PasswordStatus.Ok) { if (result2 != AccountCreator.PasswordStatus.Ok) {
Log.e("[Assistant] [Account Login] Error [${result2.name}] setting the password") Log.e("[Assistant] [Account Login] Error [${result2.name}] setting the password")
// TODO: show error passwordError.value = result2.name
return return
} }
@ -168,10 +170,10 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
// TODO: show error // TODO: show error
} }
} else { } else {
val result = accountCreator.setPhoneNumber(phoneNumber.value, prefix.value) val result = AccountCreator.PhoneNumberStatus.fromInt(accountCreator.setPhoneNumber(phoneNumber.value, prefix.value))
if (result != AccountCreator.PhoneNumberStatus.Ok.toInt()) { if (result != AccountCreator.PhoneNumberStatus.Ok) {
Log.e("[Assistant] [Account Login] Error [$result] setting the phone number: ${phoneNumber.value} with prefix: ${prefix.value}") Log.e("[Assistant] [Account Login] Error [$result] setting the phone number: ${phoneNumber.value} with prefix: ${prefix.value}")
// TODO: show error phoneNumberError.value = result.name
return return
} }
Log.i("[Assistant] [Account Login] Phone number is ${accountCreator.phoneNumber}") Log.i("[Assistant] [Account Login] Phone number is ${accountCreator.phoneNumber}")
@ -179,7 +181,7 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
val result2 = accountCreator.setUsername(accountCreator.phoneNumber) val result2 = accountCreator.setUsername(accountCreator.phoneNumber)
if (result2 != AccountCreator.UsernameStatus.Ok) { if (result2 != AccountCreator.UsernameStatus.Ok) {
Log.e("[Assistant] [Account Login] Error [${result2.name}] setting the username: ${accountCreator.phoneNumber}") Log.e("[Assistant] [Account Login] Error [${result2.name}] setting the username: ${accountCreator.phoneNumber}")
// TODO: show error usernameError.value = result2.name
return return
} }
Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}") Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}")

2
app/src/main/res/layout/assistant_account_login_fragment.xml
View file

@ -175,6 +175,7 @@
android:hint="@string/username"> android:hint="@string/username">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
errorMessage="@={viewModel.usernameError}"
android:text="@={viewModel.username}" android:text="@={viewModel.username}"
android:imeOptions="actionNext" android:imeOptions="actionNext"
android:singleLine="true" android:singleLine="true"
@ -192,6 +193,7 @@
android:hint="@string/password"> android:hint="@string/password">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
errorMessage="@={viewModel.passwordError}"
android:text="@={viewModel.password}" android:text="@={viewModel.password}"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:singleLine="true" android:singleLine="true"