Merge lp:~mandel/ubuntu-download-manager/adapt-network-changes into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensure that the download manager does track network changes correctly.

Remove the usage of QSystemNetworkInfo and trust the QNetworkSession that does listen to the correct network changes.

The way to test this is to perform a download (click, update or manually following the test plan) and remove the wifi connection in between of the download. The download should be paused until the network is recovered.

[lp:~mandel/ubuntu-download-manager/adapt-network-changes]

339. By Manuel de la Peña on 2014-11-18

Connect before we open.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/742/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/742/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:339
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/743/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/743/rebuild

review: Approve (continuous-integration)

[Barry Warsaw (barry)]

I tested this on the krillin/devel channel (i.e. vivid) with the built .debs by doing the following:

Flashed the device to r37 and then hacked channel.ini to 36 as per:

https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-system-image

adb shell & sudo, then

$ system-image-cli -vv

As soon as the console indicated that the data files were starting to download, I shut off my wifi. I saw the download pause. Then I waited 15 seconds and turned the wifi back on. About another 30 seconds later, the device reconnected and the download resumed.

However, the download failed with the following traceback:

[systemimage] Nov 18 20:57:50 2014 (15059) uncaught exception in state machine
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/systemimage/state.py", line 123, in __next__
    step()
  File "/usr/lib/python3/dist-packages/systemimage/state.py", line 491, in _download_files
    self.downloader.get_files(downloads, pausable=True)
  File "/usr/lib/python3/dist-packages/systemimage/download.py", line 289, in get_files
    raise FileNotFoundError(reactor.error)
FileNotFoundError: http://system-image.ubuntu.com/pool/device-5533ed5d544bfe1c12e3e756907fa3258e8f03023ea1bfe4536f0fc08122673a.tar.xz:
[systemimage] Nov 18 20:57:50 2014 (15059) system-image-cli exception
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/systemimage/main.py", line 340, in main
    list(state)
  File "/usr/lib/python3/dist-packages/systemimage/state.py", line 123, in __next__
    step()
  File "/usr/lib/python3/dist-packages/systemimage/state.py", line 491, in _download_files
    self.downloader.get_files(downloads, pausable=True)
  File "/usr/lib/python3/dist-packages/systemimage/download.py", line 289, in get_files
    raise FileNotFoundError(reactor.error)
FileNotFoundError: http://system-image.ubuntu.com/pool/device-5533ed5d544bfe1c12e3e756907fa3258e8f03023ea1bfe4536f0fc08122673a.tar.xz:

I wonder if the file whose download got paused was corrupted when the download resumed?

review: Needs Fixing (testing)

[lp:~mandel/ubuntu-download-manager/adapt-network-changes]

340. By Manuel de la Peña on 2014-11-19

Adding extra logging.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/744/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/744/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/adapt-network-changes]

341. By Manuel de la Peña on 2014-11-21

Use the NM properties change signal.

342. By Manuel de la Peña on 2014-11-24

Use the nm signal.

343. By Manuel de la Peña on 2014-11-24

Add missing headers.

344. By Manuel de la Peña on 2014-11-24

Remove qDebug msgs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:344
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/745/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/745/rebuild

review: Approve (continuous-integration)

[Barry Warsaw (barry)]

Yep, the latest builds work for me.

$ system-image-cli -b 0 -vv

During the download of the data files, I shut off the wifi, and the downloads paused as expected. Then after a few seconds, I turned the wifi back on and udm soon noticed the connection was re-established. The download continued, and all files verified. The reboot occurred as expected.

review: Approve

[Manuel de la Peña (mandel)]

\o/ awesome. I'll get a code review and will deal with the silo etc.. to land this asap

[lp:~mandel/ubuntu-download-manager/adapt-network-changes]

345. By Manuel de la Peña on 2014-11-24

Deal with ethernet to make sure we are ok on the desktop.

346. By Manuel de la Peña on 2014-11-24

Just emit the signal when we change.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/746/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/746/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

[lp:~mandel/ubuntu-download-manager/adapt-network-changes]

347. By Manuel de la Peña on 2014-11-26

Be prepared for interface errors.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-27 13:16:11 +0000
+++ CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -43,7 +43,6 @@
 find_package(Qt5Core REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(Qt5Network REQUIRED)
-find_package(Qt5SystemInfo REQUIRED)
 find_package(Qt5Sql REQUIRED)
 find_package(Qt5Test REQUIRED)
 find_package(Boost COMPONENTS log program_options REQUIRED)

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-14 16:08:13 +0000
+++ debian/changelog	2014-11-26 12:24:23 +0000
@@ -1,3 +1,11 @@
+ubuntu-download-manager (0.9+14.10.20141014.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Fix issues with the network detection. Because of the new approach two
+    dependencies have been dropped. 
+  * Add network manager as dependency.
+
+ -- Manuel de la Pena <[e-mail]>  Wed, 26 Nov 2014 12:47:31 +0100
+
 ubuntu-download-manager (0.9+14.10.20141014.1-0ubuntu1) 14.09; urgency=medium
 
   [ Manuel de la Pena ]

=== modified file 'debian/control'
--- debian/control	2014-10-14 16:07:44 +0000
+++ debian/control	2014-11-26 12:24:23 +0000
@@ -7,10 +7,8 @@
                doxygen,
                dbus-test-runner,
                google-mock,
-               qt5-qmake,
                qt5-default,
                qtbase5-dev,
-               qtsystems5-dev,
                libboost-log-dev,
                libboost-program-options-dev,
                libdbus-1-dev,
@@ -19,7 +17,8 @@
                libgoogle-glog-dev,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
-               qtdeclarative5-test-plugin
+               qtdeclarative5-test-plugin,
+               network-manager
 Maintainer: Manuel de la Peña <[e-mail]>
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/ubuntu-system-image

=== modified file 'src/common/priv/CMakeLists.txt'
--- src/common/priv/CMakeLists.txt	2014-04-23 14:51:21 +0000
+++ src/common/priv/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -15,10 +15,11 @@
 	ubuntu/transfers/system/file_manager.cpp
 	ubuntu/transfers/system/filename_mutex.cpp
 	ubuntu/transfers/system/network_reply.cpp
+	ubuntu/transfers/system/network_session.cpp
+	ubuntu/transfers/system/nm_interface.cpp
 	ubuntu/transfers/system/process.cpp
 	ubuntu/transfers/system/process_factory.cpp
 	ubuntu/transfers/system/request_factory.cpp
-	ubuntu/transfers/system/system_network_info.cpp
 	ubuntu/transfers/system/timer.cpp
 	ubuntu/transfers/system/uuid_factory.cpp
 	ubuntu/transfers/system/uuid_utils.cpp
@@ -41,17 +42,17 @@
 	ubuntu/transfers/system/file_manager.h
 	ubuntu/transfers/system/filename_mutex.h
 	ubuntu/transfers/system/network_reply.h
+	ubuntu/transfers/system/network_session.h
+	ubuntu/transfers/system/nm_interface.h
 	ubuntu/transfers/system/pending_reply.h
 	ubuntu/transfers/system/process.h
 	ubuntu/transfers/system/process_factory.h
 	ubuntu/transfers/system/request_factory.h
-	ubuntu/transfers/system/system_network_info.h
 	ubuntu/transfers/system/timer.h
 	ubuntu/transfers/system/uuid_factory.h
 	ubuntu/transfers/system/uuid_utils.h
 )
 
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Sql_INCLUDE_DIRS})
@@ -81,7 +82,6 @@
 	${GLOG_LIBRARIES}
 	${Qt5Network_LIBRARIES}
 	${Qt5Sql_LIBRARIES}
-	${Qt5SystemInfo_LIBRARIES}
 	${Qt5Core_LIBRARIES}
 	${Qt5DBus_LIBRARIES}
 	udm-common

=== modified file 'src/common/priv/ubuntu/transfers/queue.cpp'
--- src/common/priv/ubuntu/transfers/queue.cpp	2014-04-08 20:19:38 +0000
+++ src/common/priv/ubuntu/transfers/queue.cpp	2014-11-26 12:24:23 +0000
@@ -18,8 +18,9 @@
 
 #include <QSignalMapper>
 #include <glog/logging.h>
+
 #include "ubuntu/transfers/system/logger.h"
