Merge lp:~diegosarmentero/ubuntu-system-settings/update-battery into lp:ubuntu-system-settings

[Diego Sarmentero]

- Notify the user if the phone needs to be plug to power for update

[Sebastien Bacher (seb128)]

Thanks you for your work, some issues

- you use "label.text" there, but there is no such object (you get a runtime warning about it being undefined btw)

- I just tried on my laptop (using the "sudo system-image-dbus --testing=update-manual-success" mock) which is plugged and 100% charged, it gave me the error case/not now interface

My case on that one is th at "onRemainingCapacityChanged" is never called on my fully charged scenario, so the batterySafeForUpdate is never set

- the 50% charge seems a bit much, but the spec doesn't define what would be a reasonable level, I guess 30% should be enough ... I'm not going to be picky about that though

- clicking on "not now" brought me back to the updates list, clicking on the "install" button again made the install happen despite the incorrect charge/without asking

(that one is not a new bug I think though)

review: Needs Fixing

[Sebastien Bacher (seb128)]

(you can add that line
" onRemainingCapacityChanged(0, chargingState(0))"
to Component.onCompleted, to workaround the first issue)

[lp:~diegosarmentero/ubuntu-system-settings/update-battery]

747. By Diego Sarmentero on 2014-07-08

removing unused code

[Sebastien Bacher (seb128)]

the issue with the batterySafeForUpdate was due to the invalid variable, not to the missing call ... I can confirm that r747 fixes that

[lp:~diegosarmentero/ubuntu-system-settings/update-battery]

748. By Diego Sarmentero on 2014-07-08

fixing bug on install button for system update

[Sebastien Bacher (seb128)]

thanks, r748 has an issue though, if you click "not now" it sends you back to the main list with the system image item having a install bar at 0% and stating "installing in progress"

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:746
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/941/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1433
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/133
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1961
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2737
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2737/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1602
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1602/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:748
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/942/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1703
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/134
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1970
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9478
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1610
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1610/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~diegosarmentero/ubuntu-system-settings/update-battery]

749. By Diego Sarmentero on 2014-07-08

fixing issue with image progress after finish

750. By Diego Sarmentero on 2014-07-08

hide progress bar on image download complete

[Diego Sarmentero (diegosarmentero)]

> thanks, r748 has an issue though, if you click "not now" it sends you back to
> the main list with the system image item having a install bar at 0% and
> stating "installing in progress"

Fixed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:749
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/946/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/138
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2765
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2765/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1624
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1624/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/947/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1722/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/139
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/139
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1985/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2768
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2768/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1626
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1626/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, I did a new round and testing, and remainingCapacity() seems wrong on the n4, which gives a > 90% charged info when the device is actually 10% charged :/

You might better import the battery plugin and get the charge info from there I think (sorry about that, I think we had issues with the qtsystems binding as well before but I don't remember the details)

Other small question, why don't use the visble = true/false to show/hide widgets?

review: Needs Fixing

[Sebastien Bacher (seb128)]

Did you look at that issue yet? Do you need help with the changes?

[Sebastien Bacher (seb128)]

Setting to "work in progress" to get it out of the review queue until the issues are sorted out

review: Needs Fixing

Unmerged revisions

750. By Diego Sarmentero on 2014-07-08

hide progress bar on image download complete

749. By Diego Sarmentero on 2014-07-08

fixing issue with image progress after finish

748. By Diego Sarmentero on 2014-07-08

fixing bug on install button for system update

747. By Diego Sarmentero on 2014-07-08

removing unused code

746. By Diego Sarmentero on 2014-07-08

adding battery support to updates

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2014-07-03 15:24:46 +0000
+++ plugins/system-update/PageComponent.qml	2014-07-08 20:22:14 +0000
@@ -37,23 +37,63 @@
     property bool installAll: false
     property bool includeSystemUpdate: false
     property int updatesAvailable: 0
-
     property var notificationAction;
+    property bool batterySafeForUpdate: false
 
     DeviceInfo {
         id: deviceInfo
     }
 
+    BatteryInfo {
+        id: batteryInfo
+
+        monitorChargingState: true
+        monitorBatteryStatus: true
+        monitorRemainingCapacity: true
+
+        onRemainingCapacityChanged: {
+            capacity = batteryInfo.remainingCapacity(0) * 100 / batteryInfo.maximumCapacity(0)
+            if (capacity < 50) {
+                root.batterySafeForUpdate = false;
+            } else {
+                root.batterySafeForUpdate = true;
+            }
+        }
+
+        onChargingStateChanged: {
+            if (state === BatteryInfo.Charging) {
+                root.batterySafeForUpdate = true;
+            }
+            else if (state === BatteryInfo.Discharging &&
+                     batteryInfo.batteryStatus(0) !== BatteryInfo.BatteryFull) {
+                capacity = batteryInfo.remainingCapacity(0) * 100 / batteryInfo.maximumCapacity(0)
+                if (capacity < 50) {
+                    root.batterySafeForUpdate = false;
+                } else {
+                    root.batterySafeForUpdate = true;
+                }
+            }
+            else if (batteryInfo.batteryStatus(0) === BatteryInfo.BatteryFull ||
+                     state === BatteryInfo.NotCharging) {
+                root.batterySafeForUpdate = true;
+            }
+        }
+        Component.onCompleted: {
+            onChargingStateChanged(0, chargingState(0));
+        }
+    }
+
     Component {
          id: dialogInstallComponent
          Dialog {
              id: dialogueInstall
              title: i18n.tr("Update System")
-             text: i18n.tr("The phone needs to restart to install the system update.")
+             text: root.batterySafeForUpdate ? i18n.tr("The phone needs to restart to install the system update.") : i18n.tr("Connect the phone to power before installing the system update.")
 
              Button {
                  text: i18n.tr("Install & Restart")
                  color: UbuntuColors.orange
+                 visible: root.batterySafeForUpdate ? true : false
                  onClicked: {
                      installingImageUpdate.visible = true;
                      updateManager.applySystemUpdate();
@@ -68,7 +108,9 @@
                      var item = updateList.currentItem;
                      var modelItem = updateManager.model[0];
                      item.actionButton.text = i18n.tr("Install");
+                     item.progressBar.opacity = 0;
                      modelItem.updateReady = true;
+                     modelItem.selected = false;
                      PopupUtils.close(dialogueInstall);
                  }
              }
@@ -270,6 +312,7 @@
             showDivider: false
 
             property alias actionButton: buttonAppUpdate
+            property alias progressBar: progress
 
             Rectangle {
                 id: textArea
@@ -311,8 +354,7 @@
                             textArea.retry = false;
                             updateManager.retryDownload(modelData.packageName);
                         } else if (modelData.updateReady) {
-                            updateManager.applySystemUpdate();
-                            installingImageUpdate.visible = true;
+                            PopupUtils.open(dialogInstallComponent);
                         } else if (modelData.updateState) {
                             if (modelData.systemUpdate) {
                                 updateManager.pauseDownload(modelData.packageName);