From: Christian Kamm <mail@ckamm.de>
Date: Wed, 23 Nov 2016 16:08:17 +0000 (+0100)
Subject: Account: Rename user() to davUser()
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~997
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=045498c71ac785bb2a72eaa0cab742ccc23d6353;p=nextcloud-desktop.git

Account: Rename user() to davUser()

Avoids potential confusion with credentials->user()
---

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index f5b81fd72..94d87c39c 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -76,19 +76,19 @@ AccountPtr Account::sharedFromThis()
     return _sharedThis.toStrongRef();
 }
 
-QString Account::user() const
+QString Account::davUser() const
 {
-    return _user.isEmpty() ? _credentials->user() : _user;
+    return _davUser.isEmpty() ? _credentials->user() : _davUser;
 }
 
-void Account::setUser(const QString &user)
+void Account::setDavUser(const QString &newDavUser)
 {
-    _user = user;
+    _davUser = newDavUser;
 }
 
 QString Account::displayName() const
 {
-    QString dn = QString("%1@%2").arg(user(), _url.host());
+    QString dn = QString("%1@%2").arg(davUser(), _url.host());
     int port = url().port();
     if (port > 0 && port != 80 && port != 443) {
         dn.append(QLatin1Char(':'));
diff --git a/src/libsync/account.h b/src/libsync/account.h
index 828478e33..b9820726a 100644
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -69,9 +69,14 @@ public:
 
     AccountPtr sharedFromThis();
 
-    /// The user that can be used in dav url
-    QString user() const;
-    void setUser(const QString &user);
+    /**
+     * The user that can be used in dav url.
+     *
+     * This can very well be different frome the login user that's
+     * stored in credentials()->user().
+     */
+    QString davUser() const;
+    void setDavUser(const QString &newDavUser);
 
     /// The name of the account as shown in the toolbar
     QString displayName() const;
@@ -203,7 +208,7 @@ private:
 
     QWeakPointer<Account> _sharedThis;
     QString _id;
-    QString _user;
+    QString _davUser;
     QMap<QString, QVariant> _settingsMap;
     QUrl _url;
     QList<QSslCertificate> _approvedCerts;
diff --git a/src/libsync/connectionvalidator.cpp b/src/libsync/connectionvalidator.cpp
index 676cb04a9..b2a1d5879 100644
--- a/src/libsync/connectionvalidator.cpp
+++ b/src/libsync/connectionvalidator.cpp
@@ -246,7 +246,7 @@ void ConnectionValidator::slotUserFetched(const QVariantMap &json)
 {
     QString user = json.value("ocs").toMap().value("data").toMap().value("id").toString();
     if (!user.isEmpty()) {
-        _account->setUser(user);
+        _account->setDavUser(user);
     }
     reportResult(Connected);
 }
diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp
index 4de29532d..7b10288ed 100644
--- a/src/libsync/propagateuploadng.cpp
+++ b/src/libsync/propagateuploadng.cpp
@@ -38,7 +38,7 @@ namespace OCC {
 QUrl PropagateUploadFileNG::chunkUrl(int chunk)
 {
     QString path = QLatin1String("remote.php/dav/uploads/")
-        + _propagator->account()->user()
+        + _propagator->account()->davUser()
         + QLatin1Char('/') + QString::number(_transferId);
     if (chunk >= 0) {
         path += QLatin1Char('/') + QString::number(chunk);
@@ -269,7 +269,7 @@ void PropagateUploadFileNG::startNextChunk()
         _finished = true;
         // Finish with a MOVE
         QString destination = _propagator->account()->url().path()
-            + QLatin1String("/remote.php/dav/files/") + _propagator->account()->user()
+            + QLatin1String("/remote.php/dav/files/") + _propagator->account()->davUser()
             + _propagator->_remoteFolder + _item->_file;
 
         auto headers = PropagateUploadFileCommon::headers();