-#include "ubuntu/transfers/system/system_network_info.h"
+#include "ubuntu/transfers/system/network_session.h"
 #include "queue.h"
 
 namespace Ubuntu {
@@ -29,9 +30,9 @@
 Queue::Queue(QObject* parent)
     : QObject(parent),
       _current("") {
-    CHECK(connect(SystemNetworkInfo::instance(),
-        &SystemNetworkInfo::currentNetworkModeChanged,
-        this, &Queue::onCurrentNetworkModeChanged))
+    CHECK(connect(NetworkSession::instance(),
+        &NetworkSession::sessionTypeChanged,
+        this, &Queue::onSessionTypeChanged))
             << "Could not connect to signal";
 }
 
@@ -99,7 +100,6 @@
     // get the appdownload that emited the signal and
     // decide what to do with it
     auto transfer = qobject_cast<Transfer*>(sender());
-    qDebug() << "State changed" << transfer;
     switch (transfer->state()) {
         case Transfer::START:
             // only start the transfer in the update method
@@ -113,9 +113,7 @@
             break;
         case Transfer::RESUME:
             // only resume the transfer in the update method
-            qDebug() << "State changed to resume.";
             if (_current.isEmpty()) {
-                qDebug() << "There is no current download present.";
                 updateCurrentTransfer();
             }
             break;
@@ -160,9 +158,9 @@
 }
 
 void
-Queue::onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode) {
-    TRACE << mode;
-    if (mode != QNetworkInfo::UnknownMode) {
+Queue::onSessionTypeChanged(QNetworkConfiguration::BearerType type) {
+    TRACE << type;
+    if (type != QNetworkConfiguration::BearerUnknown) {
         updateCurrentTransfer();
     }
 }
@@ -197,7 +195,6 @@
                 && (state == Transfer::START
                     || state == Transfer::RESUME)) {
             _current = path;
-            qDebug() << _current;
             if (state == Transfer::START)
                 transfer->startTransfer();
             else

=== modified file 'src/common/priv/ubuntu/transfers/queue.h'
--- src/common/priv/ubuntu/transfers/queue.h	2014-03-25 17:28:41 +0000
+++ src/common/priv/ubuntu/transfers/queue.h	2014-11-26 12:24:23 +0000
@@ -24,6 +24,8 @@
 #include <QList>
 #include <QPair>
 #include <QSharedPointer>
+
+#include "ubuntu/transfers/system/network_session.h"
 #include "transfer.h"
 
 namespace Ubuntu {
@@ -55,7 +57,7 @@
  private:
     void onManagedTransferStateChanged();
     void onUnmanagedTransferStateChanged();
-    void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
+    void onSessionTypeChanged(QNetworkConfiguration::BearerType type);
     void remove(const QString& path);
     void updateCurrentTransfer();
 

=== modified file 'src/common/priv/ubuntu/transfers/system/dbus_proxy.h'
--- src/common/priv/ubuntu/transfers/system/dbus_proxy.h	2014-04-23 14:51:21 +0000
+++ src/common/priv/ubuntu/transfers/system/dbus_proxy.h	2014-11-26 12:24:23 +0000
@@ -180,7 +180,7 @@
 
 namespace org {
   namespace freedesktop {
-    typedef ::DBusProxy DBus;
+    typedef ::DBusProxy DBusProxy;
   }
 }
 #endif

=== modified file 'src/common/priv/ubuntu/transfers/system/network_reply.cpp'
--- src/common/priv/ubuntu/transfers/system/network_reply.cpp	2014-07-30 09:19:10 +0000
+++ src/common/priv/ubuntu/transfers/system/network_reply.cpp	2014-11-26 12:24:23 +0000
@@ -16,8 +16,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QNetworkSession>
+
+#include <glog/logging.h>
 #include <ubuntu/transfers/system/logger.h>
-#include <glog/logging.h>
+
 #include "network_reply.h"
 
 namespace Ubuntu {

=== added file 'src/common/priv/ubuntu/transfers/system/network_session.cpp'
--- src/common/priv/ubuntu/transfers/system/network_session.cpp	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/system/network_session.cpp	2014-11-26 12:24:23 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QDebug>
+#include <QScopedPointer>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusPendingReply>
+
+#include <glog/logging.h>
+
+#include "network_session.h"
+
+namespace {
+    const QString NM_PATH = "org.freedesktop.NetworkManager";
+    const QString NM_OBJ_PATH = "/org/freedesktop/NetworkManager";
+    const QString NM_INTERFACE = "org.freedesktop.NetworkManager";
+    const QString PROPERTIES_INTERFACE = "org.freedesktop.DBus.Properties";
+    const QString NM_PROPERTY = "PrimaryConnectionType";
+}
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+namespace System {
+
+NetworkSession* NetworkSession::_instance = nullptr;
+QMutex NetworkSession::_mutex;
+
+NetworkSession::NetworkSession(QObject* parent)
+    : QObject(parent) {
+    _configManager = new QNetworkConfigurationManager();
+
+    CHECK(connect(_configManager, &QNetworkConfigurationManager::onlineStateChanged,
+                this, &NetworkSession::onlineStateChanged))
+             << "Could not connect to signal";
+
+    _nm = new NMInterface(NM_PATH, NM_OBJ_PATH, QDBusConnection::systemBus());
+
+    CHECK(connect(_nm, &NMInterface::PropertiesChanged,
+        this, &NetworkSession::onPropertiesChanged))
+	    << "Could not connect to signal";
+
+    QScopedPointer<QDBusInterface> interface(new QDBusInterface(NM_PATH, NM_OBJ_PATH,
+        PROPERTIES_INTERFACE, QDBusConnection::systemBus()));
+
+    QDBusPendingReply<QDBusVariant> reply =
+        interface->call("Get", NM_INTERFACE, NM_PROPERTY);
+
+    reply.waitForFinished();
+    if (!reply.isError()) {
+	LOG(INFO) << "Connection type " << reply.value().variant().toString().toStdString();
+        _sessionType = convertNMString(reply.value().variant().toString());
+    } else {
+	_error = true;
+	_errorMsg = reply.error().message();
+	LOG(ERROR) << _errorMsg.toStdString();
+    }
+
+}
+
+NetworkSession::~NetworkSession() {
+    delete _configManager;
+}
+
+bool
+NetworkSession::isError() {
+    return _error;
+}
+
+bool
+NetworkSession::isOnline() {
+    return _configManager->isOnline();
+}
+
+QNetworkConfiguration::BearerType
+NetworkSession::sessionType() {
+    return _sessionType;
+}
+
+NetworkSession*
+NetworkSession::instance() {
+    if(_instance == nullptr) {
+        LOG(INFO) << "Instance is null";
+        _mutex.lock();
+        if(_instance == nullptr){
+            LOG(INFO) << "Create new instance";
+            _instance = new NetworkSession();
+        }
+        _mutex.unlock();
+    }
+    return _instance;
+}
+
+void
+NetworkSession::setInstance(NetworkSession* instance) {
+    _instance = instance;
+}
+
+void
+NetworkSession::deleteInstance() {
+    if(_instance != nullptr) {
+        _mutex.lock();
+        if(_instance != nullptr) {
+            delete _instance;
+            _instance = nullptr;
+        }
+        _mutex.unlock();
+    }
+}
+
+QNetworkConfiguration::BearerType
+NetworkSession::convertNMString(const QString& str) {
+    if (str.contains("wireless")) {
+        return QNetworkConfiguration::BearerWLAN;
+    }
+
+    if (str.contains("ethernet")) {
+        return QNetworkConfiguration::BearerEthernet;
+    }
+
+    if (str == "gsm") {
+        return QNetworkConfiguration::Bearer3G;
+    }
+    return QNetworkConfiguration::BearerUnknown;
+}
+
+void
+NetworkSession::onPropertiesChanged(const QVariantMap& changedProperties) {
+    if (changedProperties.contains(NM_PROPERTY)) {
+	auto nmStr = changedProperties[NM_PROPERTY].toString();
+	LOG(INFO) << "Connection type " << nmStr.toStdString();
+	auto type = convertNMString(nmStr);
+	if (type != _sessionType) {
+            _sessionType = type;
+            emit sessionTypeChanged(type);
+	}
+    }
+
+}
+
+}
+
+}
+
+}

=== added file 'src/common/priv/ubuntu/transfers/system/network_session.h'
--- src/common/priv/ubuntu/transfers/system/network_session.h	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/system/network_session.h	2014-11-26 12:24:23 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TRANSFERS_LIB_NETWORK_SESSION_H
+#define TRANSFERS_LIB_NETWORK_SESSION_H
+
+#include <QMutex>
+#include <QNetworkConfigurationManager>
+#include <QObject>
+
+#include "nm_interface.h"
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+namespace System {
+
+class NetworkSession : public QObject {
+    Q_OBJECT
+
+ public:
+    ~NetworkSession();
+
+    virtual bool isError();
+    virtual bool isOnline();
+    virtual QNetworkConfiguration::BearerType sessionType();
+
+    static NetworkSession* instance();
+
+    // only used for testing so that we can inject a fake
+    static void setInstance(NetworkSession* instance);
+    static void deleteInstance();
+
+ signals:
+    void sessionTypeChanged(QNetworkConfiguration::BearerType type);
+    void onlineStateChanged(bool state);
+
+ protected:
+    explicit NetworkSession(QObject* parent=0);
+
+ private:
+    QNetworkConfiguration::BearerType convertNMString(const QString& str);
+    void onPropertiesChanged(const QVariantMap& changedProperties);
+
+ private:
+    // used for the singleton
+    static NetworkSession* _instance;
+    static QMutex _mutex;
+
+    QNetworkConfigurationManager* _configManager = nullptr;
+    NMInterface* _nm = nullptr;
+    QNetworkConfiguration::BearerType _sessionType =
+        QNetworkConfiguration::BearerUnknown;
+    bool _error = false;
+    QString _errorMsg = QString::null;
+};
+
+}
+
+}
+
+}
+
+#endif

