Merge lp:~ken-vandine/ubuntu-system-settings/lp1505663_abort into lp:ubuntu-system-settings

[Ken VanDine]

[system-settings] Abort request when the onlineStatus changes to false

[system-settings] Abort request when the onlineStatus changes to false

[lp:~ken-vandine/ubuntu-system-settings/lp1505663_abort]

1550. By Ken VanDine on 2015-10-30

removed debug output and added warning when offline

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1549
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2458/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/642
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3980
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4954
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4954/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24767

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2458/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1550
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2460/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4961
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/644
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3984
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4958
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4958/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24775

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2460/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1550
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2463/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4984
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/647
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4003
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4981
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4981/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24831

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2463/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

I like it. The lambda could reference used variables instead of copying, but that's up to you. Works well.

review: Approve

=== modified file 'plugins/system-update/network.cpp'
--- plugins/system-update/network.cpp	2015-08-27 10:18:41 +0000
+++ plugins/system-update/network.cpp	2015-10-30 20:51:14 +0000
@@ -38,7 +38,8 @@
 
 Network::Network(QObject *parent) :
     QObject(parent),
-    m_nam(this)
+    m_nam(this),
+    m_ncm(new QNetworkConfigurationManager())
 {
 }
 
@@ -166,9 +167,17 @@
     connect(reply, &QNetworkReply::sslErrors, this, &Network::onReplySslErrors);
     connect(reply, static_cast<void(QNetworkReply::*)
             (QNetworkReply::NetworkError)>(&QNetworkReply::error),
-        this, &Network::onReplyError);
+            this, &Network::onReplyError);
+    connect(m_ncm, &QNetworkConfigurationManager::onlineStateChanged, [=](const bool &online) {
+            if (!online) {
+                qWarning() << "Offline, aborting check for updates";
+                reply->abort();
+            }
+    });
 }
 
+
+
 QString Network::getUrlApps()
 {
     QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();

=== modified file 'plugins/system-update/network.h'
--- plugins/system-update/network.h	2015-08-27 10:18:41 +0000
+++ plugins/system-update/network.h	2015-10-30 20:51:14 +0000
@@ -22,6 +22,7 @@
 #include <token.h>
 #include <QObject>
 #include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkConfigurationManager>
 #include <QtNetwork/QNetworkReply>
 #include <QHash>
 
@@ -62,6 +63,7 @@
 
 private:
     QNetworkAccessManager m_nam;
+    QNetworkConfigurationManager *m_ncm;
     QHash<QString, Update*> m_apps;
     UbuntuOne::Token m_token;