mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 05:15:40 +03:00
Account: Rename user() to davUser()
Avoids potential confusion with credentials->user()
This commit is contained in:
parent
679ac0d26a
commit
045498c71a
4 changed files with 17 additions and 12 deletions
|
@ -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(':'));
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue