mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved Linphone login adding automatically default domain to username if not entered by user

Browse source
This commit is contained in:
Sylvain Berfini 2024-04-24 13:35:50 +02:00
parent 6ceee7fdb7
commit 9c855ef923
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
View file

@ -132,8 +132,22 @@ open class AccountLoginViewModel @UiThread constructor() : ViewModel() {
coreContext.postOnCoreThread { core ->
core.loadConfigFromXml(corePreferences.linphoneDefaultValuesPath)
val identity = sipIdentity.value.orEmpty().trim()
val identityAddress = core.interpretUrl(identity, false)
val userInput = sipIdentity.value.orEmpty().trim()
val defaultDomain = corePreferences.defaultDomain
val identity = if (userInput.startsWith("sip:")) {
if (userInput.contains("@")) {
userInput
} else {
"$userInput@$defaultDomain"
}
} else {
if (userInput.contains("@")) {
"sip:$userInput"
} else {
"sip:$userInput@$defaultDomain"
}
}
val identityAddress = Factory.instance().createAddress(identity)
if (identityAddress == null) {
Log.e("$TAG Can't parse [$identity] as Address!")
// TODO: show error
@ -185,6 +199,9 @@ open class AccountLoginViewModel @UiThread constructor() : ViewModel() {
registrationInProgress.postValue(true)
core.addListener(coreListener)
Log.i(
"$TAG Trying to log in account with SIP identity [${identityAddress.asStringUriOnly()}]"
)
core.addAccount(newlyCreatedAccount)
}
}