Merge lp:~mandel/ubuntu-system-settings/fix-pause-rtm into lp:ubuntu-system-settings/rtm-14.09

[Manuel de la Peña]

Fix click downloads pause by ensuring that the settings works accordingly.

Fix click downloads pause.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:961
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/4
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17069

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-system-settings/fix-pause-rtm]

962. By Manuel de la Peña on 2015-01-14

Merged with rtm trunk.

963. By Manuel de la Peña on 2015-01-14

Update the changelog.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:963
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/5
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17077

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-system-settings/fix-pause-rtm]

964. By Manuel de la Peña on 2015-01-15

Fix code according to reviews.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:964
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/27/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/28/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/6
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17114

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:964
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/28/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/29/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/7
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17122

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good, and works great!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:964
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/32/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/33/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/11
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17166

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:964
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/33/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/34/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/12
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17193

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

If this is not a real AP failure, maybe it would help merging Ken's AP fixes from trunk?

review: Needs Fixing

[lp:~mandel/ubuntu-system-settings/fix-pause-rtm]

965. By Manuel de la Peña on 2015-01-20

Merged with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:965
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/34/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/35/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/13
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17227

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/system-update/download_tracker.cpp'
--- plugins/system-update/download_tracker.cpp	2014-09-30 02:05:36 +0000
+++ plugins/system-update/download_tracker.cpp	2015-01-20 12:17:55 +0000
@@ -18,22 +18,27 @@
  * Authored by: Diego Sarmentero <[e-mail]>
  */
 
+#include <QDebug>
+#include <QProcessEnvironment>
+
+#include <ubuntu/download_manager/download_struct.h>
+#include <ubuntu/download_manager/error.h>
+
 #include "download_tracker.h"
 #include "network/network.h"
-#include <ubuntu/download_manager/download_struct.h>
-#include <ubuntu/download_manager/error.h>
-#include <QProcessEnvironment>
 