=== added file 'src/common/priv/ubuntu/transfers/system/nm_interface.cpp'
--- src/common/priv/ubuntu/transfers/system/nm_interface.cpp	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/system/nm_interface.cpp	2014-11-26 12:24:23 +0000
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp properties.xml -p nm_interface -c NMInterface
+ *
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "nm_interface.h"
+
+/*
+ * Implementation of interface class NMInterface
+ */
+
+NMInterface::NMInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+NMInterface::~NMInterface()
+{
+}
+

=== added file 'src/common/priv/ubuntu/transfers/system/nm_interface.h'
--- src/common/priv/ubuntu/transfers/system/nm_interface.h	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/system/nm_interface.h	2014-11-26 12:24:23 +0000
@@ -0,0 +1,48 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp properties.xml -p nm_interface -c NMInterface
+ *
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef NM_INTERFACE_H_1416842043
+#define NM_INTERFACE_H_1416842043
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface org.freedesktop.NetworkManager
+ */
+class NMInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.freedesktop.NetworkManager"; }
+
+public:
+    NMInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~NMInterface();
+
+public Q_SLOTS: // METHODS
+Q_SIGNALS: // SIGNALS
+    void PropertiesChanged(const QVariantMap &in0);
+};
+
+namespace org {
+  namespace freedesktop {
+    typedef ::NMInterface NetworkManager;
+  }
+}
+#endif

=== removed file 'src/common/priv/ubuntu/transfers/system/system_network_info.cpp'
--- src/common/priv/ubuntu/transfers/system/system_network_info.cpp	2014-04-08 20:21:07 +0000
+++ src/common/priv/ubuntu/transfers/system/system_network_info.cpp	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
-/*
- * Copyright 2013-2014 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <QNetworkConfigurationManager>
-#include <QNetworkSession>
-#include <glog/logging.h>
-#include <ubuntu/transfers/system/logger.h>
-#include "system_network_info.h"
-
-namespace Ubuntu {
-
-namespace Transfers {
-
-namespace System {
-
-SystemNetworkInfo* SystemNetworkInfo::_instance = nullptr;
-QMutex SystemNetworkInfo::_mutex;
-
-SystemNetworkInfo::SystemNetworkInfo(QObject* parent)
-    : QObject(parent) {
-    _info = new QNetworkInfo(this);
-    _configMan = new QNetworkConfigurationManager(this);
-
-#ifdef DEBUG
-    // in debug do log the changes else just fwd them
-    CHECK(connect(_info, &QNetworkInfo::cellIdChanged, this,
-        &SystemNetworkInfo::onCellIdChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged,
-        this, &SystemNetworkInfo::onCurrentCellDataTechnologyChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, this,
-        &SystemNetworkInfo::onCurrentMobileCountryCodeChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, this,
-        &SystemNetworkInfo::onCurrentMobileNetworkCodeChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::currentNetworkModeChanged, this,
-        &SystemNetworkInfo::onCurrentNetworkModeChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::locationAreaCodeChanged, this,
-        &SystemNetworkInfo::onLocationAreaCodeChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::networkInterfaceCountChanged, this,
-        &SystemNetworkInfo::onNetworkInterfaceCountChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::networkNameChanged, this,
-        &SystemNetworkInfo::onNetworkNameChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::networkSignalStrengthChanged, this,
-        &SystemNetworkInfo::onNetworkSignalStrengthChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::networkStatusChanged, this,
-        &SystemNetworkInfo::onNetworkStatusChanged))
-                    << "Could not connect to signal";
-
-    CHECK(connect(_configMan,
-        &QNetworkConfigurationManager::onlineStateChanged, this,
-        &SystemNetworkInfo::onOnlineStateChanged))
-                    << "Could not connect to signal";
-#else
-    // connect to interesting signals
-    CHECK(connect(_info, &QNetworkInfo::cellIdChanged, this,
-        &SystemNetworkInfo::cellIdChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged,
-        this, &SystemNetworkInfo::currentCellDataTechnologyChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, this,
-        &SystemNetworkInfo::currentMobileCountryCodeChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, this,
-        &SystemNetworkInfo::currentMobileNetworkCodeChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::currentNetworkModeChanged, this,
-        &SystemNetworkInfo::currentNetworkModeChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::locationAreaCodeChanged, this,
-        &SystemNetworkInfo::locationAreaCodeChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::networkInterfaceCountChanged, this,
-        &SystemNetworkInfo::networkInterfaceCountChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::networkNameChanged, this,
-        &SystemNetworkInfo::networkNameChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::networkSignalStrengthChanged, this,
-        &SystemNetworkInfo::networkSignalStrengthChanged))
-                    << "Could not connect to signal";
-    CHECK(connect(_info, &QNetworkInfo::networkStatusChanged, this,
-        &SystemNetworkInfo::networkStatusChanged))
-                    << "Could not connect to signal";
-
-    CHECK(connect(_configMan,
-        &QNetworkConfigurationManager::onlineStateChanged, this,
-        &SystemNetworkInfo::onlineStateChanged))
-                    << "Could not connect to signal";
-#endif
-
-}
-
-QNetworkInfo::NetworkMode
-SystemNetworkInfo::currentNetworkMode() {
-    return _info->currentNetworkMode();
-}
-
-bool
-SystemNetworkInfo::isOnline() {
-    return _configMan->isOnline();
-}
-
-SystemNetworkInfo*
-SystemNetworkInfo::instance() {
-    if(_instance == nullptr) {
-        LOG(INFO) << "Instance is null";
-        _mutex.lock();
-        if(_instance == nullptr){
-            LOG(INFO) << "Create new instance";
-            _instance = new SystemNetworkInfo();
-        }
-        _mutex.unlock();
-    }
-    return _instance;
-}
-
-void
-SystemNetworkInfo::setInstance(SystemNetworkInfo* instance) {
-    _instance = instance;
-}
-
-void
-SystemNetworkInfo::deleteInstance() {
-    if(_instance != nullptr) {
-        _mutex.lock();
-        if(_instance != nullptr) {
-            delete _instance;
-            _instance = nullptr;
-        }
-        _mutex.unlock();
-    }
-}
-
-void
-SystemNetworkInfo::onOnlineStateChanged(bool online) {
-    TRACE << online;
-    emit onlineStateChanged(online);
-}
-
-#if DEBUG
-
-void
-SystemNetworkInfo::onCellIdChanged(int interface, const QString& id) {
-    TRACE << interface << id;
-    emit cellIdChanged(interface, id);
-}
-
-void
-SystemNetworkInfo::onCurrentCellDataTechnologyChanged(int interface,
-                                QNetworkInfo::CellDataTechnology tech) {
-    TRACE << interface << tech;
-    emit currentCellDataTechnologyChanged(interface, tech);
-}
-
-void
-SystemNetworkInfo::onCurrentMobileCountryCodeChanged(int interface, const QString& mcc) {
-    TRACE << interface << mcc;
-    emit currentMobileCountryCodeChanged(interface, mcc);
-}
-
-void
-SystemNetworkInfo::onCurrentMobileNetworkCodeChanged(int interface, const QString& mnc) {
-    TRACE << interface << mnc;
-    emit currentMobileNetworkCodeChanged(interface, mnc);
-}
-
-void
-SystemNetworkInfo::onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode) {
-    TRACE << mode;
-    emit currentNetworkModeChanged(mode);
-}
-
-void
-SystemNetworkInfo::onLocationAreaCodeChanged(int interface, const QString& lac) {
-    TRACE << interface << lac;
-    emit locationAreaCodeChanged(interface, lac);
-}
-
-void
-SystemNetworkInfo::onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode mode,
-                                                  int count) {
-    TRACE << mode << count;
-    emit networkInterfaceCountChanged(mode, count);
-}
-
-void
-SystemNetworkInfo::onNetworkNameChanged(QNetworkInfo::NetworkMode mode, int interface,
-                                        const QString& name) {
-    TRACE << mode << interface << name;
-    emit networkNameChanged(mode, interface, name);
-}
-
-void
-SystemNetworkInfo::onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode mode,
-                                                  int interface, int strength) {
-    TRACE << mode << interface << strength;
-    emit networkSignalStrengthChanged(mode, interface, strength);
-}
-
-void
-SystemNetworkInfo::onNetworkStatusChanged(QNetworkInfo::NetworkMode mode, int interface,
-                                          QNetworkInfo::NetworkStatus status) {
-    TRACE << mode << interface << status;
-    emit networkStatusChanged(mode, interface, status);
-}
-
-#endif
-
-}  // System
-
-}  // Transfers
-
-}  // Ubuntu

=== removed file 'src/common/priv/ubuntu/transfers/system/system_network_info.h'
--- src/common/priv/ubuntu/transfers/system/system_network_info.h	2014-02-27 16:53:19 +0000
+++ src/common/priv/ubuntu/transfers/system/system_network_info.h	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-/*
- * Copyright 2013-2014 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef DOWNLOADER_LIB_SYSTEM_NETWORK_INFO_H
-#define DOWNLOADER_LIB_SYSTEM_NETWORK_INFO_H
-
-#include <QAtomicPointer>
-#include <QMutex>
-#include <QNetworkAccessManager>
-#include <QNetworkConfigurationManager>
-#include <QNetworkInfo>
-#include <QObject>
-
-namespace Ubuntu {
-
-namespace Transfers {
-
-namespace System {
-
-class SystemNetworkInfo : public QObject {
-    Q_OBJECT
-
- public:
-    virtual QNetworkInfo::NetworkMode currentNetworkMode();
-    virtual bool isOnline();
-
-    static SystemNetworkInfo* instance();
-
-    // only used for testing so that we can inject a fake
-    static void setInstance(SystemNetworkInfo* instance);
-    static void deleteInstance();
-
- signals:
-
-    // fwd QNetworkInfo signals
-    void cellIdChanged(int interface, const QString& id);
-    void currentCellDataTechnologyChanged(int interface, QNetworkInfo::CellDataTechnology tech);
-    void currentMobileCountryCodeChanged(int interface, const QString& mcc);
-    void currentMobileNetworkCodeChanged(int interface, const QString& mnc);
-    void currentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
-    void locationAreaCodeChanged(int interface, const QString& lac);
-    void networkInterfaceCountChanged(QNetworkInfo::NetworkMode mode, int count);
-    void networkNameChanged(QNetworkInfo::NetworkMode mode, int interface, const QString& name);
-    void networkSignalStrengthChanged(QNetworkInfo::NetworkMode mode, int interface, int strength);
-    void networkStatusChanged(QNetworkInfo::NetworkMode mode, int interface, QNetworkInfo::NetworkStatus status);
-
-    // network status signals
-    void onlineStateChanged(bool online);
-
- protected:
-    // left protected so that teh child fake class can use it
-    explicit SystemNetworkInfo(QObject *parent = 0);
-
- private:
-    void onOnlineStateChanged(bool);
-
-#if DEBUG
-    // track the changes so that we get some debug info, else we will just fwd the signals
-    void onCellIdChanged(int, const QString&);
-    void onCurrentCellDataTechnologyChanged(int,
-        QNetworkInfo::CellDataTechnology);
-    void onCurrentMobileCountryCodeChanged(int, const QString&);
-    void onCurrentMobileNetworkCodeChanged(int, const QString&);
-    void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode);
-    void onLocationAreaCodeChanged(int, const QString&);
-    void onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode, int);
-    void onNetworkNameChanged(QNetworkInfo::NetworkMode, int, const QString&);
-    void onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int);
-    void onNetworkStatusChanged(QNetworkInfo::NetworkMode, int,
-        QNetworkInfo::NetworkStatus);
-#endif
-
- private:
-    // used for the singleton
-    static SystemNetworkInfo* _instance;
-    static QMutex _mutex;
-
-    // internal vars
-    QNetworkInfo* _info;
-    QNetworkConfigurationManager* _configMan;
-};
-
-}  // System
-
-}  // Transfers
-
-}  // Ubuntu
-
-#endif  // DOWNLOADER_LIB_SYSTEM_NETWORK_INFO_H

=== modified file 'src/common/priv/ubuntu/transfers/transfer.cpp'
--- src/common/priv/ubuntu/transfers/transfer.cpp	2014-07-16 08:41:38 +0000
+++ src/common/priv/ubuntu/transfers/transfer.cpp	2014-11-26 12:24:23 +0000
@@ -17,6 +17,9 @@
  */
 
 #include <ubuntu/transfers/system/logger.h>
