data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix verification when trying to connect to an account that is already connected

Browse source
This commit is contained in:
Gaelle Braud 2025-11-17 17:45:20 +01:00
parent 7a4adbcbb4
commit bfbafab84b
4 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Linphone/data/languages/de.ts
View file

@ -104,43 +104,43 @@
<context> <context>
<name>AccountManager</name> <name>AccountManager</name>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="88"/> <location filename="../../model/account/AccountManager.cpp" line="93"/>
<source>assistant_account_login_already_connected_error</source> <source>assistant_account_login_already_connected_error</source>
<extracomment>&quot;The account is already connected&quot;</extracomment> <extracomment>&quot;The account is already connected&quot;</extracomment>
<translation>Das Konto ist bereits verbunden</translation> <translation>Das Konto ist bereits verbunden</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="110"/> <location filename="../../model/account/AccountManager.cpp" line="115"/>
<source>assistant_account_login_proxy_address_error</source> <source>assistant_account_login_proxy_address_error</source>
<extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment> <extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment>
<translation>Proxy-Adresse konnte nicht erstellt werden. Bitte überprüfen Sie den Domänenname.</translation> <translation>Proxy-Adresse konnte nicht erstellt werden. Bitte überprüfen Sie den Domänenname.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="123"/> <location filename="../../model/account/AccountManager.cpp" line="128"/>
<source>assistant_account_login_address_configuration_error</source> <source>assistant_account_login_address_configuration_error</source>
<extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment> <extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment>
<translation>Folgende Adresse konnte nicht konfiguriert werden: `%1`.</translation> <translation>Folgende Adresse konnte nicht konfiguriert werden: `%1`.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="130"/> <location filename="../../model/account/AccountManager.cpp" line="135"/>
<source>assistant_account_login_params_configuration_error</source> <source>assistant_account_login_params_configuration_error</source>
<extracomment>&quot;Unable to configure account settings.&quot;</extracomment> <extracomment>&quot;Unable to configure account settings.&quot;</extracomment>
<translation>Kontoeinstellungen konnten nicht konfiguriert werden.</translation> <translation>Kontoeinstellungen konnten nicht konfiguriert werden.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="154"/> <location filename="../../model/account/AccountManager.cpp" line="159"/>
<source>assistant_account_login_forbidden_error</source> <source>assistant_account_login_forbidden_error</source>
<extracomment>&quot;Username and password do not match&quot;</extracomment> <extracomment>&quot;Username and password do not match&quot;</extracomment>
<translation>Benutzername und Passwort stimmen nicht überein</translation> <translation>Benutzername und Passwort stimmen nicht überein</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="156"/> <location filename="../../model/account/AccountManager.cpp" line="161"/>
<source>assistant_account_login_error</source> <source>assistant_account_login_error</source>
<extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment> <extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment>
<translation>Fehler bei der Verbindung</translation> <translation>Fehler bei der Verbindung</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="170"/> <location filename="../../model/account/AccountManager.cpp" line="175"/>
<source>assistant_account_add_error</source> <source>assistant_account_add_error</source>
<extracomment>&quot;Unable to add account.&quot;</extracomment> <extracomment>&quot;Unable to add account.&quot;</extracomment>
<translation>Konto konnte nicht hinzugefügt werden.</translation> <translation>Konto konnte nicht hinzugefügt werden.</translation>

14
Linphone/data/languages/en.ts
View file

@ -104,43 +104,43 @@
<context> <context>
<name>AccountManager</name> <name>AccountManager</name>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="88"/> <location filename="../../model/account/AccountManager.cpp" line="93"/>
<source>assistant_account_login_already_connected_error</source> <source>assistant_account_login_already_connected_error</source>
<extracomment>&quot;The account is already connected&quot;</extracomment> <extracomment>&quot;The account is already connected&quot;</extracomment>
<translation>The account is already connected</translation> <translation>The account is already connected</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="110"/> <location filename="../../model/account/AccountManager.cpp" line="115"/>
<source>assistant_account_login_proxy_address_error</source> <source>assistant_account_login_proxy_address_error</source>
<extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment> <extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment>
<translation>Unable to create proxy address. Please check the domain name.</translation> <translation>Unable to create proxy address. Please check the domain name.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="123"/> <location filename="../../model/account/AccountManager.cpp" line="128"/>
<source>assistant_account_login_address_configuration_error</source> <source>assistant_account_login_address_configuration_error</source>
<extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment> <extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment>
<translation>Unable to configure address: `%1`.</translation> <translation>Unable to configure address: `%1`.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="130"/> <location filename="../../model/account/AccountManager.cpp" line="135"/>
<source>assistant_account_login_params_configuration_error</source> <source>assistant_account_login_params_configuration_error</source>
<extracomment>&quot;Unable to configure account settings.&quot;</extracomment> <extracomment>&quot;Unable to configure account settings.&quot;</extracomment>
<translation>Unable to configure account settings.</translation> <translation>Unable to configure account settings.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="154"/> <location filename="../../model/account/AccountManager.cpp" line="159"/>
<source>assistant_account_login_forbidden_error</source> <source>assistant_account_login_forbidden_error</source>
<extracomment>&quot;Username and password do not match&quot;</extracomment> <extracomment>&quot;Username and password do not match&quot;</extracomment>
<translation>Username and password do not match</translation> <translation>Username and password do not match</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="156"/> <location filename="../../model/account/AccountManager.cpp" line="161"/>
<source>assistant_account_login_error</source> <source>assistant_account_login_error</source>
<extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment> <extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment>
<translation>Error during connection</translation> <translation>Error during connection</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="170"/> <location filename="../../model/account/AccountManager.cpp" line="175"/>
<source>assistant_account_add_error</source> <source>assistant_account_add_error</source>
<extracomment>&quot;Unable to add account.&quot;</extracomment> <extracomment>&quot;Unable to add account.&quot;</extracomment>
<translation>Unable to add account.</translation> <translation>Unable to add account.</translation>

