rbutil: HttpGet: Return NetworkError in done signal.

Return the status value instead of simply a bool.

Change-Id: I2bffaac0087418656e80c74dc352011a4ea32ab1

8 files changed, 13 insertions, 23 deletions

diff --git a/utils/rbutilqt/base/bootloaderinstallbase.cpp b/utils/rbutilqt/base/bootloaderinstallbase.cpp
index c07d87bf36..a185b25619 100644
--- a/utils/rbutilqt/base/bootloaderinstallbase.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallbase.cpp
@@ -57,16 +57,7 @@ void BootloaderInstallBase::downloadBlStart(QUrl source)
 }
 
 
-void BootloaderInstallBase::downloadReqFinished(int id, bool error)
-{
-    LOG_INFO() << "Download Request" << id
-               << "finished, error:" << m_http.errorString();
-
-    downloadBlFinish(error);
-}
-
-
-void BootloaderInstallBase::downloadBlFinish(bool error)
+void BootloaderInstallBase::downloadBlFinish(QNetworkReply::NetworkError error)
 {
     LOG_INFO() << "Downloading bootloader finished, error:"
                << error;
@@ -80,7 +71,7 @@ void BootloaderInstallBase::downloadBlFinish(bool error)
         emit done(true);
         return;
     }
-    if(error) {
+    if(error != QNetworkReply::NoError) {
         emit logItem(tr("Download error: %1")
                 .arg(m_http.errorString()), LOGERROR);
         emit done(true);
diff --git a/utils/rbutilqt/base/bootloaderinstallbase.h b/utils/rbutilqt/base/bootloaderinstallbase.h
index 0d9423a06f..567b4e9093 100644
--- a/utils/rbutilqt/base/bootloaderinstallbase.h
+++ b/utils/rbutilqt/base/bootloaderinstallbase.h
@@ -68,8 +68,7 @@ class BootloaderInstallBase : public QObject
         static QString postinstallHints(QString model);
 
     protected slots:
-        void downloadReqFinished(int id, bool error);
-        void downloadBlFinish(bool error);
+        void downloadBlFinish(QNetworkReply::NetworkError error);
         void installBlfile(void);
         void progressAborted(void);
 
diff --git a/utils/rbutilqt/base/httpget.cpp b/utils/rbutilqt/base/httpget.cpp
index 2df9501fd6..fb74514e73 100644
--- a/utils/rbutilqt/base/httpget.cpp
+++ b/utils/rbutilqt/base/httpget.cpp
@@ -145,7 +145,7 @@ void HttpGet::requestFinished(QNetworkReply* reply)
 {
     m_lastStatusCode
         = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    LOG_INFO() << "Request finished, status code:" << m_lastStatusCode;
+    LOG_INFO() << "Request finished, status code:" << m_lastStatusCode << reply->error();
     m_lastServerTimestamp
         = reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().toLocalTime();
     LOG_INFO() << "Data from cache:"
@@ -178,11 +178,11 @@ void HttpGet::requestFinished(QNetworkReply* reply)
             m_outputFile->write(m_data);
             m_outputFile->close();
         }
-        emit done(false);
+        emit done(QNetworkReply::NoError);
     }
     else {
         m_data.clear();
-        emit done(true);
+        emit done(reply->error());
     }
     reply->deleteLater();
     m_reply = nullptr;
diff --git a/utils/rbutilqt/base/httpget.h b/utils/rbutilqt/base/httpget.h
index 472ad83b81..443a606e6d 100644
--- a/utils/rbutilqt/base/httpget.h
+++ b/utils/rbutilqt/base/httpget.h
@@ -78,7 +78,7 @@ class HttpGet : public QObject
         void abort(void);
 
     signals:
-        void done(bool);
+        void done(QNetworkReply::NetworkError error);
         void dataReadProgress(int, int);
         void headerFinished(void);
 
diff --git a/utils/rbutilqt/base/voicefile.cpp b/utils/rbutilqt/base/voicefile.cpp
index eabf7a721a..c5a239d720 100644
--- a/utils/rbutilqt/base/voicefile.cpp
+++ b/utils/rbutilqt/base/voicefile.cpp
@@ -175,7 +175,7 @@ bool VoiceFileCreator::createVoiceFile()
  }
 
 
-void VoiceFileCreator::downloadDone(bool error)
+void VoiceFileCreator::downloadDone(QNetworkReply::NetworkError error)
 {
     LOG_INFO() << "download done, error:" << error;
 
@@ -190,7 +190,7 @@ void VoiceFileCreator::downloadDone(bool error)
 
     if(getter->isCached())
         emit logItem(tr("Cached file used."), LOGINFO);
-    if(error)
+    if(error != QNetworkReply::NoError)
     {
         emit logItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
         emit done(true);
diff --git a/utils/rbutilqt/base/voicefile.h b/utils/rbutilqt/base/voicefile.h
index c813910a69..feb0ac6e5a 100644
--- a/utils/rbutilqt/base/voicefile.h
+++ b/utils/rbutilqt/base/voicefile.h
@@ -52,7 +52,7 @@ signals:
     void logProgress(int, int); //! set progress bar.
 
 private slots:
-    void downloadDone(bool error);
+    void downloadDone(QNetworkReply::NetworkError error);
 
 private:
 
diff --git a/utils/rbutilqt/base/zipinstaller.cpp b/utils/rbutilqt/base/zipinstaller.cpp
index 8de6c53b16..ba0b89121c 100644
--- a/utils/rbutilqt/base/zipinstaller.cpp
+++ b/utils/rbutilqt/base/zipinstaller.cpp
@@ -102,7 +102,7 @@ void ZipInstaller::installStart()
 }
 
 
-void ZipInstaller::downloadDone(bool error)
+void ZipInstaller::downloadDone(QNetworkReply::NetworkError error)
 {
     LOG_INFO() << "download done, error:" << error;
     QStringList zipContents; // needed later
@@ -118,7 +118,7 @@ void ZipInstaller::downloadDone(bool error)
     }
     if(m_getter->isCached())
         emit logItem(tr("Cached file used."), LOGINFO);
-    if(error) {
+    if(error != QNetworkReply::NoError) {
         emit logItem(tr("Download error: %1").arg(m_getter->errorString()), LOGERROR);
         emit done(true);
         return;
diff --git a/utils/rbutilqt/base/zipinstaller.h b/utils/rbutilqt/base/zipinstaller.h
index 35967af6b1..32a42ef6a2 100644
--- a/utils/rbutilqt/base/zipinstaller.h
+++ b/utils/rbutilqt/base/zipinstaller.h
@@ -59,7 +59,7 @@ public slots:
     void abort(void);
 
 private slots:
-    void downloadDone(bool);
+    void downloadDone(QNetworkReply::NetworkError error);
     void installStart(void);
     void installContinue(void);