Merge lp:~aacid/unity8/networkingstatus into lp:unity8

[Albert Astals Cid]

Use ubuntu::connectivity::NetworkingStatus instead of QNetworkConfigurationManager

QNetworkConfigurationManager with the networkmanager plugin tracks lots of different things while we're only really interested in if we're connected or not that is exactly what ubuntu::connectivity::NetworkingStatus does

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
No, think it's trivial enough

 * If you changed the UI, has there been a design review?
N/A

[Albert Astals Cid (aacid)]

Actually
 qdbus com.ubuntu.connectivity1 /com/ubuntu/connectivity1/NetworkingStatus com.ubuntu.connectivity1.NetworkingStatus.Status
always return online in the phone, have to find out who to ask to fix that.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1369
http://jenkins.qa.ubuntu.com/job/unity8-ci/4765/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1861
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1859
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7490
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7490/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15102

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4765/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

The always online issue was resolved at https://bugs.launchpad.net/indicator-network/+bug/1386109

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/unity8-ci/4920/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/85
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/238
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15884

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4920/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

Code seems all right... need to test this...

[Andrea Cimitan (cimi)]

At the moment, there is no feature easily connected to this so can be tested. I had however tested for regressions and didn't see much (dash is still not working great in offline mode)

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Autopilot
 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[Michał Sawicz (saviq)]

review: Needs Fixing

[lp:~aacid/unity8/networkingstatus]

1372. By Albert Astals Cid on 2014-11-20

remove unused slot

[Albert Astals Cid (aacid)]

That's correct, removed.

[Michał Sawicz (saviq)]

review: Abstain

[lp:~aacid/unity8/networkingstatus]

1373. By Albert Astals Cid on 2014-11-26

Merge unity8

=== modified file 'debian/control'
--- debian/control	2014-11-17 10:09:40 +0000
+++ debian/control	2014-11-26 08:29:52 +0000
@@ -12,6 +12,7 @@
 # in libstdc++ causing us issues, we explicitly select a G++
 # version.
                g++-4.9,
+               libconnectivity-qt1-dev,
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
                libgles2-mesa-dev[armhf],

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-06 15:45:25 +0000
+++ src/CMakeLists.txt	2014-11-26 08:29:52 +0000
@@ -1,6 +1,9 @@
+pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)
+
 include_directories(
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
+    ${CONNECTIVITY_INCLUDE_DIRS}
 )
 
 file(GLOB_RECURSE QML_FILES
@@ -30,7 +33,7 @@
     target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
 endif()
 
-target_link_libraries(${SHELL_APP} UbuntuGestures)
+target_link_libraries(${SHELL_APP} UbuntuGestures connectivity-qt1)
 
 # For it to find libUbuntuGestures.so
 set_target_properties(${SHELL_APP} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")

=== modified file 'src/CachingNetworkManagerFactory.cpp'
--- src/CachingNetworkManagerFactory.cpp	2014-07-02 07:56:24 +0000
+++ src/CachingNetworkManagerFactory.cpp	2014-11-26 08:29:52 +0000
@@ -20,25 +20,16 @@
 #include <QNetworkDiskCache>
 #include <QNetworkAccessManager>
 #include <QStandardPaths>
-#include <QNetworkConfigurationManager>
 
 CachingNetworkAccessManager::CachingNetworkAccessManager(QObject *parent)
     : QNetworkAccessManager(parent)
 {
-    m_networkManager = new QNetworkConfigurationManager(this);
-
-    QObject::connect(m_networkManager, &QNetworkConfigurationManager::onlineStateChanged, this, &CachingNetworkAccessManager::onlineStateChanged);
-    m_isOnline = m_networkManager->isOnline();
-}
-
-void CachingNetworkAccessManager::onlineStateChanged(bool isOnline)
-{
-    m_isOnline = isOnline;
+    m_networkingStatus = new ubuntu::connectivity::NetworkingStatus(this);
 }
 
 QNetworkReply* CachingNetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
 {
-    if (!m_isOnline) {
+    if (m_networkingStatus->status() != ubuntu::connectivity::NetworkingStatus::Status::Online) {
         QNetworkRequest req(request);
         req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
         return QNetworkAccessManager::createRequest(op, req, outgoingData);

=== modified file 'src/CachingNetworkManagerFactory.h'
--- src/CachingNetworkManagerFactory.h	2014-06-30 16:42:58 +0000
+++ src/CachingNetworkManagerFactory.h	2014-11-26 08:29:52 +0000
@@ -21,7 +21,7 @@
 #include <QQmlNetworkAccessManagerFactory>
 #include <QNetworkAccessManager>
 
-class QNetworkConfigurationManager;
+#include <ubuntu/connectivity/networking-status.h>
 
 class CachingNetworkAccessManager : public QNetworkAccessManager
 {
@@ -31,12 +31,8 @@
 protected:
     QNetworkReply* createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0) override;
 
-private Q_SLOTS:
-    void onlineStateChanged(bool isOnline);
-
 private:
-    QNetworkConfigurationManager* m_networkManager;
-    bool m_isOnline;
+    ubuntu::connectivity::NetworkingStatus* m_networkingStatus;
 };
 
 class CachingNetworkManagerFactory : public QQmlNetworkAccessManagerFactory

=== modified file 'src/Dash/CMakeLists.txt'
--- src/Dash/CMakeLists.txt	2014-10-06 15:45:25 +0000
+++ src/Dash/CMakeLists.txt	2014-11-26 08:29:52 +0000
@@ -12,7 +12,7 @@
 # For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
 set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
 
-target_link_libraries(unity8-dash UbuntuGestures)
+target_link_libraries(unity8-dash UbuntuGestures connectivity-qt1)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")