14
Linphone/data/languages/fr.ts
View file

@ -104,43 +104,43 @@
<context> <context>
<name>AccountManager</name> <name>AccountManager</name>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="88"/> <location filename="../../model/account/AccountManager.cpp" line="93"/>
<source>assistant_account_login_already_connected_error</source> <source>assistant_account_login_already_connected_error</source>
<extracomment>&quot;The account is already connected&quot;</extracomment> <extracomment>&quot;The account is already connected&quot;</extracomment>
<translation>Le compte est déjà connecté</translation> <translation>Le compte est déjà connecté</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="110"/> <location filename="../../model/account/AccountManager.cpp" line="115"/>
<source>assistant_account_login_proxy_address_error</source> <source>assistant_account_login_proxy_address_error</source>
<extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment> <extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment>
<translation>Impossible de créer l&apos;adresse proxy. Merci de vérifier le nom de domaine.</translation> <translation>Impossible de créer l&apos;adresse proxy. Merci de vérifier le nom de domaine.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="123"/> <location filename="../../model/account/AccountManager.cpp" line="128"/>
<source>assistant_account_login_address_configuration_error</source> <source>assistant_account_login_address_configuration_error</source>
<extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment> <extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment>
<translation>Impossible de configurer l&apos;adresse : `%1`.</translation> <translation>Impossible de configurer l&apos;adresse : `%1`.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="130"/> <location filename="../../model/account/AccountManager.cpp" line="135"/>
<source>assistant_account_login_params_configuration_error</source> <source>assistant_account_login_params_configuration_error</source>
<extracomment>&quot;Unable to configure account settings.&quot;</extracomment> <extracomment>&quot;Unable to configure account settings.&quot;</extracomment>
<translation>Impossible de configurer les paramètres du compte.</translation> <translation>Impossible de configurer les paramètres du compte.</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="154"/> <location filename="../../model/account/AccountManager.cpp" line="159"/>
<source>assistant_account_login_forbidden_error</source> <source>assistant_account_login_forbidden_error</source>
<extracomment>&quot;Username and password do not match&quot;</extracomment> <extracomment>&quot;Username and password do not match&quot;</extracomment>
<translation>Le couple identifiant mot de passe ne correspond pas</translation> <translation>Le couple identifiant mot de passe ne correspond pas</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="156"/> <location filename="../../model/account/AccountManager.cpp" line="161"/>
<source>assistant_account_login_error</source> <source>assistant_account_login_error</source>
<extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment> <extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment>
<translation>Erreur durant la connexion, veuillez vérifier vos paramètres</translation> <translation>Erreur durant la connexion, veuillez vérifier vos paramètres</translation>
</message> </message>
<message> <message>
<location filename="../../model/account/AccountManager.cpp" line="170"/> <location filename="../../model/account/AccountManager.cpp" line="175"/>
<source>assistant_account_add_error</source> <source>assistant_account_add_error</source>
<extracomment>&quot;Unable to add account.&quot;</extracomment> <extracomment>&quot;Unable to add account.&quot;</extracomment>
<translation>Impossible d&apos;ajouter le compte.</translation> <translation>Impossible d&apos;ajouter le compte.</translation>

11
Linphone/model/account/AccountManager.cpp
View file

@ -67,7 +67,7 @@ bool AccountManager::login(QString username,
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
auto core = CoreModel::getInstance()->getCore(); auto core = CoreModel::getInstance()->getCore();
auto factory = linphone::Factory::get(); auto factory = linphone::Factory::get();
QString assistantFile = (!QString::compare(domain, "sip.linphone.org") || domain.isEmpty()) QString assistantFile = (!QString::compare(domain, "sip.linphone.org", Qt::CaseInsensitive) || domain.isEmpty())
? "use-app-sip-account.rc" ? "use-app-sip-account.rc"
: "use-other-sip-account.rc"; : "use-other-sip-account.rc";
auto account = createAccount(assistantFile); auto account = createAccount(assistantFile);
@ -82,8 +82,13 @@ bool AccountManager::login(QString username,
auto otherAccounts = core->getAccountList(); auto otherAccounts = core->getAccountList();
for (auto otherAccount : otherAccounts) { for (auto otherAccount : otherAccounts) {
auto otherParams = otherAccount->getParams(); auto otherParams = otherAccount->getParams();
if (otherParams->getIdentityAddress()->getUsername() == Utils::appStringToCoreString(username) && if (domain.isEmpty()) {
otherParams->getDomain() == Utils::appStringToCoreString(domain)) { lDebug() << "domain is empty, setting \"sip.linphone.org\" by default";
domain = "sip.linphone.org";
}
if (!QString::compare(Utils::coreStringToAppString(otherParams->getIdentityAddress()->getUsername()), username,
Qt::CaseInsensitive) &&
!QString::compare(Utils::coreStringToAppString(otherParams->getDomain()), domain, Qt::CaseInsensitive)) {
//: "The account is already connected" //: "The account is already connected"
*errorMessage = tr("assistant_account_login_already_connected_error"); *errorMessage = tr("assistant_account_login_already_connected_error");
return false; return false;