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

[Ken VanDine]

Ensure we only check for updates when NetworkingStatus.online is true

Ensure we only check for updates when NetworkingStatus.online is true

[Sebastien Bacher (seb128)]

thanks, you have a console.warn() in there though, I guess it's a debug leftover?

the onClicked change also needs wrong, shouldn't we rather disable the button instead of having the action showed to the user but not doing that it should?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1545
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2441/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4718/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/625
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3811/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4715
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24389

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

review: Needs Fixing (continuous-integration)

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

1546. By Ken VanDine on 2015-10-29

Merged trunk

1547. By Ken VanDine on 2015-10-29

merged retry removable branch

1548. By Ken VanDine on 2015-10-29

Removed debugging output

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1546
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2455/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4929
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/639
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4926
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4926/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24718

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-09-18 14:18:11 +0000
+++ plugins/system-update/PageComponent.qml	2015-10-29 20:39:08 +0000
@@ -66,6 +66,7 @@
         id: networkingStatus
         target: NetworkingStatus
         onOnlineChanged: {
+            console.warn("Online: " + NetworkingStatus.online);
             if (NetworkingStatus.online) {
                 activity.running = true;
                 root.state = "SEARCHING";
@@ -84,7 +85,8 @@
         onFinished: {
             credentialsNotification.visible = false;
             root.state = "SEARCHING";
-            UpdateManager.checkUpdates();
+            if (NetworkingStatus.online)
+                UpdateManager.checkUpdates();
         }
     }
 
@@ -147,7 +149,7 @@
             PropertyChanges { target: installAllButton; visible: false}
             PropertyChanges { target: checkForUpdatesArea; visible: true}
             PropertyChanges { target: updateNotification; visible: false}
-            PropertyChanges { target: activity; running: true}
+            PropertyChanges { target: activity; running: NetworkingStatus.online}
         },
         State {
             name: "NOUPDATES"
@@ -179,7 +181,8 @@
         Component.onCompleted: {
             credentialsNotification.visible = false;
             root.state = "SEARCHING";
-            UpdateManager.checkUpdates();
+            if (NetworkingStatus.online)
+                UpdateManager.checkUpdates();
         }
 
         onUpdateAvailableFound: {
@@ -283,31 +286,12 @@
                     anchors {
                         left: activity.running ? activity.right : parent.left
                         top: parent.top
-                        right: btnRetry.visible ? btnRetry.left : parent.right
+                        right: parent.right
                         rightMargin: units.gu(2)
                         leftMargin: units.gu(2)
                     }
                     height: parent.height
                 }
-
-                Button {
-                    id: btnRetry
-                    text: i18n.tr("Retry")
-                    color: UbuntuColors.orange
-                    anchors {
-                        right: parent.right
-                        top: parent.top
-                        bottom: parent.bottom
-                        margins: units.gu(1)
-                    }
-                    visible: !activity.visible
-
-                    onClicked: {
-                        activity.running = true;
-                        root.state = "SEARCHING";
-                        UpdateManager.checkUpdates();
-                    }
-                }
             }
 
             ListItem.SingleControl {