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

Prevent LDAP password to be removed after editing existing config

Browse source
This commit is contained in:
Sylvain Berfini 2025-10-20 10:52:06 +02:00
parent 4dc1b9a903
commit d74ccb523e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt
View file

@ -165,6 +165,7 @@ class LdapViewModel : GenericViewModel() {
val nameAttrs = nameAttributes.value.orEmpty().trim()
val sipAttrs = sipAttributes.value.orEmpty().trim()
val sipDomain = sipDomain.value.orEmpty().trim()
val pwd = password.value.orEmpty().trim()
if (
server.isEmpty() || bindDn.isEmpty() || base.isEmpty() || filter.isEmpty() ||
maxResults.isEmpty() || timeout.isEmpty() || delay.isEmpty() ||
@ -180,7 +181,11 @@ class LdapViewModel : GenericViewModel() {
ldapParams.enabled = isEnabled.value == true
ldapParams.server = server
ldapParams.bindDn = bindDn
ldapParams.password = password.value.orEmpty().trim()
if (!pwd.isEmpty()) {
ldapParams.password = pwd
} else if (::ldapToEdit.isInitialized) {
ldapParams.password = ldapToEdit.params.password
}
ldapParams.authMethod = Ldap.AuthMethod.Simple
ldapParams.isTlsEnabled = useTls.value == true
ldapParams.serverCertificatesVerificationMode = Ldap.CertVerificationMode.Default