Unverified Commit 6320c60d authored by Michael Schuster's avatar Michael Schuster Committed by GitHub

Merge pull request #2170 from nextcloud/backport/2153/stable-2.6

[stable 2.6] Asemmar/issue 2137
parents 016d21de abc3d6a2
......@@ -82,7 +82,7 @@ Folder::Folder(const FolderDefinition &definition,
qCWarning(lcFolder, "Could not read system exclude file");
connect(_accountState.data(), &AccountState::isConnectedChanged, this, &Folder::canSyncChanged);
connect(_engine.data(), &SyncEngine::rootEtag, this, &Folder::etagRetreivedFromSyncEngine);
connect(_engine.data(), &SyncEngine::rootEtag, this, &Folder::etagRetrievedFromSyncEngine);
connect(_engine.data(), &SyncEngine::started, this, &Folder::slotSyncStarted, Qt::QueuedConnection);
connect(_engine.data(), &SyncEngine::finished, this, &Folder::slotSyncFinished, Qt::QueuedConnection);
......@@ -293,12 +293,12 @@ void Folder::slotRunEtagJob()
_requestEtagJob = new RequestEtagJob(account, remotePath(), this);
_requestEtagJob->setTimeout(60 * 1000);
// check if the etag is different when retrieved
QObject::connect(_requestEtagJob.data(), &RequestEtagJob::etagRetreived, this, &Folder::etagRetreived);
QObject::connect(_requestEtagJob.data(), &RequestEtagJob::etagRetrieved, this, &Folder::etagRetrieved);
FolderMan::instance()->slotScheduleETagJob(alias(), _requestEtagJob);
// The _requestEtagJob is auto deleting itself on finish. Our guard pointer _requestEtagJob will then be null.
}
void Folder::etagRetreived(const QString &etag)
void Folder::etagRetrieved(const QString &etag)
{
// re-enable sync if it was disabled because network was down
FolderMan::instance()->setSyncEnabled(true);
......@@ -312,7 +312,7 @@ void Folder::etagRetreived(const QString &etag)
_accountState->tagLastSuccessfullETagRequest();
}
void Folder::etagRetreivedFromSyncEngine(const QString &etag)
void Folder::etagRetrievedFromSyncEngine(const QString &etag)
{
qCInfo(lcFolder) << "Root etag from during sync:" << etag;
accountState()->tagLastSuccessfullETagRequest();
......
......@@ -290,8 +290,8 @@ private slots:
void slotItemCompleted(const SyncFileItemPtr &);
void slotRunEtagJob();
void etagRetreived(const QString &);
void etagRetreivedFromSyncEngine(const QString &);
void etagRetrieved(const QString &);
void etagRetrievedFromSyncEngine(const QString &);
void slotEmitFinishedDelayed();
......
......@@ -110,7 +110,7 @@ bool RequestEtagJob::finished()
}
}
}
emit etagRetreived(etag);
emit etagRetrieved(etag);
}
return true;
}
......@@ -1027,7 +1027,7 @@ bool DeleteApiJob::finished()
const auto replyData = QString::fromUtf8(reply()->readAll());
qCInfo(lcJsonApiJob()) << "TMX Delete Job" << replyData;
emit result(httpStatus);
return true;
return true;
}
void fetchPrivateLinkUrl(AccountPtr account, const QString &remotePath,
......@@ -1063,4 +1063,3 @@ void fetchPrivateLinkUrl(AccountPtr account, const QString &remotePath,
}
} // namespace OCC
......@@ -333,7 +333,7 @@ public:
void start() override;
signals:
void etagRetreived(const QString &etag);
void etagRetrieved(const QString &etag);
private slots:
bool finished() override;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment