diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt index d3442b06c..b5813bf6d 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt @@ -47,6 +47,8 @@ class ThirdPartySipAccountLoginViewModel @UiThread constructor() : GenericViewMo val username = MutableLiveData() + val authId = MutableLiveData() + val password = MutableLiveData() val domain = MutableLiveData() @@ -151,6 +153,7 @@ class ThirdPartySipAccountLoginViewModel @UiThread constructor() : GenericViewMo // Allow to enter SIP identity instead of simply username // in case identity domain doesn't match proxy domain val user = username.value.orEmpty().trim() + val userId = authId.value.orEmpty().trim() val identity = if (user.startsWith("sip:")) { if (user.contains("@")) { user @@ -168,7 +171,7 @@ class ThirdPartySipAccountLoginViewModel @UiThread constructor() : GenericViewMo newlyCreatedAuthInfo = Factory.instance().createAuthInfo( user, - null, + userId, password.value.orEmpty().trim(), null, null, diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml index cccacca15..23929507c 100644 --- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml +++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml @@ -94,6 +94,38 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> + + + + Nom d\'affichage Domaine Nom d\'utilisateur + Identifiant de connexion (si différent) Mot de passe Numéro de téléphone ou diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 48ed77db0..6b6bcb588 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,6 +47,7 @@ Display name Domain Username + Authentication ID (if different) Password Phone number or