From 11cebc1e2a75286f7632f8553b174af1c5ad6b5c Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Thu, 14 Nov 2024 19:11:54 +0100 Subject: [PATCH] Fix tests: make sure displayName is not empty. Signed-off-by: Camila Ayres --- src/gui/accountmanager.cpp | 1 - src/libsync/account.cpp | 12 ++++++------ src/libsync/account.h | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 0cdcace83..f27d27427 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -509,7 +509,6 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings) } acc->setCredentials(CredentialsFactory::create(authType)); - acc->setDisplayName(acc->credentials()->user()); acc->setNetworkProxySetting(settings.value(networkProxySettingC).value()); acc->setProxyType(settings.value(networkProxyTypeC).value()); diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 3ecfd84e1..0b20a3551 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -159,19 +159,19 @@ void Account::setAvatar(const QImage &img) QString Account::displayName() const { - return _displayName; -} + auto credentialsUser = _davUser; + if (_credentials && !_credentials->user().isEmpty()) { + credentialsUser = _credentials->user(); + } -void Account::setDisplayName(const QString &username) -{ - auto displayName = QString("%1@%2").arg(username, _url.host()); + auto displayName = QString("%1@%2").arg(credentialsUser, _url.host()); const auto port = url().port(); if (port > 0 && port != 80 && port != 443) { displayName.append(QLatin1Char(':')); displayName.append(QString::number(port)); } - _displayName = displayName; + return displayName; } QString Account::userIdAtHostWithPort() const diff --git a/src/libsync/account.h b/src/libsync/account.h index a991daed9..4979931bd 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -146,7 +146,6 @@ public: /// The name of the account as shown in the toolbar [[nodiscard]] QString displayName() const; - void setDisplayName(const QString &username); /// User id in a form 'user@example.de, optionally port is added (if it is not 80 or 443) [[nodiscard]] QString userIdAtHostWithPort() const; -- 2.30.2