diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts index 23cc870a6..4ffe69aeb 100644 --- a/Linphone/data/languages/de.ts +++ b/Linphone/data/languages/de.ts @@ -104,43 +104,43 @@ AccountManager - + assistant_account_login_already_connected_error "The account is already connected" Das Konto ist bereits verbunden - + assistant_account_login_proxy_address_error "Unable to create proxy address. Please check the domain name." Proxy-Adresse konnte nicht erstellt werden. Bitte überprüfen Sie den Domänenname. - + assistant_account_login_address_configuration_error "Unable to configure address: `%1`." Folgende Adresse konnte nicht konfiguriert werden: `%1`. - + assistant_account_login_params_configuration_error "Unable to configure account settings." Kontoeinstellungen konnten nicht konfiguriert werden. - + assistant_account_login_forbidden_error "Username and password do not match" Benutzername und Passwort stimmen nicht überein - + assistant_account_login_error "Error during connection, please verify your parameters" Fehler bei der Verbindung - + assistant_account_add_error "Unable to add account." Konto konnte nicht hinzugefügt werden. diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index d73c3dc56..612674dc9 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -104,43 +104,43 @@ AccountManager - + assistant_account_login_already_connected_error "The account is already connected" The account is already connected - + assistant_account_login_proxy_address_error "Unable to create proxy address. Please check the domain name." Unable to create proxy address. Please check the domain name. - + assistant_account_login_address_configuration_error "Unable to configure address: `%1`." Unable to configure address: `%1`. - + assistant_account_login_params_configuration_error "Unable to configure account settings." Unable to configure account settings. - + assistant_account_login_forbidden_error "Username and password do not match" Username and password do not match - + assistant_account_login_error "Error during connection, please verify your parameters" Error during connection - + assistant_account_add_error "Unable to add account." Unable to add account. diff --git a/Linphone/data/languages/fr.ts b/Linphone/data/languages/fr.ts index b7e40b5dc..2a42761e8 100644 --- a/Linphone/data/languages/fr.ts +++ b/Linphone/data/languages/fr.ts @@ -104,43 +104,43 @@ AccountManager - + assistant_account_login_already_connected_error "The account is already connected" Le compte est déjà connecté - + assistant_account_login_proxy_address_error "Unable to create proxy address. Please check the domain name." Impossible de créer l'adresse proxy. Merci de vérifier le nom de domaine. - + assistant_account_login_address_configuration_error "Unable to configure address: `%1`." Impossible de configurer l'adresse : `%1`. - + assistant_account_login_params_configuration_error "Unable to configure account settings." Impossible de configurer les paramètres du compte. - + assistant_account_login_forbidden_error "Username and password do not match" Le couple identifiant mot de passe ne correspond pas - + assistant_account_login_error "Error during connection, please verify your parameters" Erreur durant la connexion, veuillez vérifier vos paramètres - + assistant_account_add_error "Unable to add account." Impossible d'ajouter le compte. diff --git a/Linphone/model/account/AccountManager.cpp b/Linphone/model/account/AccountManager.cpp index 9649150f5..8ef4817cb 100644 --- a/Linphone/model/account/AccountManager.cpp +++ b/Linphone/model/account/AccountManager.cpp @@ -65,6 +65,14 @@ bool AccountManager::login(QString username, QString outboundProxyAddress, QString connectionId) { mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); + qDebug() << "login with parameters :"; + qDebug() << "username" << username; + qDebug() << "password" << password; + qDebug() << "displayName" << displayName; + qDebug() << "domain" << domain; + qDebug() << "registrarUri" << registrarUri; + qDebug() << "outboundProxyAddress" << outboundProxyAddress; + qDebug() << "connectionId" << connectionId; auto core = CoreModel::getInstance()->getCore(); auto factory = linphone::Factory::get(); QString assistantFile = (!QString::compare(domain, "sip.linphone.org", Qt::CaseInsensitive) || domain.isEmpty()) @@ -102,7 +110,7 @@ bool AccountManager::login(QString username, } if (!outboundProxyAddress.isEmpty()) { auto linOutboundProxyAddress = ToolModel::interpretUrl(outboundProxyAddress); - params->setRoutesAddresses({linOutboundProxyAddress}); + if (linOutboundProxyAddress) params->setRoutesAddresses({linOutboundProxyAddress}); } if (!domain.isEmpty()) { identity->setDomain(Utils::appStringToCoreString(domain)); diff --git a/Linphone/view/Page/Form/Login/SIPLoginPage.qml b/Linphone/view/Page/Form/Login/SIPLoginPage.qml index d36c3c2d6..55b5bbfd1 100644 --- a/Linphone/view/Page/Form/Login/SIPLoginPage.qml +++ b/Linphone/view/Page/Form/Login/SIPLoginPage.qml @@ -361,7 +361,7 @@ LoginLayout { } console.debug("[SIPLoginPage] User: Log in") LoginPageCpp.login(usernameEdit.text, passwordEdit.text, displayName.text, domainEdit.text, - transportCbox.currentValue, serverAddressEdit.text, connectionIdEdit.text); + transportCbox.currentValue, registrarUriEdit.text, outboundProxyUriEdit.text, connectionIdEdit.text); connectionButton.enabled = false connectionButtonContent.currentIndex = 1 }