← Back to branch summary

~mzanetti/unity8/buttons-in-panel

« back to all changes in this revision

Viewing changes to src/CachingNetworkManagerFactory.cpp

  • Committer: Michael Zanetti
  • Date: 2014-12-03 11:57:20 UTC
  • mfrom: (1457.1.1 wallpaper)
  • Revision ID: michael.zanetti@canonical.com-20141203115720-aoxrzmxyyq3stg2x
merge prereq

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/CachingNetworkManagerFactory.cpp
20
20
#include <QNetworkDiskCache>
21
21
#include <QNetworkAccessManager>
22
22
#include <QStandardPaths>
23
 
#include <QNetworkConfigurationManager>
24
23
 
25
24
CachingNetworkAccessManager::CachingNetworkAccessManager(QObject *parent)
26
25
    : QNetworkAccessManager(parent)
27
26
{
28
 
    m_networkManager = new QNetworkConfigurationManager(this);
29
 
 
30
 
    QObject::connect(m_networkManager, &QNetworkConfigurationManager::onlineStateChanged, this, &CachingNetworkAccessManager::onlineStateChanged);
31
 
    m_isOnline = m_networkManager->isOnline();
32
 
}
33
 
 
34
 
void CachingNetworkAccessManager::onlineStateChanged(bool isOnline)
35
 
{
36
 
    m_isOnline = isOnline;
 
27
    m_networkingStatus = new ubuntu::connectivity::NetworkingStatus(this);
37
28
}
38
29
 
39
30
QNetworkReply* CachingNetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
40
31
{
41
 
    if (!m_isOnline) {
 
32
    if (m_networkingStatus->status() != ubuntu::connectivity::NetworkingStatus::Status::Online) {
42
33
        QNetworkRequest req(request);
43
34
        req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
44
35
        return QNetworkAccessManager::createRequest(op, req, outgoingData);