c8013e2 · unity8 · git.iko.soy

src/CMakeLists.txt+1

compare with xenial

unifiedsplit

@@ -19,6 +19,7 @@ add_executable(${SHELL_APP}

19 ApplicationArguments.h

20 main.cpp

21 MouseTouchAdaptor.cpp

22+ CachingNetworkManagerFactory.cpp

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

23)

24)

24

25

src/CachingNetworkManagerFactory.cppnew file+62

@@ -0,0 +1,62 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#include "CachingNetworkManagerFactory.h"

19+

20+#include <QNetworkDiskCache>

21+#include <QNetworkAccessManager>

22+#include <QStandardPaths>

23+#include <QNetworkConfigurationManager>

24+

25+CachingNetworkAccessManager::CachingNetworkAccessManager(QObject *parent)

26+ : QNetworkAccessManager(parent)

27+{

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;

37+}

38+

39+QNetworkReply* CachingNetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData)

40+{

41+ if (!m_isOnline) {

42+ QNetworkRequest req(request);

43+ req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);

44+ return QNetworkAccessManager::createRequest(op, req, outgoingData);

45+ }

46+

47+ return QNetworkAccessManager::createRequest(op, request, outgoingData);

48+}

49+

50+CachingNetworkManagerFactory::CachingNetworkManagerFactory()

51+{

52+}

53+

54+QNetworkAccessManager *CachingNetworkManagerFactory::create(QObject *parent) {

55+ QNetworkAccessManager *manager = new CachingNetworkAccessManager(parent);

56+

57+ QNetworkDiskCache* cache = new QNetworkDiskCache(manager);

58+ cache->setCacheDirectory(QString("%1/network").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));

59+

60+ manager->setCache(cache);

61+ return manager;

62+}

src/CachingNetworkManagerFactory.hnew file+50

@@ -0,0 +1,50 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#ifndef CACHINGNETWORKMANAGERFACTORY_H

19+#define CACHINGNETWORKMANAGERFACTORY_H

20+

21+#include <QQmlNetworkAccessManagerFactory>

22+#include <QNetworkAccessManager>

23+

24+class QNetworkConfigurationManager;

25+

26+class CachingNetworkAccessManager : public QNetworkAccessManager

27+{

28+public:

29+ CachingNetworkAccessManager(QObject *parent = 0);

30+

31+protected:

32+ QNetworkReply* createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0) override;

33+

34+private Q_SLOTS:

35+ void onlineStateChanged(bool isOnline);

36+

37+private:

38+ QNetworkConfigurationManager* m_networkManager;

39+ bool m_isOnline;

40+};

41+

42+class CachingNetworkManagerFactory : public QQmlNetworkAccessManagerFactory

43+{

44+public:

45+ CachingNetworkManagerFactory();

46+

47+ QNetworkAccessManager *create(QObject *parent) override;

48+};

49+

50+#endif // CACHINGNETWORKMANAGERFACTORY_H

src/main.cpp+5−2

@@ -34,15 +34,15 @@

34#include <paths.h>

35#include "MouseTouchAdaptor.h"

36#include "ApplicationArguments.h"

37+#include "CachingNetworkManagerFactory.h"

37

38

38#include <unity-mir/qmirserver.h>

39#include <unity-mir/qmirserver.h>

39

40

40−

41int startShell(int argc, const char** argv, void* server)

42{

43 const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";

44

45− QGuiApplication::setApplicationName("Unity 8");

45+ QGuiApplication::setApplicationName("unity8");

46 QGuiApplication *application;

47

48 QCommandLineParser parser;

@@ -157,6 +157,9 @@ Load the testability driver");

157 }

158 appendImportPaths(view->engine(), ::fallbackImportPaths());

159

160+ CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();

161+ view->engine()->setNetworkAccessManagerFactory(managerFactory);

162+

160 view->setSource(source);

163 view->setSource(source);

161 view->setColor("transparent");

164 view->setColor("transparent");

162 QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));

165 QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));