Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add threePid: improve UI for phone numbers

Browse Source
This commit is contained in:
Benoit Marty 2020-08-31 14:46:05 +02:00
parent e92cf38cde
commit ee3e10a4b0
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
View File

@ -31,6 +31,7 @@ import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericButtonItem
import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.features.discovery.settingsContinueCancelItem
import im.vector.app.features.discovery.settingsInfoItem
import im.vector.app.features.discovery.settingsInformationItem
import im.vector.app.features.discovery.settingsSectionTitleItem
import im.vector.app.features.form.formEditTextItem
@ -149,6 +150,10 @@ class ThreePidsSettingsController @Inject constructor(
}
is ThreePidsSettingsState.AddingEmail -> Unit
is ThreePidsSettingsState.AddingPhoneNumber -> {
settingsInfoItem {
id("addingMsisdnInfo")
helperText(stringProvider.getString(R.string.login_msisdn_notice))
}
formEditTextItem {
id("addingMsisdn")
inputType(InputType.TYPE_CLASS_PHONE)

17
vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
View File

@ -94,15 +94,17 @@ class ThreePidsSettingsFragment @Inject constructor(
}
override fun doAddEmail(email: String) {
// Sanity
val safeEmail = email.trim().replace(" ", "")
viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(null)))
// Check that email is valid
if (!email.isEmail()) {
if (!safeEmail.isEmail()) {
viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingEmail(getString(R.string.auth_invalid_email))))
return
}
viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Email(email)))
viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Email(safeEmail)))
}
override fun addMsisdn() {
@ -110,9 +112,18 @@ class ThreePidsSettingsFragment @Inject constructor(
}
override fun doAddMsisdn(msisdn: String) {
// Sanity
val safeMsisdn = msisdn.trim().replace(" ", "")
viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(null)))
TODO("Not yet implemented")
// Check that phone number is valid
if (!msisdn.startsWith("+")) {
viewModel.handle(ThreePidsSettingsAction.ChangeState(ThreePidsSettingsState.AddingPhoneNumber(getString(R.string.login_msisdn_error_not_international))))
return
}
viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Msisdn(safeMsisdn)))
}
override fun cancelAdding() {

16
vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
View File

@ -155,7 +155,21 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
_viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalArgumentException(stringProvider.getString(R.string.auth_email_already_defined))))
} else {
viewModelScope.launch {
session.addThreePid(action.threePid, loadingCallback)
session.addThreePid(action.threePid, object : MatrixCallback<Unit> {
override fun onSuccess(data: Unit) {
// Also reset the state
setState {
copy(
state = ThreePidsSettingsState.Idle
)
}
loadingCallback.onSuccess(data)
}
override fun onFailure(failure: Throwable) {
loadingCallback.onFailure(failure)
}
})
}
}
}

1
vector/src/main/res/values/strings.xml
View File

@ -1951,6 +1951,7 @@
<string name="login_msisdn_confirm_send_again">Send again</string>
<string name="login_msisdn_confirm_submit">Next</string>
<string name="login_msisdn_notice">"Please use the international format (phone number must start with '+')"</string>
<string name="login_msisdn_error_not_international">"International phone numbers must start with '+'"</string>
<string name="login_msisdn_error_other">"Phone number seems invalid. Please check it"</string>