1
=== modified file 'src/CMakeLists.txt'
2
--- src/CMakeLists.txt	2014-06-11 15:36:51 +0000
3
+++ src/CMakeLists.txt	2014-07-02 07:56:49 +0000
4
@@ -19,6 +19,7 @@
5
19
    ApplicationArguments.h
19
    ApplicationArguments.h
6
20
    main.cpp
20
    main.cpp
7
21
    MouseTouchAdaptor.cpp
21
    MouseTouchAdaptor.cpp
8
22
    CachingNetworkManagerFactory.cpp
9
22
    ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
23
    ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
10
23
)
24
)
11
24
25
12
25
26
13
=== added file 'src/CachingNetworkManagerFactory.cpp'
14
--- src/CachingNetworkManagerFactory.cpp	1970-01-01 00:00:00 +0000
15
+++ src/CachingNetworkManagerFactory.cpp	2014-07-02 07:56:49 +0000
16
@@ -0,0 +1,62 @@
17
1
/*
18
2
 * Copyright (C) 2014 Canonical, Ltd.
19
3
 *
20
4
 * This program is free software; you can redistribute it and/or modify
21
5
 * it under the terms of the GNU General Public License as published by
22
6
 * the Free Software Foundation; version 3.
23
7
 *
24
8
 * This program is distributed in the hope that it will be useful,
25
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
26
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
27
11
 * GNU General Public License for more details.
28
12
 *
29
13
 * You should have received a copy of the GNU General Public License
30
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
31
15
 *
32
16
 */
33
17
34
18
#include "CachingNetworkManagerFactory.h"
35
19
36
20
#include <QNetworkDiskCache>
37
21
#include <QNetworkAccessManager>
38
22
#include <QStandardPaths>
39
23
#include <QNetworkConfigurationManager>
40
24
41
25
CachingNetworkAccessManager::CachingNetworkAccessManager(QObject *parent)
42
26
    : QNetworkAccessManager(parent)
43
27
{
44
28
    m_networkManager = new QNetworkConfigurationManager(this);
45
29
46
30
    QObject::connect(m_networkManager, &QNetworkConfigurationManager::onlineStateChanged, this, &CachingNetworkAccessManager::onlineStateChanged);
47
31
    m_isOnline = m_networkManager->isOnline();
48
32
}
49
33
50
34
void CachingNetworkAccessManager::onlineStateChanged(bool isOnline)
51
35
{
52
36
    m_isOnline = isOnline;
53
37
}
54
38
55
39
QNetworkReply* CachingNetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
56
40
{
57
41
    if (!m_isOnline) {
58
42
        QNetworkRequest req(request);
59
43
        req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
60
44
        return QNetworkAccessManager::createRequest(op, req, outgoingData);
61
45
    }
62
46
63
47
    return QNetworkAccessManager::createRequest(op, request, outgoingData);
64
48
}
65
49
66
50
CachingNetworkManagerFactory::CachingNetworkManagerFactory()
67
51
{
68
52
}
69
53
70
54
QNetworkAccessManager *CachingNetworkManagerFactory::create(QObject *parent) {
71
55
    QNetworkAccessManager *manager = new CachingNetworkAccessManager(parent);
72
56
73
57
    QNetworkDiskCache* cache = new QNetworkDiskCache(manager);
74
58
    cache->setCacheDirectory(QString("%1/network").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
75
59
76
60
    manager->setCache(cache);
77
61
    return manager;
78
62
}
79
0
63
80
=== added file 'src/CachingNetworkManagerFactory.h'
81
--- src/CachingNetworkManagerFactory.h	1970-01-01 00:00:00 +0000
82
+++ src/CachingNetworkManagerFactory.h	2014-07-02 07:56:49 +0000
83
@@ -0,0 +1,50 @@
84
1
/*
85
2
 * Copyright (C) 2014 Canonical, Ltd.
86
3
 *
87
4
 * This program is free software; you can redistribute it and/or modify
88
5
 * it under the terms of the GNU General Public License as published by
89
6
 * the Free Software Foundation; version 3.
90
7
 *
91
8
 * This program is distributed in the hope that it will be useful,
92
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
93
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
94
11
 * GNU General Public License for more details.
95
12
 *
96
13
 * You should have received a copy of the GNU General Public License
97
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
98
15
 *
99
16
 */
100
17
101
18
#ifndef CACHINGNETWORKMANAGERFACTORY_H
102
19
#define CACHINGNETWORKMANAGERFACTORY_H
103
20
104
21
#include <QQmlNetworkAccessManagerFactory>
105
22
#include <QNetworkAccessManager>
106
23
107
24
class QNetworkConfigurationManager;
108
25
109
26
class CachingNetworkAccessManager : public QNetworkAccessManager
110
27
{
111
28
public:
112
29
    CachingNetworkAccessManager(QObject *parent = 0);
113
30
114
31
protected:
115
32
    QNetworkReply* createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0) override;
116
33
117
34
private Q_SLOTS:
118
35
    void onlineStateChanged(bool isOnline);
119
36
120
37
private:
121
38
    QNetworkConfigurationManager* m_networkManager;
122
39
    bool m_isOnline;
123
40
};
124
41
125
42
class CachingNetworkManagerFactory : public QQmlNetworkAccessManagerFactory
126
43
{
127
44
public:
128
45
    CachingNetworkManagerFactory();
129
46
130
47
    QNetworkAccessManager *create(QObject *parent) override;
131
48
};
132
49
133
50
#endif // CACHINGNETWORKMANAGERFACTORY_H
134
0
51
135
=== modified file 'src/main.cpp'
136
--- src/main.cpp	2014-06-20 17:04:02 +0000
137
+++ src/main.cpp	2014-07-02 07:56:49 +0000
138
@@ -34,15 +34,15 @@
139
34
#include <paths.h>
34
#include <paths.h>
140
35
#include "MouseTouchAdaptor.h"
35
#include "MouseTouchAdaptor.h"
141
36
#include "ApplicationArguments.h"
36
#include "ApplicationArguments.h"
142
37
#include "CachingNetworkManagerFactory.h"
143
37
38
144
38
#include <unity-mir/qmirserver.h>
39
#include <unity-mir/qmirserver.h>
145
39
40
146
40
147
41
int startShell(int argc, const char** argv, void* server)
41
int startShell(int argc, const char** argv, void* server)
148
42
{
42
{
149
43
    const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
43
    const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
150
44
44
152
45
    QGuiApplication::setApplicationName("Unity 8");
45
    QGuiApplication::setApplicationName("unity8");
153
46
    QGuiApplication *application;
46
    QGuiApplication *application;
154
47
47
155
48
    QCommandLineParser parser;
48
    QCommandLineParser parser;
156
@@ -159,6 +159,9 @@
157
159
    }
159
    }
158
160
    appendImportPaths(view->engine(), ::fallbackImportPaths());
160
    appendImportPaths(view->engine(), ::fallbackImportPaths());
159
161
161
160
162
    CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();
161
163
    view->engine()->setNetworkAccessManagerFactory(managerFactory);
162
164
163
162
    view->setSource(source);
165
    view->setSource(source);
164
163
    view->setColor("transparent");
166
    view->setColor("transparent");
165
164
    QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
167
    QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-06-30	Needs Fixing on 2014-07-02
Michał Sawicz			Approve on 2014-07-02
Florian Boucault		2014-06-30	Pending
Review via email: mp+224995@code.launchpad.net