From 085cc656d968cf795af28f5e1401dde8231792ec Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 24 Oct 2017 12:07:45 +0200 Subject: [PATCH] inoreader plugin now respects timeout settings --- .../inoreader/network/inoreadernetworkfactory.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/inoreader/network/inoreadernetworkfactory.cpp b/src/services/inoreader/network/inoreadernetworkfactory.cpp index d57487842..8b644c2b0 100755 --- a/src/services/inoreader/network/inoreadernetworkfactory.cpp +++ b/src/services/inoreader/network/inoreadernetworkfactory.cpp @@ -81,11 +81,11 @@ RootItem* InoreaderNetworkFactory::feedsCategories(bool obtain_icons) { return nullptr; } - downloader.appendRawHeader(QString("Authorization").toLocal8Bit(), bearer.toLocal8Bit()); + downloader.appendRawHeader(QString(HTTP_HEADERS_AUTHORIZATION).toLocal8Bit(), bearer.toLocal8Bit()); // We need to quit event loop when the download finishes. connect(&downloader, &Downloader::completed, &loop, &QEventLoop::quit); - downloader.manipulateData(INOREADER_API_LIST_LABELS, QNetworkAccessManager::Operation::GetOperation); + downloader.downloadFile(INOREADER_API_LIST_LABELS, qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt()); loop.exec(); if (downloader.lastOutputError() != QNetworkReply::NetworkError::NoError) { @@ -118,11 +118,11 @@ QList InoreaderNetworkFactory::messages(const QString& stream_id, Feed: } target_url += QSL("/") + QUrl::toPercentEncoding(stream_id) + QString("?n=%1").arg(batchSize()); - downloader.appendRawHeader(QString("Authorization").toLocal8Bit(), bearer.toLocal8Bit()); + downloader.appendRawHeader(QString(HTTP_HEADERS_AUTHORIZATION).toLocal8Bit(), bearer.toLocal8Bit()); // We need to quit event loop when the download finishes. connect(&downloader, &Downloader::completed, &loop, &QEventLoop::quit); - downloader.manipulateData(target_url, QNetworkAccessManager::Operation::GetOperation); + downloader.downloadFile(target_url, qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt()); loop.exec(); if (downloader.lastOutputError() != QNetworkReply::NetworkError::NoError) {