Fix tests: make sure displayName is not empty.

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 0cdcace834d603575fc1b9393eb5dece20e0deda..f27d2742703a77bd28c55d2e92c580855e19f859 100644 (file)
--- 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<Account::AccountNetworkProxySetting>());
     acc->setProxyType(settings.value(networkProxyTypeC).value<QNetworkProxy::ProxyType>());

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 3ecfd84e1eb9567716947cac9bf45403e1408906..0b20a3551bdc9218e1d74fcaaab8f9fe21acbd5f 100644 (file)
--- 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 a991daed9cd473bad54fdc0a526f43b095324ecb..4979931bd870ddeb07845e61d5b4953eddabf819 100644 (file)
--- 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;