+
+#include <glog/logging.h>
+
 #include "transfer.h"
 
 namespace Ubuntu {
@@ -38,7 +41,7 @@
       _dbusPath(path),
       _isConfined(isConfined),
       _rootPath(rootPath) {
-    _networkInfo = System::SystemNetworkInfo::instance();
+    _networkSession = System::NetworkSession::instance();
     setObjectName(id);
 }
 
@@ -84,22 +87,22 @@
 bool
 Transfer::canTransfer() {
     TRACE;
-    QNetworkInfo::NetworkMode mode = _networkInfo->currentNetworkMode();
+    auto mode = _networkSession->sessionType();
     switch (mode) {
-        case QNetworkInfo::UnknownMode:
-            qWarning() << "Network Mode unknown!";
-            return _allowMobileData;
+        case QNetworkConfiguration::BearerUnknown:
+            LOG(WARNING) << "Network Mode unknown!";
+	    if (_networkSession->isError())
+                return true;
+	    else
+                return _allowMobileData;
             break;
-        case QNetworkInfo::GsmMode:
-        case QNetworkInfo::CdmaMode:
-        case QNetworkInfo::WcdmaMode:
-        case QNetworkInfo::WimaxMode:
-        case QNetworkInfo::TdscdmaMode:
-        case QNetworkInfo::LteMode:
+        case QNetworkConfiguration::Bearer2G:
+        case QNetworkConfiguration::Bearer3G:
+        case QNetworkConfiguration::Bearer4G:
             return _allowMobileData;
-        case QNetworkInfo::WlanMode:
-        case QNetworkInfo::EthernetMode:
-        case QNetworkInfo::BluetoothMode:
+        case QNetworkConfiguration::BearerEthernet:
+        case QNetworkConfiguration::BearerWLAN:
+        case QNetworkConfiguration::BearerBluetooth:
             return true;
         default:
             return false;

=== modified file 'src/common/priv/ubuntu/transfers/transfer.h'
--- src/common/priv/ubuntu/transfers/transfer.h	2014-07-16 08:41:38 +0000
+++ src/common/priv/ubuntu/transfers/transfer.h	2014-11-26 12:24:23 +0000
@@ -20,7 +20,7 @@
 #define UBUNTU_GENERAL_LIB_TRANSFER_H
 
 #include <QObject>
-#include "ubuntu/transfers/system/system_network_info.h"
+#include "ubuntu/transfers/system/network_session.h"
 
 namespace Ubuntu {
 
@@ -106,7 +106,7 @@
     QString _dbusPath;
     bool _isConfined;
     QString _rootPath;
-    System::SystemNetworkInfo* _networkInfo;
+    System::NetworkSession* _networkSession;
 };
 
 }  // Transfers

=== modified file 'src/downloads/priv/CMakeLists.txt'
--- src/downloads/priv/CMakeLists.txt	2014-10-09 09:52:34 +0000
+++ src/downloads/priv/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -42,7 +42,6 @@
 	ubuntu/downloads/state_machines/state.h
 )
 
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Sql_INCLUDE_DIRS})

=== modified file 'src/downloads/priv/ubuntu/downloads/download.h'
--- src/downloads/priv/ubuntu/downloads/download.h	2014-09-17 15:42:53 +0000
+++ src/downloads/priv/ubuntu/downloads/download.h	2014-11-26 12:24:23 +0000
@@ -28,7 +28,6 @@
 #include <ubuntu/download_manager/metatypes.h>
 #include "ubuntu/transfers/system/process_factory.h"
 #include "ubuntu/transfers/system/request_factory.h"
