Merge pull request #6163 from nextcloud/backport/6160/stable-3.10

[stable-3.10] Do not show failure popul for VFS when hydration finished with code 200 or 204.
nextcloud · Oct 24, 2023 · b4dbed5 · b4dbed5
2 parents e95d9ed + ead74b8
commit b4dbed5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/libsync/vfs/cfapi/hydrationjob.cpp b/src/libsync/vfs/cfapi/hydrationjob.cpp
@@ -351,9 +351,15 @@ void OCC::HydrationJob::onGetFinished()
 {
     _errorCode = _job->reply()->error();
     _statusCode = _job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    _errorString = _job->reply()->errorString();
-
-    qCInfo(lcHydration) << "GETFileJob finished" << _requestId << _folderPath << _errorCode << _statusCode << _errorString;
+    if (_errorCode != 0 || (_statusCode != 200 && _statusCode != 204)) {
+        _errorString = _job->reply()->errorString();
+    }
+
+    if (!_errorString.isEmpty()) {
+        qCInfo(lcHydration) << "GETFileJob finished" << _requestId << _folderPath << _errorCode << _statusCode << _errorString;
+    } else {
+        qCInfo(lcHydration) << "GETFileJob finished" << _requestId << _folderPath;
+    }
     // GETFileJob deletes itself after this signal was handled
     _job = nullptr;
     if (_isCancelled) {