-#define DOWNLOAD_COMMAND "post-download-command"
-#define APP_ID "app_id"
-#define PKCON_COMMAND "pkcon"
+namespace {
+    const QString DOWNLOAD_COMMAND = "post-download-command";
+    const QString APP_ID = "app_id";
+    const QString PKCON_COMMAND = "pkcon";
+}
 
 namespace UpdatePlugin {
 
 DownloadTracker::DownloadTracker(QObject *parent) :
     QObject(parent),
-    m_clickToken(""),
-    m_downloadUrl(""),
+    m_clickToken(QString::null),
+    m_downloadUrl(QString::null),
     m_download(nullptr),
     m_manager(nullptr),
     m_progress(0)
@@ -42,7 +47,7 @@
 
 void DownloadTracker::setDownload(const QString& url)
 {
-    if (url != "") {
+    if (!url.isEmpty()) {
         m_downloadUrl = url;
         startService();
     }
@@ -50,7 +55,7 @@
 
 void DownloadTracker::setClickToken(const QString& token)
 {
-    if (token != "") {
+    if (!token.isEmpty()) {
         m_clickToken = token;
         startService();
     }
@@ -58,7 +63,7 @@
 
 void DownloadTracker::setPackageName(const QString& package)
 {
-    if (package != "") {
+    if (!package.isEmpty()) {
         m_packageName = package;
         startService();
     }
@@ -70,8 +75,10 @@
         if (m_manager == nullptr) {
             m_manager = Manager::createSessionManager("", this);
 
-            QObject::connect(m_manager, SIGNAL(downloadCreated(Download*)),
-                             this, SLOT(bindDownload(Download*)));
+            if (!connect(m_manager, &Manager::downloadCreated,
+                this, &DownloadTracker::bindDownload)) {
+                qWarning() << "Could not connect to Manager::downloadCreated!";
+	    }
         }
         QVariantMap vmap;
         QStringList args;
@@ -89,22 +96,40 @@
 void DownloadTracker::bindDownload(Download* download)
 {
     m_download = download;
-    connect(m_download, SIGNAL(finished(const QString &)), this,
-            SIGNAL(finished(const QString &)));
-    connect(m_download, SIGNAL(canceled(bool)), this,
-            SIGNAL(canceled(bool)));
-    connect(m_download, SIGNAL(paused(bool)), this,
-            SIGNAL(paused(bool)));
-    connect(m_download, SIGNAL(resumed(bool)), this,
-            SIGNAL(resumed(bool)));
-    connect(m_download, SIGNAL(started(bool)), this,
-            SIGNAL(started(bool)));
-    connect(m_download, SIGNAL(error(Error*)), this,
-            SLOT(registerError(Error*)));
-    connect(m_download, SIGNAL(progress(qulonglong, qulonglong)), this,
-            SLOT(setProgress(qulonglong, qulonglong)));
-    connect(m_download, SIGNAL(processing(const QString &)), this,
-            SIGNAL(processing(const QString &)));
+    if (!connect(m_download, &Download::finished,
+            this, &DownloadTracker::onDownloadFinished)) {
+        qWarning() << "Could not connect to Download::finished";
+    }
+    if (!connect(m_download, &Download::canceled,
+            this, &DownloadTracker::onDownloadCanceled)) {
+        qWarning() << "Could not connect to Download::canceled";
+    }
+    if (!connect(m_download, &Download::paused,
+            this, &DownloadTracker::paused)) {
+        qWarning() << "Could not connect to Download::paused";
+    }
+    if (!connect(m_download, &Download::resumed,
+            this, &DownloadTracker::resumed)) {
+        qWarning() << "Could not connect to Download::resumed";
+    }
+    if (!connect(m_download, &Download::started,
+            this, &DownloadTracker::started)) {
+        qWarning() << "Could not connect to Download::started";
+    }
+    if (!connect(m_download, static_cast<void(Download::*)(Error*)>(&Download::error),
+            this, &DownloadTracker::registerError)) {
+        qWarning() << "Could not connect to Download::error";
+    }
+
+    if (!connect(m_download, static_cast<void(Download::*)(qulonglong, qulonglong)>(&Download::progress),
+            this, &DownloadTracker::setProgress)) {
+        qWarning() << "Could not connect to Download::progress";
+    }
+
+    if (!connect(m_download, &Download::processing,
+            this, &DownloadTracker::processing)) {
+        qWarning() << "Could not connect to Download::processing";
+    }
 
     m_download->start();
 }
@@ -112,6 +137,27 @@
 void DownloadTracker::registerError(Error* error)
 {
     Q_EMIT errorFound(error->errorString());
+
+    // we need to ensure that the resources are cleaned
+    m_download->deleteLater();
+    m_download = nullptr;
+}
+
+void DownloadTracker::onDownloadFinished(const QString& path)
+{
+    // once a download is finished we need to clean the resources
+    m_download->deleteLater();
+    m_download = nullptr;
+    Q_EMIT finished(path);
+}
+
+void DownloadTracker::onDownloadCanceled(bool wasCanceled)
+{
+    if (wasCanceled) {
+        m_download->deleteLater();
+        m_download = nullptr;
+    }
+    Q_EMIT canceled(wasCanceled);
 }
 
 void DownloadTracker::pause()

=== modified file 'plugins/system-update/download_tracker.h'
--- plugins/system-update/download_tracker.h	2014-09-30 02:05:36 +0000
+++ plugins/system-update/download_tracker.h	2015-01-20 12:17:55 +0000
@@ -63,6 +63,8 @@
     void bindDownload(Download* download);
     void setProgress(qulonglong received, qulonglong total);
     void registerError(Ubuntu::DownloadManager::Error* error);
+    void onDownloadFinished(const QString& path);
+    void onDownloadCanceled(bool wasCanceled);
 
 Q_SIGNALS:
     void error(const QString &errorMessage);
@@ -76,12 +78,12 @@
     void errorFound(const QString &error);
 
 private:
-    QString m_clickToken;
-    QString m_downloadUrl;
-    QString m_packageName;
-    Download* m_download;
-    Manager* m_manager;
-    int m_progress;
+    QString m_clickToken = QString::null;
+    QString m_downloadUrl = QString::null;
+    QString m_packageName = QString::null;
+    Download* m_download = nullptr;
+    Manager* m_manager = nullptr;
+    int m_progress = 0;
 
     void startService();
     QString getPkconCommand();

=== modified file 'plugins/system-update/update.cpp'
--- plugins/system-update/update.cpp	2014-09-12 23:47:39 +0000
+++ plugins/system-update/update.cpp	2015-01-20 12:17:55 +0000
@@ -18,10 +18,13 @@
  *
 */
 
-#include "update.h"
-#include <QStringList>
 #include <apt-pkg/debversion.h>
+
+#include <QDebug>
 #include <QProcessEnvironment>
+#include <QStringList>
+
+#include "update.h"
 
 namespace UpdatePlugin {
 
@@ -64,81 +67,105 @@
 
 void Update::setRemoteVersion(QString& version)
 {
-    m_remote_version = version;
-    if (!getIgnoreUpdates()) {
-        int result = debVS.CmpVersion(m_local_version.toUtf8().data(),
-                                      m_remote_version.toUtf8().data());
-
-        m_update = result < 0;
-    } else {
-        m_update = false;
+    if (m_remote_version != version) {
+        m_remote_version = version;
+        if (!getIgnoreUpdates()) {
+            int result = debVS.CmpVersion(m_local_version.toUtf8().data(),
+                                          m_remote_version.toUtf8().data());
+    
+            m_update = result < 0;
+        } else {
+            m_update = false;
+        }
     }
 }
 
 void Update::setError(QString error)
 {
-    m_error = error;
-    if (!m_error.isEmpty()) {
-        Q_EMIT errorChanged();
+    if (m_error != error) {
+        m_error = error;
+        if (!m_error.isEmpty()) {
+            Q_EMIT errorChanged();
+        }
     }
 }
 
 void Update::setSystemUpdate(bool isSystem)
 {
-    m_systemUpdate = isSystem;
-    Q_EMIT systemUpdateChanged();
+    if (m_systemUpdate != isSystem) {
+        m_systemUpdate = isSystem;
+        Q_EMIT systemUpdateChanged();
+    }
 }
 
 void Update::setUpdateRequired(bool state)
 {
-    m_update = state;
-    Q_EMIT updateRequiredChanged();
+    if (m_update != state) {
+        m_update = state;
+        Q_EMIT updateRequiredChanged();
+    }
 }
 
 void Update::setUpdateState(bool state)
 {
-    m_update_state = state;
-    Q_EMIT updateStateChanged();
+    if (m_update_state != state) {
+        m_update_state = state;
+        Q_EMIT updateStateChanged();
+    }
 }
 
 void Update::setUpdateReady(bool ready)
 {
-    m_update_ready = ready;
-    Q_EMIT updateReadyChanged();
+    if (m_update_ready != ready) {
+        m_update_ready = ready;
+        Q_EMIT updateReadyChanged();
+    }
 }
 
 void Update::setSelected(bool value)
 {
-    m_selected = value;
-    Q_EMIT selectedChanged();
+    if (m_selected != value) {
+        m_selected = value;
+        Q_EMIT selectedChanged();
+    }
 }
 
 void Update::setBinaryFilesize(int size)
 {
-    m_binary_filesize = size;
-    Q_EMIT binaryFilesizeChanged();
+    if (m_binary_filesize != size) {
+        m_binary_filesize = size;
+        Q_EMIT binaryFilesizeChanged();
+    }
 }
 
 void Update::setIconUrl(QString icon) {
-    m_icon_url = icon;
-    Q_EMIT iconUrlChanged();
+    if (m_icon_url != icon) {
+        m_icon_url = icon;
+        Q_EMIT iconUrlChanged();
+    }
 }
 
 void Update::setLastUpdateDate(const QString date)
 {
-    m_lastUpdateDate = date;
-    Q_EMIT lastUpdateDateChanged();
+    if (m_lastUpdateDate != date) {
+        m_lastUpdateDate = date;
+        Q_EMIT lastUpdateDateChanged();
+    }
 }
 
 void Update::setDownloadProgress(int progress)
 {
-    m_download_progress = progress;
-    Q_EMIT downloadProgressChanged();
+    if (m_download_progress != progress) {
+        m_download_progress = progress;
+        Q_EMIT downloadProgressChanged();
+    }
 }
 
 void Update::setDownloadUrl(const QString &url) {
-    m_downloadUrl = url;
-    Q_EMIT downloadUrlChanged();
+    if (m_downloadUrl != url) {
+        m_downloadUrl = url;
+        Q_EMIT downloadUrlChanged();
+    }
 }
 
 bool Update::getIgnoreUpdates()