-#include "ubuntu/transfers/system/system_network_info.h"
 
 
 namespace Ubuntu {

=== modified file 'src/downloads/priv/ubuntu/downloads/factory.h'
--- src/downloads/priv/ubuntu/downloads/factory.h	2014-03-28 15:50:25 +0000
+++ src/downloads/priv/ubuntu/downloads/factory.h	2014-11-26 12:24:23 +0000
@@ -22,7 +22,6 @@
 #include <QObject>
 #include <ubuntu/download_manager/metatypes.h>
 #include <ubuntu/transfers/system/apparmor.h>
-#include <ubuntu/transfers/system/system_network_info.h>
 #include <ubuntu/transfers/system/uuid_factory.h>
 #include "download.h"
 

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.cpp'
--- src/downloads/priv/ubuntu/downloads/file_download.cpp	2014-10-10 10:54:15 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.cpp	2014-11-26 12:24:23 +0000
@@ -815,8 +815,7 @@
 FileDownload::init() {
     _requestFactory = RequestFactory::instance();
     _fileNameMutex = FileNameMutex::instance();
-    SystemNetworkInfo* networkInfo = SystemNetworkInfo::instance();
-    _connected = networkInfo->isOnline();
+    _connected = NetworkSession::instance()->isOnline();
     _downloading = false;
 
     // applications that are confined are not allowed to set the click metadata.
@@ -825,7 +824,7 @@
     }
 
     // connect to the network changed signals
-    CHECK(connect(networkInfo, &SystemNetworkInfo::onlineStateChanged,
+    CHECK(connect(NetworkSession::instance(), &NetworkSession::onlineStateChanged,
         this, &FileDownload::onOnlineStateChanged))
             << "Could not connect to signal";
 

=== modified file 'src/downloads/test-daemon/CMakeLists.txt'
--- src/downloads/test-daemon/CMakeLists.txt	2014-03-27 12:54:03 +0000
+++ src/downloads/test-daemon/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -21,7 +21,6 @@
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Sql_INCLUDE_DIRS})
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
@@ -43,7 +42,6 @@
         ${Qt5DBus_LIBRARIES}
         ${Qt5Network_LIBRARIES}
 	${Qt5Sql_LIBRARIES}
-        ${Qt5SystemInfo_LIBRARIES}
 	udm-common
 	udm-priv-common
 	ubuntu-download-manager-common

=== modified file 'src/uploads/priv/CMakeLists.txt'
--- src/uploads/priv/CMakeLists.txt	2014-03-28 11:08:00 +0000
+++ src/uploads/priv/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -26,7 +26,6 @@
         ubuntu/uploads/upload_manager_factory.h
 )
 
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Sql_INCLUDE_DIRS})

=== modified file 'src/uploads/priv/ubuntu/uploads/factory.h'
--- src/uploads/priv/ubuntu/uploads/factory.h	2014-04-24 18:37:28 +0000
+++ src/uploads/priv/ubuntu/uploads/factory.h	2014-11-26 12:24:23 +0000
@@ -22,7 +22,6 @@
 #include <QObject>
 #include <ubuntu/upload_manager/metatypes.h>
 #include <ubuntu/transfers/system/apparmor.h>
-#include <ubuntu/transfers/system/system_network_info.h>
 #include <ubuntu/transfers/system/uuid_factory.h>
 #include "file_upload.h"
 

=== modified file 'tests/common/CMakeLists.txt'
--- tests/common/CMakeLists.txt	2014-07-17 08:40:07 +0000
+++ tests/common/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -18,13 +18,11 @@
         process.h
         process_factory.h
         request_factory.h
-        system_network_info.h
         testing_interface.h
         uuid_factory.h
 )
 
 include_directories(${Qt5Core_INCLUDE_DIRS})
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Test_INCLUDE_DIRS})
@@ -51,12 +49,12 @@
 target_link_libraries(${TARGET}
     ${NIH_DBUS_LIBRARIES}
     ${GLOG_LIBRARIES}
-        ${Qt5Core_LIBRARIES}
-        ${Qt5Sql_LIBRARIES}
-        ${Qt5DBus_LIBRARIES}
+    ${Qt5Core_LIBRARIES}
+    ${Qt5Sql_LIBRARIES}
+    ${Qt5DBus_LIBRARIES}
     ${Qt5Test_LIBRARIES}
-        ${GMOCK_LIBRARY}
-        ${GTEST_BOTH_LIBRARIES}
+    ${GMOCK_LIBRARY}
+    ${GTEST_BOTH_LIBRARIES}
     udm-common
     udm-priv-common
     ubuntu-download-manager-common

=== modified file 'tests/common/daemon_testcase.cpp'
--- tests/common/daemon_testcase.cpp	2014-07-03 09:01:01 +0000
+++ tests/common/daemon_testcase.cpp	2014-11-26 12:24:23 +0000
@@ -219,6 +219,7 @@
 
 void
 DaemonTestCase::startHttpServer() {
+    qDebug() << "Start http server";
     auto serverDir = httpServerDir();
     _httpServer = new QProcess();
     _httpServer->setWorkingDirectory(serverDir);

=== added file 'tests/common/network_session.h'
--- tests/common/network_session.h	1970-01-01 00:00:00 +0000
+++ tests/common/network_session.h	2014-11-26 12:24:23 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef FAKE_NETWORK_SESSION_H
+#define FAKE_NETWORK_SESSION_H
+
+#include <QObject>
+#include <ubuntu/transfers/system/network_session.h>
+#include <gmock/gmock.h>
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+using namespace System;
+
+namespace Tests {
+
+class MockNetworkSession : public NetworkSession {
+ public:
+    explicit MockNetworkSession(QObject* parent = 0) :
+        NetworkSession(parent) {}
+
+    MOCK_METHOD0(sessionType, QNetworkConfiguration::BearerType());
+    MOCK_METHOD0(isOnline, bool());
+
+    bool isError() override {
+        return false;
+    }
+
+};
+
+}  // Ubuntu
+
+}  // Transfers
+
+}  // Tests
+
+#endif

=== removed file 'tests/common/system_network_info.h'
--- tests/common/system_network_info.h	2014-07-07 12:16:47 +0000
+++ tests/common/system_network_info.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright 2013-2014 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef FAKE_SYSTEM_NETWORK_INFO_H
-#define FAKE_SYSTEM_NETWORK_INFO_H
-
-#include <QObject>
-#include <ubuntu/transfers/system/system_network_info.h>
-#include <gmock/gmock.h>
-
-namespace Ubuntu {
-
-namespace Transfers {
-
-using namespace System;
-
-namespace Tests {
-
-class MockSystemNetworkInfo : public SystemNetworkInfo {
- public:
-    explicit MockSystemNetworkInfo(QObject* parent = 0) :
-        SystemNetworkInfo(parent) {}
-
-    MOCK_METHOD0(currentNetworkMode, QNetworkInfo::NetworkMode());
-    MOCK_METHOD0(isOnline, bool());
-
-    using SystemNetworkInfo::cellIdChanged;
-    using SystemNetworkInfo::currentCellDataTechnologyChanged;
-    using SystemNetworkInfo::currentMobileCountryCodeChanged;
-    using SystemNetworkInfo::currentMobileNetworkCodeChanged;
-    using SystemNetworkInfo::currentNetworkModeChanged;
-    using SystemNetworkInfo::locationAreaCodeChanged;
-    using SystemNetworkInfo::networkInterfaceCountChanged;
-    using SystemNetworkInfo::networkNameChanged;
-    using SystemNetworkInfo::networkSignalStrengthChanged;
-    using SystemNetworkInfo::networkStatusChanged;
-    using SystemNetworkInfo::onlineStateChanged;
-};
-
-}  // Ubuntu
-
-}  // Transfers
-
-}  // Tests
-
-#endif  // FAKE_SYSTEM_NETWORK_INFO_H

=== modified file 'tests/downloads/client/CMakeLists.txt'
--- tests/downloads/client/CMakeLists.txt	2014-09-17 15:42:53 +0000
+++ tests/downloads/client/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -35,7 +35,6 @@
 endforeach(test)
 
 include_directories(${Qt5Core_INCLUDE_DIRS})
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Test_INCLUDE_DIRS})
@@ -82,7 +81,7 @@
                         ${CLIENT_TESTS_LIBS}
                 )
 
-                ADD_TEST(NAME client_${test} COMMAND dbus-test-runner -m 180 --task=${CMAKE_CURRENT_BINARY_DIR}/${test}_client -c)
+                ADD_TEST(NAME client_${test} COMMAND dbus-test-runner -m 360 --task=${CMAKE_CURRENT_BINARY_DIR}/${test}_client -c)
 
         endforeach(test)
 else(DBUS_RUNNER)

=== modified file 'tests/downloads/daemon/CMakeLists.txt'
--- tests/downloads/daemon/CMakeLists.txt	2014-07-16 11:46:55 +0000
+++ tests/downloads/daemon/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -67,7 +67,6 @@
 
 
 include_directories(${Qt5Core_INCLUDE_DIRS})
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Test_INCLUDE_DIRS})

=== modified file 'tests/downloads/daemon/test_daemon.cpp'
--- tests/downloads/daemon/test_daemon.cpp	2014-09-17 15:42:53 +0000
+++ tests/downloads/daemon/test_daemon.cpp	2014-11-26 12:24:23 +0000
@@ -16,6 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <network_session.h>
+
 #include "test_daemon.h"
 
 using namespace Ubuntu::DownloadManager;
@@ -34,7 +36,7 @@
 void
 TestDaemon::cleanup() {
     DefaultValue<QStringList>::Clear();
-    SystemNetworkInfo::deleteInstance();
+    NetworkSession::deleteInstance();
     RequestFactory::deleteInstance();
     BaseTestCase::cleanup();
 }

