From: Christian Kamm <mail@ckamm.de>
Date: Fri, 9 Nov 2018 11:17:24 +0000 (+0100)
Subject: winvfs: Better error reporting
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~407
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ed005aafe5129182a043544cbde57060ef47a6c;p=nextcloud-desktop.git

winvfs: Better error reporting

- fix download and validation error reporting
- add tests
---

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index 1573f5e69..a5d87effa 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -77,7 +77,7 @@ GETFileJob::GETFileJob(AccountPtr account, const QString &path, QIODevice *devic
     , _headers(headers)
     , _expectedEtagForResume(expectedEtagForResume)
     , _expectedContentLength(-1)
-    , _contentLength(0)
+    , _contentLength(-1)
     , _resumeStart(resumeStart)
     , _errorStatus(SyncFileItem::NoStatus)
     , _bandwidthLimited(false)
@@ -98,7 +98,7 @@ GETFileJob::GETFileJob(AccountPtr account, const QUrl &url, QIODevice *device,
     , _headers(headers)
     , _expectedEtagForResume(expectedEtagForResume)
     , _expectedContentLength(-1)
-    , _contentLength(0)
+    , _contentLength(-1)
     , _resumeStart(resumeStart)
     , _errorStatus(SyncFileItem::NoStatus)
     , _directDownloadUrl(url)
diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h
index cd76a2a6a..226a8b521 100644
--- a/src/libsync/propagatedownload.h
+++ b/src/libsync/propagatedownload.h
@@ -35,7 +35,7 @@ class GETFileJob : public AbstractNetworkJob
     QString _errorString;
     QByteArray _expectedEtagForResume;
     qint64 _expectedContentLength;
-    quint64 _contentLength;
+    qint64 _contentLength;
     quint64 _resumeStart;
     SyncFileItem::Status _errorStatus;
     QUrl _directDownloadUrl;
@@ -103,7 +103,7 @@ public:
     quint64 resumeStart() { return _resumeStart; }
     time_t lastModified() { return _lastModified; }
 
-    quint64 contentLength() const { return _contentLength; }
+    qint64 contentLength() const { return _contentLength; }
     qint64 expectedContentLength() const { return _expectedContentLength; }
     void setExpectedContentLength(qint64 size) { _expectedContentLength = size; }