Merge lp:~diegosarmentero/ubuntu-system-settings/fixing-progress into lp:ubuntu-system-settings

[Diego Sarmentero]

- Fix out of sync image download
- Refresh scope after installation

[lp:~diegosarmentero/ubuntu-system-settings/fixing-progress]

954. By Diego Sarmentero on 2014-08-28

[ Ken VanDine ]
* SIM PIN lock implementation
[ jonas-drange ]
* [main panel] add visual feedback on press
* [cellular] uses modemtechnologies property from ofono to populate
  technology preference options (LP: #1346790)
[ Sebastien Bacher ]
* [language] workaround inconsistent languages casing (LP: #1362123)
* [background] Display the default background selected (LP: #1349329)
* [storage] display translated names (LP: #1360207)
* [updates] don't display animations when clicking on update rows (LP:
  #1360364)
* [background] don't use an icon in the headerbar (LP: #1362122)
[ Mathieu Trudel-Lapierre ]
* Fix PIN code or passcode requests by properly matching the tag for
  the original request. (LP: #1355152)

955. By Diego Sarmentero on 2014-08-28

remove unused function declaration

[Sebastien Bacher (seb128)]

Thanks, but better to not add a changelog manually and rather let the CI build it for you (especially that you didn't list the bugs to close in your manual entry)

Why do you change the highlightFollowsCurrentItem mode? That seems a different issue than the refresh problems

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-system-settings/fixing-progress]

956. By Diego Sarmentero on 2014-08-28

check if interface is valid

957. By Diego Sarmentero on 2014-08-28

fixing changelog as requested

[Diego Sarmentero (diegosarmentero)]

> Thanks, but better to not add a changelog manually and rather let the CI build
> it for you (especially that you didn't list the bugs to close in your manual
> entry)
>
> Why do you change the highlightFollowsCurrentItem mode? That seems a different
> issue than the refresh problems

Fixed

[Jonas G. Drange (jonas-drange)]

Lgtm, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:955
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1329/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/521
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5458
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5458/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2601
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3470
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3470/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:957
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1333/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5466
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5466/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3476
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3476/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2014-08-27 08:39:33 +0000
+++ plugins/system-update/PageComponent.qml	2014-08-28 17:42:50 +0000
@@ -379,6 +379,7 @@
                                     buttonAppUpdate.visible = false;
                                     textArea.message = i18n.tr("Installed");
                                     root.updatesAvailable -= 1;
+                                    updateManager.updateClickScope();
                                 }
 
                                 onErrorFound: {

=== modified file 'plugins/system-update/system_update.cpp'
--- plugins/system-update/system_update.cpp	2014-07-17 09:51:33 +0000
+++ plugins/system-update/system_update.cpp	2014-08-28 17:42:50 +0000
@@ -206,6 +206,10 @@
     } else {
         Q_EMIT updateNotFound();
     }
+    if (downloading) {
+        downloadUpdate();
+        update->setSelected(true);
+    }
 }
 
 void SystemUpdate::updateDownloadProgress(int percentage, double eta)

=== modified file 'plugins/system-update/update_manager.cpp'
--- plugins/system-update/update_manager.cpp	2014-08-28 07:22:28 +0000
+++ plugins/system-update/update_manager.cpp	2014-08-28 17:42:50 +0000
@@ -26,6 +26,7 @@
 #include <QJsonArray>
 #include <QJsonValue>
 #include <QProcessEnvironment>
+#include <QDBusInterface>
 
 using namespace UbuntuOne;
 
@@ -287,4 +288,16 @@
     app->setDownloadUrl(app->getClickUrl());
 }
 
+void UpdateManager::updateClickScope()
+{
+    // Refresh click scope
+    QDBusInterface iface("com.canonical.unity.scopes",
+                         "/com/canonical/unity/scopes",
+                         "com.canonical.unity.scopes",
+                         QDBusConnection::sessionBus(), 0);
+    if (iface.isValid()) {
+        iface.call(QLatin1String("InvalidateResults"), QLatin1String("clickscope"));
+    }
+}
+
 }

=== modified file 'plugins/system-update/update_manager.h'
--- plugins/system-update/update_manager.h	2014-07-24 07:29:04 +0000
+++ plugins/system-update/update_manager.h	2014-08-28 17:42:50 +0000
@@ -85,6 +85,7 @@
     Q_INVOKABLE void pauseDownload(const QString &packagename);
     Q_INVOKABLE void retryDownload(const QString &packagename);
     Q_INVOKABLE void applySystemUpdate() { m_systemUpdate.applyUpdate(); }
+    Q_INVOKABLE void updateClickScope();
 
     QVariantList model() const { return m_model; }
     int downloadMode() { return m_systemUpdate.downloadMode(); }