=== modified file 'tests/downloads/daemon/test_download.cpp'
--- tests/downloads/daemon/test_download.cpp	2014-09-22 23:24:34 +0000
+++ tests/downloads/daemon/test_download.cpp	2014-11-26 12:24:23 +0000
@@ -50,8 +50,8 @@
     _path = "random path to dbus";
     _url = QUrl("http://ubuntu.com/data.txt");
     _algo = "Sha256";
-    _networkInfo = new MockSystemNetworkInfo();
-    SystemNetworkInfo::setInstance(_networkInfo);
+    _networkSession = new MockNetworkSession();
+    NetworkSession::setInstance(_networkSession);
     _reqFactory = new MockRequestFactory();
     RequestFactory::setInstance(_reqFactory);
     _processFactory = new MockProcessFactory();
@@ -64,7 +64,7 @@
 
 void
 TestDownload::verifyMocks() {
-    QVERIFY(Mock::VerifyAndClearExpectations(_networkInfo));
+    QVERIFY(Mock::VerifyAndClearExpectations(_networkSession));
     QVERIFY(Mock::VerifyAndClearExpectations(_reqFactory));
     QVERIFY(Mock::VerifyAndClearExpectations(_processFactory));
     QVERIFY(Mock::VerifyAndClearExpectations(_fileManager));
@@ -75,7 +75,7 @@
 TestDownload::cleanup() {
     BaseTestCase::cleanup();
 
-    SystemNetworkInfo::deleteInstance();
+    NetworkSession::deleteInstance();
     RequestFactory::deleteInstance();
     ProcessFactory::deleteInstance();
     FileManager::deleteInstance();
@@ -107,7 +107,7 @@
     QFETCH(QString, path);
     QFETCH(QUrl, url);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(id, appId, path,
@@ -158,7 +158,7 @@
     QFETCH(QString, hash);
     QFETCH(QString, algo);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(id, appId, path,
@@ -181,7 +181,7 @@
     QVariantMap metadata;
     metadata[Ubuntu::Transfers::Metadata::CLICK_PACKAGE_KEY] = "click";
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -195,7 +195,7 @@
     QVariantMap metadata;
     metadata[Ubuntu::Transfers::Metadata::CLICK_PACKAGE_KEY] = "click";
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -220,7 +220,7 @@
     // create an app download and assert that the returned data is correct
     QFETCH(QString, path);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, path,
@@ -245,7 +245,7 @@
     // create an app download and assert that the returned data is correct
     QFETCH(QUrl, url);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -278,7 +278,7 @@
     auto file = new MockFile("test");
     auto reply = new MockNetworkReply();
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // set expectations to get the request and the reply correctly
@@ -366,7 +366,7 @@
     auto file = new MockFile("test");
     auto reply = new MockNetworkReply();
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // set expectations to get the request and the reply correctly
@@ -440,7 +440,7 @@
     auto file = new MockFile("test");
     auto reply = new MockNetworkReply();
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // set expectations to get the request and the reply correctly
@@ -511,7 +511,7 @@
 
 void
 TestDownload::testTotalSizeNoProgress() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -533,7 +533,7 @@
 void
 TestDownload::testSetThrottleNoReply() {
     QFETCH(qulonglong, speed);
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -560,7 +560,7 @@
     auto file = new MockFile("test");
     auto reply = new MockNetworkReply();
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // set expectations to get the request and the reply correctly
@@ -614,7 +614,7 @@
 TestDownload::testSetGSMDownloadSame() {
     QFETCH(bool, value);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -641,7 +641,7 @@
     QFETCH(bool, oldValue);
     QFETCH(bool, newValue);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -659,40 +659,35 @@
 TestDownload::testCanDownloadGSM_data() {
     QTest::addColumn<QVariant>("mode");
 
-    QVariant gsmMode, cdmaMode, wCdmaMode, wlanMode, ethernetMode,
-        bluetoothMode, wimaxMode, lteMode, tdscdmaMode;
-
-    gsmMode.setValue(QNetworkInfo::GsmMode);
-    cdmaMode.setValue(QNetworkInfo::CdmaMode);
-    wCdmaMode.setValue(QNetworkInfo::WcdmaMode);
-    wlanMode.setValue(QNetworkInfo::WlanMode);
-    ethernetMode.setValue(QNetworkInfo::EthernetMode);
-    bluetoothMode.setValue(QNetworkInfo::BluetoothMode);
-    wimaxMode.setValue(QNetworkInfo::WimaxMode);
-    lteMode.setValue(QNetworkInfo::LteMode);
-    tdscdmaMode.setValue(QNetworkInfo::TdscdmaMode);
-
-    QTest::newRow("GSM Mode") << gsmMode;
-    QTest::newRow("CDMA Mode") << cdmaMode;
-    QTest::newRow("WCDMA Mode") << wCdmaMode;
-    QTest::newRow("Wlan Mode") << wlanMode;
-    QTest::newRow("Ethernet Mode") << ethernetMode;
-    QTest::newRow("Bluetooth Mode") << bluetoothMode;
-    QTest::newRow("WIMAX Mode") << wimaxMode;
-    QTest::newRow("LTE Mode") << lteMode;
-    QTest::newRow("TDSCDMA Mode") << tdscdmaMode;
+    QVariant unknown, twoG, ethernet, wlan, bluetooth, threeG, fourG;
+
+    unknown.setValue(QNetworkConfiguration::BearerUnknown);
+    twoG.setValue(QNetworkConfiguration::Bearer2G);
+    ethernet.setValue(QNetworkConfiguration::BearerEthernet);
+    wlan.setValue(QNetworkConfiguration::BearerWLAN);
+    bluetooth.setValue(QNetworkConfiguration::BearerBluetooth);
+    threeG.setValue(QNetworkConfiguration::Bearer3G);
+    fourG.setValue(QNetworkConfiguration::Bearer4G);
+
+    QTest::newRow("Unknown Mode") << unknown;
+    QTest::newRow("2G Mode") << twoG;
+    QTest::newRow("Ethernet Mode") << ethernet;
+    QTest::newRow("WLAN Mode") << wlan;
+    QTest::newRow("Bluetooth Mode") << bluetooth;
+    QTest::newRow("3G Mode") << threeG;
+    QTest::newRow("4G Mode") << fourG;
 }
 
 void
 TestDownload::testCanDownloadGSM() {
     QFETCH(QVariant, mode);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
-    EXPECT_CALL(*_networkInfo, currentNetworkMode())
+    EXPECT_CALL(*_networkSession, sessionType())
         .Times(1)
-        .WillOnce(Return(mode.value<QNetworkInfo::NetworkMode>()));
+        .WillOnce(Return(mode.value<QNetworkConfiguration::BearerType>()));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
         _isConfined, _rootPath, _url, _metadata, _headers));
@@ -706,30 +701,23 @@
     QTest::addColumn<QVariant>("mode");
     QTest::addColumn<bool>("result");
 
-    QVariant unknownMode, gsmMode, cdmaMode, wCdmaMode, wlanMode, ethernetMode,
-        bluetoothMode, wimaxMode, lteMode, tdscdmaMode;
-
-    unknownMode.setValue(QNetworkInfo::UnknownMode);
-    gsmMode.setValue(QNetworkInfo::GsmMode);
-    cdmaMode.setValue(QNetworkInfo::CdmaMode);
-    wCdmaMode.setValue(QNetworkInfo::WcdmaMode);
-    wlanMode.setValue(QNetworkInfo::WlanMode);
-    ethernetMode.setValue(QNetworkInfo::EthernetMode);
-    bluetoothMode.setValue(QNetworkInfo::BluetoothMode);
-    wimaxMode.setValue(QNetworkInfo::WimaxMode);
-    lteMode.setValue(QNetworkInfo::LteMode);
-    tdscdmaMode.setValue(QNetworkInfo::TdscdmaMode);
-
-    QTest::newRow("Unknown Mode") << unknownMode << false;
-    QTest::newRow("GSM Mode") << gsmMode << false;
-    QTest::newRow("CDMA Mode") << cdmaMode << false;
-    QTest::newRow("WCDMA Mode") << wCdmaMode << false;
-    QTest::newRow("Wlan Mode") << wlanMode << true;
-    QTest::newRow("Ethernet Mode") << ethernetMode << true;
-    QTest::newRow("Bluetooth Mode") << bluetoothMode << true;
-    QTest::newRow("WIMAX Mode") << wimaxMode << false;
-    QTest::newRow("LTE Mode") << lteMode << false;
-    QTest::newRow("TDSCDMA Mode") << tdscdmaMode << false;
+    QVariant unknown, twoG, ethernet, wlan, bluetooth, threeG, fourG;
+
+    unknown.setValue(QNetworkConfiguration::BearerUnknown);
+    twoG.setValue(QNetworkConfiguration::Bearer2G);
+    ethernet.setValue(QNetworkConfiguration::BearerEthernet);
+    wlan.setValue(QNetworkConfiguration::BearerWLAN);
+    bluetooth.setValue(QNetworkConfiguration::BearerBluetooth);
+    threeG.setValue(QNetworkConfiguration::Bearer3G);
+    fourG.setValue(QNetworkConfiguration::Bearer4G);
+
+    QTest::newRow("Unknown Mode") << unknown << false;
+    QTest::newRow("2G Mode") << twoG << false;
+    QTest::newRow("Ethernet Mode") << ethernet << true;
+    QTest::newRow("WLAN Mode") << wlan << true;
+    QTest::newRow("Bluetooth Mode") << bluetooth << true;
+    QTest::newRow("3G Mode") << threeG << false;
+    QTest::newRow("4G Mode") << fourG << false;
 }
 
 void
@@ -737,12 +725,12 @@
     QFETCH(QVariant, mode);
     QFETCH(bool, result);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
-    EXPECT_CALL(*_networkInfo, currentNetworkMode())
+    EXPECT_CALL(*_networkSession, sessionType())
         .Times(1)
-        .WillOnce(Return(mode.value<QNetworkInfo::NetworkMode>()));
+        .WillOnce(Return(mode.value<QNetworkConfiguration::BearerType>()));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
         _isConfined, _rootPath, _url, _metadata, _headers));
@@ -754,7 +742,7 @@
 
 void
 TestDownload::testCancel() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -770,7 +758,7 @@
 
 void
 TestDownload::testPause() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -786,7 +774,7 @@
 
 void
 TestDownload::testResume() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -802,7 +790,7 @@
 
 void
 TestDownload::testStart() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -824,7 +812,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -875,7 +863,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -904,7 +892,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -968,7 +956,7 @@
 
 void
 TestDownload::testPauseDownloadNotStarted() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -995,7 +983,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1054,7 +1042,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1149,7 +1137,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1202,7 +1190,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1259,7 +1247,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1328,7 +1316,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1418,7 +1406,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1517,7 +1505,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1582,7 +1570,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1650,7 +1638,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1714,7 +1702,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1784,7 +1772,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -1877,7 +1865,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(RequestHeadersEq(headers)))
@@ -1952,7 +1940,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory,
@@ -2030,7 +2018,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QPair<QString, QString> rangeHeader("Range", QString::number(size));
@@ -2140,7 +2128,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -2251,7 +2239,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -2362,7 +2350,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -2455,7 +2443,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -2569,7 +2557,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -2674,7 +2662,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -2764,7 +2752,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QPair<QString, QString> encodingHeader("Accept-Encoding",
@@ -2822,7 +2810,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QPair<QString, QString> encodingHeader("Accept-Encoding",
@@ -2887,7 +2875,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QPair<QString, QString> encodingHeader("Accept-Encoding",
@@ -2942,7 +2930,7 @@
 
 void
 TestDownload::testLocalPathConfined() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // assert that the root path used is not the one in the metadata
@@ -2959,7 +2947,7 @@
 
 void
 TestDownload::testLocalPathNotConfined() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QVariantMap metadata;
@@ -2975,7 +2963,7 @@
 
 void
 TestDownload::testInvalidUrl() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -2987,7 +2975,7 @@
 
 void
 TestDownload::testValidUrl() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -2999,7 +2987,7 @@
 
 void
 TestDownload::testInvalidHashAlgorithm() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3025,7 +3013,7 @@
 void
 TestDownload::testValidHashAlgorithm() {
     QFETCH(QString, algo);
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3036,7 +3024,7 @@
 
 void
 TestDownload::testInvalidFilePresent() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // create a file so that we get an error
@@ -3057,7 +3045,7 @@
 
 void
 TestDownload::testValidFileNotPresent() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QString filePath = testDirectory() + QDir::separator() + "test_file.jpg";
@@ -3073,7 +3061,7 @@
 
 void
 TestDownload::testDownloadPresent() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // create a download and get the filename to use, then write it
@@ -3108,7 +3096,7 @@
 
 void
 TestDownload::testDownloadPresentSeveralFiles() {
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QFETCH(int, count);
@@ -3166,7 +3154,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -3253,7 +3241,7 @@
     QScopedPointer<MockFile> file(new MockFile("test"));
     QScopedPointer<MockNetworkReply> reply(new MockNetworkReply());
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // set expectations to get the request and the reply correctly
@@ -3326,7 +3314,7 @@
     QScopedPointer<MockFile> file(new MockFile("test"));
     QScopedPointer<MockNetworkReply> reply(new MockNetworkReply());
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // set expectations to get the request and the reply correctly
@@ -3409,7 +3397,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -3495,7 +3483,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -3664,7 +3652,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     EXPECT_CALL(*_reqFactory, get(_))
@@ -3780,7 +3768,7 @@
     auto path = testDirectory() + QDir::separator() + "test";
     QDir().mkpath(path);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3795,7 +3783,7 @@
 void
 TestDownload::testSetLocalDirectoryNotAbsolute() {
     auto path = QString("./path");
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3810,7 +3798,7 @@
 void
 TestDownload::testSetLocalDirectoryNotPresent() {
     auto path = QString("/not/present/path");
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3830,7 +3818,7 @@
     file.write(QByteArray(100, 'w'));
     file.close();
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3847,7 +3835,7 @@
     auto path = testDirectory() + QDir::separator() + "test";
     QDir().mkpath(path);
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3866,7 +3854,7 @@
     QVariantMap metadata;
     metadata[Ubuntu::Transfers::Metadata::DEFLATE_KEY] = true;
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3882,7 +3870,7 @@
     QVariantMap metadata;
     metadata[Ubuntu::Transfers::Metadata::DEFLATE_KEY] = false;
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     QScopedPointer<FileDownload> download(new FileDownload(_id, _appId, _path,
@@ -3903,7 +3891,7 @@
     // write the expectations of the reply which is what we are
     // really testing
 
-    EXPECT_CALL(*_networkInfo, isOnline())
+    EXPECT_CALL(*_networkSession, isOnline())
         .WillRepeatedly(Return(true));
 
     // assert that we do have gzip and deflate in the content-encoding header

=== modified file 'tests/downloads/daemon/test_download.h'
--- tests/downloads/daemon/test_download.h	2014-09-22 23:24:34 +0000
+++ tests/downloads/daemon/test_download.h	2014-11-26 12:24:23 +0000
@@ -28,7 +28,7 @@
 #include <file_manager.h>
 #include <process_factory.h>
 #include <request_factory.h>
-#include <system_network_info.h>
+#include <network_session.h>
 
 #include "base_testcase.h"
 #include "cryptographic_hash.h"
@@ -196,13 +196,13 @@
     QString _path;
     QUrl _url;
     QString _algo;
-    MockSystemNetworkInfo* _networkInfo;
+    MockNetworkSession* _networkSession;
     MockRequestFactory* _reqFactory;
     MockProcessFactory* _processFactory;
     MockFileManager* _fileManager;
     MockCryptographicHashFactory* _cryptoFactory;
 };
 
-Q_DECLARE_METATYPE(QNetworkInfo::NetworkMode)
+Q_DECLARE_METATYPE(QNetworkConfiguration::BearerType)
 
 #endif  // TEST_APP_DOWNLOAD_H

=== modified file 'tests/downloads/daemon/test_download_factory.cpp'
--- tests/downloads/daemon/test_download_factory.cpp	2014-07-04 15:29:48 +0000
+++ tests/downloads/daemon/test_download_factory.cpp	2014-11-26 12:24:23 +0000
@@ -22,6 +22,7 @@
 #include <ubuntu/transfers/system/hash_algorithm.h>
 #include <ubuntu/transfers/system/file_manager.h>
 #include <ubuntu/transfers/system/uuid_utils.h>
+#include <network_session.h>
 #include "test_download_factory.h"
 
 using ::testing::_;
@@ -39,7 +40,7 @@
 TestDownloadFactory::cleanup() {
     BaseTestCase::cleanup();
 
-    SystemNetworkInfo::deleteInstance();
+    NetworkSession::deleteInstance();
     delete _downFactory;
     FileManager::deleteInstance();
     RequestFactory::deleteInstance();

=== modified file 'tests/downloads/daemon/test_download_factory.h'
--- tests/downloads/daemon/test_download_factory.h	2014-07-07 12:16:47 +0000
+++ tests/downloads/daemon/test_download_factory.h	2014-11-26 12:24:23 +0000
@@ -24,7 +24,6 @@
 #include <apparmor.h>
 #include <process_factory.h>
 #include <request_factory.h>
-#include <system_network_info.h>
 
 #include "uuid_factory.h"
 #include "base_testcase.h"

=== modified file 'tests/downloads/daemon/test_download_manager.cpp'
--- tests/downloads/daemon/test_download_manager.cpp	2014-07-03 09:01:01 +0000
+++ tests/downloads/daemon/test_download_manager.cpp	2014-11-26 12:24:23 +0000
@@ -20,7 +20,7 @@
 #include <ubuntu/download_manager/download_struct.h>
 #include <ubuntu/transfers/system/uuid_utils.h>
 #include <ubuntu/transfers/system/process_factory.h>
-#include <ubuntu/transfers/system/system_network_info.h>
+#include <ubuntu/transfers/system/network_session.h>
 #include <gmock/gmock.h>
 #include "dbus_proxy.h"
 #include "download.h"
@@ -54,7 +54,7 @@
 TestDownloadManager::cleanup() {
     BaseTestCase::cleanup();
 
-    SystemNetworkInfo::deleteInstance();
+    NetworkSession::deleteInstance();
     RequestFactory::deleteInstance();
     ProcessFactory::deleteInstance();
     DownloadsDb::deleteInstance();

=== modified file 'tests/downloads/daemon/test_download_manager.h'
--- tests/downloads/daemon/test_download_manager.h	2014-07-07 12:16:47 +0000
+++ tests/downloads/daemon/test_download_manager.h	2014-11-26 12:24:23 +0000
@@ -26,7 +26,7 @@
 #include <ubuntu/downloads/file_download.h>
 #include <apparmor.h>
 #include <request_factory.h>
-#include <system_network_info.h>
+#include <network_session.h>
 
 #include "application.h"
 #include "base_testcase.h"

=== modified file 'tests/downloads/daemon/test_downloads_db.cpp'
--- tests/downloads/daemon/test_downloads_db.cpp	2014-07-03 09:01:01 +0000
+++ tests/downloads/daemon/test_downloads_db.cpp	2014-11-26 12:24:23 +0000
@@ -24,7 +24,7 @@
 #include <ubuntu/download_manager/metatypes.h>
 #include <ubuntu/transfers/system/hash_algorithm.h>
 #include <ubuntu/transfers/system/uuid_utils.h>
-#include <ubuntu/transfers/system/system_network_info.h>
+#include <ubuntu/transfers/system/network_session.h>
 #include <ubuntu/downloads/file_download.h>
 #include "test_downloads_db.h"
 
@@ -59,7 +59,7 @@
     _db = nullptr;
 
     QFile::remove(dbFile);
-    SystemNetworkInfo::deleteInstance();
+    NetworkSession::deleteInstance();
     FileManager::deleteInstance();
     FileNameMutex::deleteInstance();
 }

=== modified file 'tests/downloads/daemon/test_group_download.cpp'
--- tests/downloads/daemon/test_group_download.cpp	2014-07-03 09:01:01 +0000
+++ tests/downloads/daemon/test_group_download.cpp	2014-11-26 12:24:23 +0000
@@ -56,7 +56,7 @@
 TestGroupDownload::cleanup() {
     BaseTestCase::cleanup();
 
-    SystemNetworkInfo::deleteInstance();
+    NetworkSession::deleteInstance();
     FileManager::deleteInstance();
     delete _factory;
 }

=== modified file 'tests/downloads/daemon/test_group_download.h'
--- tests/downloads/daemon/test_group_download.h	2014-07-07 12:16:47 +0000
+++ tests/downloads/daemon/test_group_download.h	2014-11-26 12:24:23 +0000
@@ -24,7 +24,7 @@
 #include <ubuntu/downloads/group_download.h>
 #include <process_factory.h>
 #include <request_factory.h>
-#include <system_network_info.h>
+#include <network_session.h>
 
 #include "base_testcase.h"
 #include "factory.h"
@@ -97,7 +97,7 @@
     bool _isGSMDownloadAllowed;
     QVariantMap _metadata;
     QMap<QString, QString> _headers;
-    MockSystemNetworkInfo* _networkInfo;
+    MockNetworkSession* _networkSession;
     MockDownloadFactory* _factory;
     MockFileManager* _fileManager;
 };

=== modified file 'tests/downloads/daemon/test_transfers_queue.cpp'
--- tests/downloads/daemon/test_transfers_queue.cpp	2014-07-16 08:41:38 +0000
+++ tests/downloads/daemon/test_transfers_queue.cpp	2014-11-26 12:24:23 +0000
@@ -38,8 +38,8 @@
     BaseTestCase::init();
     _isConfined = true;
     _rootPath = "/random/root/path";
-    _networkInfo = new MockSystemNetworkInfo();
-    SystemNetworkInfo::setInstance(_networkInfo);
+    _networkInfo = new MockNetworkSession();
+    NetworkSession::setInstance(_networkInfo);
     _first = new MockTransfer(UuidUtils::getDBusString(QUuid::createUuid()),
         "first-path", _isConfined, "/root/path");
     _second = new MockTransfer(UuidUtils::getDBusString(QUuid::createUuid()),
@@ -51,7 +51,7 @@
 TestTransferQueue::cleanup() {
     BaseTestCase::cleanup();
 
-    SystemNetworkInfo::deleteInstance();
+    NetworkSession::deleteInstance();
     delete _first;
     delete _second;
     delete _q;

=== modified file 'tests/downloads/daemon/test_transfers_queue.h'
--- tests/downloads/daemon/test_transfers_queue.h	2014-07-07 12:16:47 +0000
+++ tests/downloads/daemon/test_transfers_queue.h	2014-11-26 12:24:23 +0000
@@ -23,7 +23,7 @@
 #include <ubuntu/transfers/queue.h>
 #include <process_factory.h>
 #include <request_factory.h>
-#include <system_network_info.h>
+#include <network_session.h>
 
 #include "base_testcase.h"
 #include "transfer.h"
@@ -73,7 +73,7 @@
  private:
     bool _isConfined;
     QString _rootPath;
-    MockSystemNetworkInfo* _networkInfo;
+    MockNetworkSession* _networkInfo;
     MockTransfer* _first;
     MockTransfer* _second;
     Queue* _q;

=== modified file 'tests/downloads/qml/CMakeLists.txt'
--- tests/downloads/qml/CMakeLists.txt	2014-09-18 13:22:31 +0000
+++ tests/downloads/qml/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -36,7 +36,6 @@
 endforeach(test)
 
 include_directories(${Qt5Core_INCLUDE_DIRS})
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Test_INCLUDE_DIRS})

=== modified file 'tests/uploads/daemon/CMakeLists.txt'
--- tests/uploads/daemon/CMakeLists.txt	2014-07-17 08:40:07 +0000
+++ tests/uploads/daemon/CMakeLists.txt	2014-11-26 12:24:23 +0000
@@ -35,7 +35,6 @@
 
 
 include_directories(${Qt5Core_INCLUDE_DIRS})
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Test_INCLUDE_DIRS})

=== modified file 'tests/uploads/daemon/test_file_upload.h'
--- tests/uploads/daemon/test_file_upload.h	2014-07-16 12:28:32 +0000
+++ tests/uploads/daemon/test_file_upload.h	2014-11-26 12:24:23 +0000
@@ -23,7 +23,6 @@
 #include <ubuntu/uploads/file_upload.h>
 #include <file_manager.h>
 #include <request_factory.h>
-#include <system_network_info.h>
 
 #include "uuid_factory.h"
 #include "base_testcase.h"

=== modified file 'tests/uploads/daemon/test_mms_upload.h'
--- tests/uploads/daemon/test_mms_upload.h	2014-07-16 14:43:56 +0000
+++ tests/uploads/daemon/test_mms_upload.h	2014-11-26 12:24:23 +0000
@@ -23,7 +23,6 @@
 #include <ubuntu/uploads/mms_file_upload.h>
 #include <file_manager.h>
 #include <request_factory.h>
-#include <system_network_info.h>
 
 #include "uuid_factory.h"
 #include "base_testcase.h"

=== modified file 'tests/uploads/daemon/test_upload_factory.cpp'
--- tests/uploads/daemon/test_upload_factory.cpp	2014-07-07 12:16:47 +0000
+++ tests/uploads/daemon/test_upload_factory.cpp	2014-11-26 12:24:23 +0000
@@ -34,7 +34,7 @@
 TestUploadFactory::cleanup() {
     BaseTestCase::cleanup();
 
-    SystemNetworkInfo::deleteInstance();
+    NetworkSession::deleteInstance();
     delete _upFactory;
     FileManager::deleteInstance();
     RequestFactory::deleteInstance();

=== modified file 'tests/uploads/daemon/test_upload_factory.h'
--- tests/uploads/daemon/test_upload_factory.h	2014-07-07 12:16:47 +0000
+++ tests/uploads/daemon/test_upload_factory.h	2014-11-26 12:24:23 +0000
@@ -24,7 +24,7 @@
 #include <apparmor.h>
 #include <process_factory.h>
 #include <request_factory.h>
-#include <system_network_info.h>
+#include <network_session.h>
 
 #include "uuid_factory.h"
 #include "base_testcase.h"