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

[Manuel de la Peña]

Fix pause issue ensuring that it does pause the download.

Ensure that pause if done correctly.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1258
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1898/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/168
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/691
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/793
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17056

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Please drop the debian/changelog entry. I also added an inline comment, just a style thing, not a must do.

review: Needs Fixing

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

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

Fix code following the reviews.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1904/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/174
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/816
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/816/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17112

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'plugins/system-update/download_tracker.cpp'
--- plugins/system-update/download_tracker.cpp	2014-12-11 09:46:36 +0000
+++ plugins/system-update/download_tracker.cpp	2015-01-15 10:11:59 +0000
@@ -18,6 +18,7 @@
  * Authored by: Diego Sarmentero <[e-mail]>
  */
 
+#include <QDebug>
 #include <QProcessEnvironment>
 
 #include <ubuntu/download_manager/download_struct.h>
@@ -74,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;
@@ -93,22 +96,40 @@
 void DownloadTracker::bindDownload(Download* download)
 {
     m_download = download;
-    connect(m_download, SIGNAL(finished(const QString &)), this,
-            SLOT(onDownloadFinished(const QString &)));
-    connect(m_download, SIGNAL(canceled(bool)), this,
-            SLOT(onDownloadCanceled(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();
 }

=== 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-15 10:11:59 +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()