Merge lp:~mandel/ubuntu-download-manager/expose-property into lp:ubuntu-download-manager

[Manuel de la Peña]

Expose the headers property in the qml.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:318
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/673/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/32/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/673/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-property]

319. By Manuel de la Peña on 2014-06-23

Move the headers properties from QMap<QString, QString> to QVariantMap.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/676/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/35/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/676/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-property]

320. By Manuel de la Peña on 2014-06-23

Ensure that properties can be used BEFORE the m_download pointer has been init.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:320
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/677/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/36/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/677/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-property]

321. By Manuel de la Peña on 2014-06-25

Added logger definition.

322. By Manuel de la Peña on 2014-06-29

Merged client-logging into expose-property.

323. By Manuel de la Peña on 2014-06-29

Merged client-logging into expose-property.

324. By Manuel de la Peña on 2014-06-29

Merged client-logging into expose-property.

325. By Manuel de la Peña on 2014-06-30

Merged client-logging into expose-property.

326. By Manuel de la Peña on 2014-06-30

Remove logger so that it can be added in a diff mr.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/682/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/41/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/682/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-property]

327. By Manuel de la Peña on 2014-06-30

Merged client-logging into expose-property.

328. By Manuel de la Peña on 2014-06-30

Update documentation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/687/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/46/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/687/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-property]

329. By Manuel de la Peña on 2014-07-02

Merged client-logging into expose-property.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/691/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/50/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/691/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-property]

330. By Manuel de la Peña on 2014-07-03

Refactored tests so that we can easily add qml tests.

331. By Manuel de la Peña on 2014-07-03

Ensure that we set the internal pointer to nullptr when we either finish or cancel a download.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/694/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/53/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/694/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/expose-property]

332. By Manuel de la Peña on 2014-07-03

Fix memory leak.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/696/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/55/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/696/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-03 14:40:17 +0000
+++ CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -31,7 +31,7 @@
 )
 
 set(UDM_VERSION_MAJOR 0)
-set(UDM_VERSION_MINOR 5)
+set(UDM_VERSION_MINOR 6)
 set(UDM_VERSION_PATCH 0)
 
 find_package(Gtest REQUIRED)
@@ -46,6 +46,7 @@
 find_package(Qt5SystemInfo REQUIRED)
 find_package(Qt5Sql REQUIRED)
 find_package(Qt5Test REQUIRED)
+find_package(Boost COMPONENTS log REQUIRED)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(DBUS REQUIRED dbus-1)

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-03 14:40:17 +0000
+++ debian/changelog	2014-07-03 14:40:18 +0000
@@ -1,3 +1,11 @@
+ubuntu-download-manager (0.6) UNRELEASED; urgency=medium
+
+  * Add a new public object in the client library that provides a way
+    to configure the logging done in the client library. ABI is changed
+    and a new dependency is added.
+
+ -- Manuel de la Pena <[e-mail]>  Thu, 26 Jun 2014 13:00:45 +0200
+
 ubuntu-download-manager (0.5) UNRELEASED; urgency=medium
 
   * Add support to set the headers for a single file download. This change

=== modified file 'debian/control'
--- debian/control	2014-04-30 14:59:42 +0000
+++ debian/control	2014-07-03 14:40:18 +0000
@@ -10,6 +10,7 @@
                qt5-default,
                qtbase5-dev,
                qtsystems5-dev,
+               libboost-log-dev,
                libdbus-1-dev,
                libqt5sql5-sqlite,
                libnih-dbus-dev,

=== modified file 'debian/libubuntu-download-manager-client0.symbols'
--- debian/libubuntu-download-manager-client0.symbols	2014-06-18 14:49:04 +0000
+++ debian/libubuntu-download-manager-client0.symbols	2014-07-03 14:40:18 +0000
@@ -24,6 +24,7 @@
  (c++)"Ubuntu::DownloadManager::ProcessError::~ProcessError()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::ProcessError::~ProcessError()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::ProcessError::~ProcessError()@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::Logging::Logger::init(Ubuntu::DownloadManager::Logging::Logger::Level, QString const&)@Base" 0replaceme 
  (c++)"Ubuntu::DownloadManager::DownloadsList::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::DownloadsList::qt_metacast(char const*)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::DownloadsList::staticMetaObject@Base" 0.4+14.10.20140618

=== modified file 'src/common/public/ubuntu/transfers/system/logger.cpp'
--- src/common/public/ubuntu/transfers/system/logger.cpp	2014-03-28 15:50:24 +0000
+++ src/common/public/ubuntu/transfers/system/logger.cpp	2014-07-03 14:40:18 +0000
@@ -118,6 +118,7 @@
         google::SetLogDestination(google::ERROR, toStdString(path).c_str());
         google::SetLogDestination(google::WARNING, toStdString(path).c_str());
         google::SetLogDestination(google::INFO, toStdString(path).c_str());
+        google::SetLogDestination(google::FATAL, toStdString(path).c_str());
     }
 }
 

=== modified file 'src/downloads/client/CMakeLists.txt'
--- src/downloads/client/CMakeLists.txt	2014-06-17 10:23:15 +0000
+++ src/downloads/client/CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -1,3 +1,5 @@
+add_definitions(-DBOOST_LOG_DYN_LINK)
+
 set(TARGET ubuntu-download-manager-client)
 
 set(SOURCES
@@ -11,6 +13,7 @@
         ubuntu/download_manager/manager_impl.cpp
         ubuntu/download_manager/manager_interface.cpp
         ubuntu/download_manager/manager_pendingcall_watcher.cpp
+        ubuntu/download_manager/logging/logger.cpp
         ubuntu/download_manager/pending_call_watcher.cpp
 )
 
@@ -20,6 +23,7 @@
         ubuntu/download_manager/error.h
         ubuntu/download_manager/group_download.h
         ubuntu/download_manager/manager.h
+        ubuntu/download_manager/logging/logger.h
 )
 
 set(PRIVATE_HEADERS
@@ -37,6 +41,7 @@
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
 include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
 
@@ -58,6 +63,7 @@
 )
 
 target_link_libraries(${TARGET}
+        ${Boost_LIBRARIES}
 	${Qt5DBus_LIBRARIES}
 	${GLOG_LIBRARIES}
 	udm-common

=== modified file 'src/downloads/client/symbols.map'
--- src/downloads/client/symbols.map	2014-06-17 10:23:15 +0000
+++ src/downloads/client/symbols.map	2014-07-03 14:40:18 +0000
@@ -11,6 +11,7 @@
         Ubuntu::DownloadManager::ProcessError::*;
         Ubuntu::DownloadManager::GroupDownload::*;
         Ubuntu::DownloadManager::Manager::*;
+        Ubuntu::DownloadManager::Logging::Logger::init*;
         typeinfo?for?Ubuntu::DownloadManager::Download;
         typeinfo?for?Ubuntu::DownloadManager::DownloadsList;
         typeinfo?for?Ubuntu::DownloadManager::Error;
@@ -21,6 +22,7 @@
         typeinfo?for?Ubuntu::DownloadManager::ProcessError;
         typeinfo?for?Ubuntu::DownloadManager::GroupDownload;
         typeinfo?for?Ubuntu::DownloadManager::Manager;
+        typeinfo?for?Ubuntu::DownloadManager::Logging::Logger;
         typeinfo?name?for?Ubuntu::DownloadManager::Download;
         typeinfo?name?for?Ubuntu::DownloadManager::DownloadsList;
         typeinfo?name?for?Ubuntu::DownloadManager::Error;
@@ -31,6 +33,7 @@
         typeinfo?name?for?Ubuntu::DownloadManager::ProcessError;
         typeinfo?name?for?Ubuntu::DownloadManager::GroupDownload;
         typeinfo?name?for?Ubuntu::DownloadManager::Manager;
+        typeinfo?name?for?Ubuntu::DownloadManager::Logging::Logger;
         VTT?for?Ubuntu::DownloadManager::Download;
         VTT?for?Ubuntu::DownloadManager::DownloadsList;
         VTT?for?Ubuntu::DownloadManager::Error;
@@ -41,6 +44,7 @@
         VTT?for?Ubuntu::DownloadManager::ProcessError;
         VTT?for?Ubuntu::DownloadManager::GroupDownload;
         VTT?for?Ubuntu::DownloadManager::Manager;
+        VTT?for?Ubuntu::DownloadManager::Logging::Logger;
         virtual?thunk?to?Ubuntu::DownloadManager::Download;
         virtual?thunk?to?Ubuntu::DownloadManager::DownloadsList;
         virtual?thunk?to?Ubuntu::DownloadManager::Error;
@@ -51,6 +55,7 @@
         virtual?thunk?to?Ubuntu::DownloadManager::ProcessError;
         virtual?thunk?to?Ubuntu::DownloadManager::GroupDownload;
         virtual?thunk?to?Ubuntu::DownloadManager::Manager;
+        virtual?thunk?to?Ubuntu::DownloadManager::Logging::Logger;
         vtable?for?Ubuntu::DownloadManager::Download;
         vtable?for?Ubuntu::DownloadManager::DownloadsList;
         vtable?for?Ubuntu::DownloadManager::Error;
@@ -61,6 +66,7 @@
         vtable?for?Ubuntu::DownloadManager::ProcessError;
         vtable?for?Ubuntu::DownloadManager::GroupDownload;
         vtable?for?Ubuntu::DownloadManager::Manager;
+        vtable?for?Ubuntu::DownloadManager::Logging::Logger;
 	std::function*
     };
 

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/download_impl.cpp	2014-07-03 14:40:17 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.cpp	2014-07-03 14:40:18 +0000
@@ -16,13 +16,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <glog/logging.h>
+#include <ubuntu/download_manager/logging/logger.h>
 #include "download_impl.h"
 
 namespace Ubuntu {
 
 namespace DownloadManager {
 
+using namespace Logging;
+
 DownloadImpl::DownloadImpl(const QDBusConnection& conn,
                            const QString& servicePath,
                            const QDBusObjectPath& objectPath,
@@ -31,38 +33,92 @@
       _id(objectPath.path()),
       _conn(conn),
       _servicePath(servicePath) {
+
     _dbusInterface = new DownloadInterface(servicePath,
         _id, conn);
 
     // fwd all the signals but the error one
-    CHECK(connect(_dbusInterface, &DownloadInterface::canceled,
-        this, &Download::canceled)) << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, &DownloadInterface::finished,
-        this, &Download::finished)) << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, &DownloadInterface::paused,
-        this, &Download::paused)) << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, &DownloadInterface::processing,
-        this, &Download::processing)) << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, static_cast<void(DownloadInterface::*)
+    auto connected = connect(_dbusInterface, &DownloadInterface::canceled,
+        this, &Download::canceled);
+
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal DownloadInterface::canceled");
+    }
+
+    connected = connect(_dbusInterface, &DownloadInterface::finished,
+        this, &Download::finished);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::finished");
+    }
+
+    connected = connect(_dbusInterface, &DownloadInterface::paused,
+        this, &Download::paused);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal DownloadInterface::paused");
+    }
+
+    connected = connect(_dbusInterface, &DownloadInterface::processing,
+        this, &Download::processing);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal DownloadInterface::processing");
+    }
+
+    connected = connect(_dbusInterface, static_cast<void(DownloadInterface::*)
         (qulonglong, qulonglong)>(&DownloadInterface::progress),
         this, static_cast<void(Download::*)
-            (qulonglong, qulonglong)>(&Download::progress)))
-            << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, &DownloadInterface::resumed,
-        this, &Download::resumed)) << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, &DownloadInterface::started,
-        this, &Download::started)) << "Could not connect to signal";
+            (qulonglong, qulonglong)>(&Download::progress));
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::progress");
+    }
+
+    connected = connect(_dbusInterface, &DownloadInterface::resumed,
+        this, &Download::resumed);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::resumed");
+    }
+
+    connected = connect(_dbusInterface, &DownloadInterface::started,
+        this, &Download::started);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::started");
+    }
 
     // connect to the different type of errors that will later be converted to
     // the error type to be used by the client.
-    CHECK(connect(_dbusInterface, &DownloadInterface::httpError,
-        this, &DownloadImpl::onHttpError)) << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, &DownloadInterface::networkError,
-        this, &DownloadImpl::onNetworkError)) << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, &DownloadInterface::processError,
-        this, &DownloadImpl::onProcessError)) << "Could not connect to signal";
-    CHECK(connect(_dbusInterface, &DownloadInterface::authError,
-        this, &DownloadImpl::onAuthError)) << "Could not connect to signal";
+    connected = connect(_dbusInterface, &DownloadInterface::httpError,
+        this, &DownloadImpl::onHttpError);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::httpError");
+    }
+
+    connected = connect(_dbusInterface, &DownloadInterface::networkError,
+        this, &DownloadImpl::onNetworkError);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::networkError");
+    }
+
+    connected = connect(_dbusInterface, &DownloadInterface::processError,
+        this, &DownloadImpl::onProcessError);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::processError");
+    }
+
+    connected = connect(_dbusInterface, &DownloadInterface::authError,
+        this, &DownloadImpl::onAuthError);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::authError");
+    }
 }
 
 DownloadImpl::DownloadImpl(const QDBusConnection& conn, Error* err, QObject* parent)
@@ -79,6 +135,9 @@
 
 void
 DownloadImpl::setLastError(Error* err) {
+    Logger::log(Logger::Debug,
+        QString("Download{%1} setLastError(%2)").arg(_id).arg(
+            err->errorString()));
     if (_lastError != nullptr) {
         delete _lastError;
     }
@@ -94,6 +153,7 @@
 
 void
 DownloadImpl::start() {
+    Logger::log(Logger::Debug, QString("Download{%1} start())").arg(_id));
     QDBusPendingCall call =
         _dbusInterface->start();
     auto watcher = new DownloadPCW(_conn, _servicePath,
@@ -103,6 +163,7 @@
 
 void
 DownloadImpl::pause() {
+    Logger::log(Logger::Debug, QString("Download{%1} pause())").arg(_id));
     QDBusPendingCall call =
         _dbusInterface->pause();
     auto watcher = new DownloadPCW(_conn, _servicePath,
@@ -112,6 +173,7 @@
 
 void
 DownloadImpl::resume() {
+    Logger::log(Logger::Debug, QString("Download{%1} resume())").arg(_id));
     QDBusPendingCall call =
         _dbusInterface->resume();
     auto watcher = new DownloadPCW(_conn, _servicePath,
@@ -121,6 +183,7 @@
 
 void
 DownloadImpl::cancel() {
+    Logger::log(Logger::Debug, QString("Download{%1} cancel())").arg(_id));
     QDBusPendingCall call =
         _dbusInterface->cancel();
     auto watcher = new DownloadPCW(_conn, _servicePath,
@@ -130,22 +193,28 @@
 
 void
 DownloadImpl::allowMobileDownload(bool allowed) {
+    Logger::log(Logger::Debug,
+        QString("Download{%1} allowMobileDownload%2())").arg(_id).arg(allowed));
     QDBusPendingReply<> reply =
         _dbusInterface->allowGSMDownload(allowed);
     // block, the call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error when setting mobile data usage");
         setLastError(reply.error());
     }
 }
 
 bool
 DownloadImpl::isMobileDownloadAllowed() {
+    Logger::log(Logger::Debug,
+        QString("Download{%1} isMobileDownloadAllowed").arg(_id));
     QDBusPendingReply<bool> reply =
         _dbusInterface->isGSMDownloadAllowed();
     // block, the call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error when querying mobile data usage");
         setLastError(reply.error());
         return false;
     } else {
@@ -156,33 +225,42 @@
 
 void
 DownloadImpl::setDestinationDir(const QString& path) {
+    Logger::log(Logger::Debug, QString("Dowmload{%1} setDestinationDir(%2)")
+        .arg(_id).arg(path));
     QDBusPendingReply<> reply =
         _dbusInterface->setDestinationDir(path);
     // block, the call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error setting the download directory");
         setLastError(reply.error());
     }
 }
 
 void
 DownloadImpl::setHeaders(QMap<QString, QString> headers) {
+    Logger::log(Logger::Debug,
+        QString("Download {%1} setHeaders(%2)").arg(_id), headers);
+
     QDBusPendingReply<> reply =
         _dbusInterface->setHeaders(headers);
     // block, the call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error setting the download headers");
         setLastError(reply.error());
     }
 }
 
 QMap<QString, QString>
 DownloadImpl::headers() {
+    Logger::log(Logger::Debug, QString("Download{%1} headers()").arg(_id));
     QDBusPendingReply<QMap<QString, QString> > reply =
         _dbusInterface->headers();
     // block, the call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error querying the download headers");
         setLastError(reply.error());
         QMap<QString, QString> empty;
         return empty;
@@ -195,22 +273,27 @@
 
 void
 DownloadImpl::setThrottle(qulonglong speed) {
+    Logger::log(Logger::Debug,
+        QString("Download{%1} setThrottle(%2)").arg(_id).arg(speed));
     QDBusPendingReply<> reply =
         _dbusInterface->setThrottle(speed);
     // block, the call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error setting the download throttle");
         setLastError(reply.error());
     }
 }
 
 qulonglong
 DownloadImpl::throttle() {
+    Logger::log(Logger::Debug, QString("Download{%1} throttle()").arg(_id));
     QDBusPendingReply<qulonglong> reply =
         _dbusInterface->throttle();
     // block, the call is fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error querying the download throttle");
         setLastError(reply.error());
         return 0;
     } else {
@@ -226,11 +309,13 @@
 
 QVariantMap
 DownloadImpl::metadata() {
+    Logger::log(Logger::Debug, QString("Download{%1} metadata()").arg(_id));
     QDBusPendingReply<QVariantMap> reply =
         _dbusInterface->metadata();
     // block the call is fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error querying the download metadata");
         QVariantMap emptyResult;
         setLastError(reply.error());
         return emptyResult;
@@ -242,11 +327,13 @@
 
 qulonglong
 DownloadImpl::progress() {
+    Logger::log(Logger::Debug, QString("Download{%1} progress()").arg(_id));
     QDBusPendingReply<qulonglong> reply =
         _dbusInterface->progress();
     // block call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error querying the download progress");
         setLastError(reply.error());
         return 0;
     } else {
@@ -257,11 +344,13 @@
 
 qulonglong
 DownloadImpl::totalSize() {
+    Logger::log(Logger::Debug, QString("Download{%1} totalSize()").arg(_id));
     QDBusPendingReply<qulonglong> reply =
         _dbusInterface->totalSize();
-    // block call should b fast enough
+    // block call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
+        Logger::log(Logger::Error, "Error querying the download size");
         setLastError(reply.error());
         return 0;
     } else {

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.h'
--- src/downloads/client/ubuntu/download_manager/download_impl.h	2014-07-03 14:40:17 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.h	2014-07-03 14:40:18 +0000
@@ -24,11 +24,14 @@
 #include <QObject>
 #include <QVariantMap>
 #include <QString>
+
 #include <ubuntu/transfers/visibility.h>
 #include <ubuntu/download_manager/metatypes.h>
-#include "download_interface.h"
-#include "download_pendingcall_watcher.h"
-#include "error.h"
+
+#include <ubuntu/download_manager/download_interface.h>
+#include <ubuntu/download_manager/download_pendingcall_watcher.h>
+#include <ubuntu/download_manager/error.h>
+
 #include "download.h"
 
 class QDBusConnection;

=== modified file 'src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.cpp'
--- src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.cpp	2014-04-09 11:10:26 +0000
+++ src/downloads/client/ubuntu/download_manager/download_pendingcall_watcher.cpp	2014-07-03 14:40:18 +0000
@@ -16,25 +16,33 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QDebug>
 #include <QDBusPendingReply>
-#include <glog/logging.h>
-#include "error.h"
-#include "download_pendingcall_watcher.h"
+
+#include <boost/log/sources/record_ostream.hpp>
+#include <boost/log/sources/severity_feature.hpp>
+
+#include <ubuntu/download_manager/error.h>
+#include <ubuntu/download_manager/logging/logger.h>
+
+#include <ubuntu/download_manager/download_pendingcall_watcher.h>
 
 namespace Ubuntu {
 
 namespace DownloadManager {
 
-DownloadPCW::DownloadPCW(
-                                               const QDBusConnection& conn,
-                                               const QString& servicePath,
-                                               const QDBusPendingCall& call,
-                                               Download* parent)
+using namespace Logging;
+
+DownloadPCW::DownloadPCW(const QDBusConnection& conn,
+                         const QString& servicePath,
+                         const QDBusPendingCall& call,
+                         Download* parent)
     : PendingCallWatcher(conn, servicePath, call, parent) {
-    CHECK(connect(this, &DownloadPCW::finished,
-        this, &DownloadPCW::onFinished))
-            << "Could not connect to signal";
+    auto connected = connect(this, &DownloadPCW::finished,
+        this, &DownloadPCW::onFinished);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadPCW::finished");
+    }
 }
 
 void
@@ -42,7 +50,9 @@
     auto down = qobject_cast<Download*>(parent());
     QDBusPendingReply<> reply = *watcher;
     if (reply.isError()) {
-        qDebug() << "ERROR" << reply.error() << reply.error().type();
+        auto dbusErr = reply.error();
+        Logger::log(Logger::Error,
+            QString("%1 %2").arg(dbusErr.name()).arg(dbusErr.message()));
         auto err = new DBusError(reply.error());
         down->error(err);
     }

=== added directory 'src/downloads/client/ubuntu/download_manager/logging'
=== added file 'src/downloads/client/ubuntu/download_manager/logging/logger.cpp'
--- src/downloads/client/ubuntu/download_manager/logging/logger.cpp	1970-01-01 00:00:00 +0000
+++ src/downloads/client/ubuntu/download_manager/logging/logger.cpp	2014-07-03 14:40:18 +0000
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <boost/log/expressions/attr_fwd.hpp>
+#include <boost/log/expressions/attr.hpp>
+#include <boost/log/expressions/formatters/date_time.hpp>
+#include <boost/log/keywords/channel.hpp>
+#include <boost/log/sources/severity_channel_logger.hpp>
+#include <boost/log/sources/record_ostream.hpp>
+#include <boost/log/support/date_time.hpp>
+#include <boost/log/utility/setup/console.hpp>
+#include <boost/log/utility/setup/file.hpp>
+#include <boost/log/utility/setup/common_attributes.hpp>
+
+#include <ubuntu/download_manager/download_struct.h>
+#include <ubuntu/download_manager/logging/logger.h>
+
+typedef boost::log::sources::severity_channel_logger_mt<
+    Ubuntu::DownloadManager::Logging::Logger::Level,
+    std::string> logger_mt;
+
+namespace {
+    const std::string DOWNLOAD_MANAGER_CHANNEL = "ubuntu_download_manager";
+    void my_formatter(boost::log::record_view const& rec,
+                      boost::log::formatting_ostream& strm) {
+        using namespace Ubuntu::DownloadManager::Logging;
+        // grab the attributes we are interested in
+        strm << boost::log::extract<unsigned int>("LineID", rec) << " [";
+        strm << boost::log::extract<boost::posix_time::ptime>("TimeStamp", rec) << "] ";
+        strm << boost::log::extract<std::string>("Channel", rec) << " [";
+        auto severity = boost::log::extract<Logger::Level>("Severity", rec).get();
+        switch(severity) {
+            case Logger::Debug:
+                strm << "Debug";
+                break;
+            case Logger::Normal:
+                strm << "Normal";
+                break;
+            case Logger::Notification:
+                strm << "Notification";
+                break;
+            case Logger::Warning:
+                strm << "Warning";
+                break;
+            case Logger::Error:
+                strm << "Error";
+                break;
+            default:
+                strm << "Critical";
+                break;
+        }
+        strm << "] ";
+        // Finally, put the record message to the stream
+        strm << rec[boost::log::expressions::smessage];
+    }
+}
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace Logging {
+
+class LoggerPrivate {
+ public:
+    LoggerPrivate() { }
+
+    void init(Logger::Level lvl, const QString& path) {
+        if (_lg == nullptr) {
+            boost::log::add_common_attributes();
+
+            _lg = new logger_mt(
+                boost::log::keywords::channel = DOWNLOAD_MANAGER_CHANNEL,
+                boost::log::keywords::severity = lvl);
+            // create a sink with the given file name and then add a filter
+            // to ensure that just the download manager logs are written in it
+            auto sink  = boost::log::add_file_log(
+                boost::log::keywords::file_name = path.toStdString(),
+                boost::log::keywords::auto_flush = true
+            );
+
+            sink->set_formatter(&my_formatter);
+
+            sink->set_filter
+            (
+                boost::log::expressions::attr<std::string>("Channel") == DOWNLOAD_MANAGER_CHANNEL
+            );
+
+        } else {
+            log(Logger::Critical, "Logger init called more than once.");
+        }
+    }
+
+    void log(Logger::Level lvl, const QString& msg) {
+        if (_lg != nullptr) {
+            auto rec = _lg->open_record(boost::log::keywords::severity = lvl);
+            if (rec) {
+                boost::log::record_ostream strm(rec);
+                strm << msg.toStdString();
+                strm.flush();
+                _lg->push_record(boost::move(rec));
+            }
+        }
+    }
+
+    void log(Logger::Level lvl, const QStringList& msgList) {
+        auto msg = msgList.join(" ");
+        log(lvl, msg);
+    }
+
+    void log(Logger::Level lvl, const QString& msg, QMap<QString, QString> map) {
+        auto fmtMsg = msg.arg(toString(map));
+        log(lvl, fmtMsg);
+    }
+
+    void log(Logger::Level lvl, const QString& msg, DownloadStruct downStruct) {
+        QStringList list;
+
+        list << "\n\t\tUrl: " << downStruct.getUrl()
+             << "\n\t\tHash Algorithm: '" << downStruct.getAlgorithm() << "'"
+             << "\n\t\tMetadata: " << toString(downStruct.getMetadata())
+             << "\n\t\tHeaders: " << toString(downStruct.getHeaders());
+
+        auto fmtMsg = msg.arg(list.join(""));
+        log(lvl, fmtMsg);
+    }
+
+ private:
+    QString toString(QMap<QString, QString> map) {
+        QStringList list;
+        list << "{";
+        int index = map.keys().count();
+        foreach(const QString& key, map.keys()) {
+            list << "'" << key << "': '" << map[key] << "'";
+            if (index != 1) {
+                list << ", ";
+            }
+            index--;
+        }
+        list << "}";
+        return list.join("");
+    }
+
+    QString toString(QVariantMap map) {
+        QStringList list;
+        list << "{";
+        int index = map.keys().count();
+        foreach(const QString& key, map.keys()) {
+            list << "'" << key << "': '"
+                << map[key].toString() << "'";
+    	    if (index != 1) {
+                list << ", ";
+    	    }
+            index--;
+        }
+        list << "}";
+        return list.join("");
+    }
+
+ private:
+    logger_mt* _lg = nullptr;
+};
+
+LoggerPrivate* Logger::_private = new LoggerPrivate();
+QMutex Logger::_mutex;
+
+void
+Logger::init(Logger::Level lvl, const QString& path) {
+    _mutex.lock();
+    _private->init(lvl, path);
+    _mutex.unlock();
+}
+
+void
+Logger::log(Logger::Level lvl, const QString& msg) {
+    _private->log(lvl, msg);
+}
+
+void
+Logger::log(Logger::Level lvl, const QStringList& msg) {
+    _private->log(lvl, msg);
+}
+
+void
+Logger::log(Level lvl, const QString& msg, QMap<QString, QString> map) {
+    _private->log(lvl, msg, map);
+}
+
+void
+Logger::log(Level lvl, const QString& msg, DownloadStruct downStruct) {
+    _private->log(lvl, msg, downStruct);
+}
+
+}  // logging
+
+}  // Transfers
+
+}  // Ubuntu

=== added file 'src/downloads/client/ubuntu/download_manager/logging/logger.h'
--- src/downloads/client/ubuntu/download_manager/logging/logger.h	1970-01-01 00:00:00 +0000
+++ src/downloads/client/ubuntu/download_manager/logging/logger.h	2014-07-03 14:40:18 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_LOGGER_H
+#define UBUNTU_DOWNLOADMANAGER_CLIENT_LOGGER_H
+
+#include <QMap>
+#include <QMutex>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class DownloadImpl;
+class DownloadPCW;
+class ManagerImpl;
+class DownloadManagerPCW;
+class DownloadsListManagerPCW;
+class GroupManagerPCW;
+class MetadataDownloadsListManagerPCW;
+class DownloadStruct;
+
+namespace Logging {
+
+class LoggerPrivate;
+
+/*!
+    \class Logger
+    \brief The Logger class allows to control a logging that
+           is performed within the library allowed the developer
+           to set the log level as well as the path of the file
+           where the logs are written.
+    \since 0.5
+
+*/
+class Logger {
+    friend class Ubuntu::DownloadManager::DownloadImpl;
+    friend class Ubuntu::DownloadManager::DownloadPCW;
+    friend class Ubuntu::DownloadManager::ManagerImpl;
+    friend class Ubuntu::DownloadManager::DownloadManagerPCW;
+    friend class Ubuntu::DownloadManager::DownloadsListManagerPCW;
+    friend class Ubuntu::DownloadManager::GroupManagerPCW;
+    friend class Ubuntu::DownloadManager::MetadataDownloadsListManagerPCW;
+
+ public:
+    /*! The different log levels supported by the default logger of the lib. */
+    enum Level
+    {
+        Debug,
+        Normal,
+        Notification,
+        Warning,
+        Error,
+        Critical
+    };
+
+    /*!
+        \fn static void Logger::init(Level lvl, const QString& path)
+
+        Initializes the logging service for the download library using
+        the given \a level and writing the logs to the given \a path.
+    */
+    static void init(Level lvl, const QString& path);
+
+ protected:
+
+    /*! \cond PRIVATE
+     */
+    static void log(Level lvl, const QString& msg);
+    static void log(Level lvl, const QStringList& msg);
+    static void log(Level lvl, const QString& msg, QMap<QString, QString> map);
+    static void log(Level lvl, const QString& msg, DownloadStruct downStruct);
+    /*! \endcond
+     */
+
+ private:
+    static QMutex _mutex;
+    static LoggerPrivate* _private;
+};
+
+}  // Logging
+
+}  // DownloadManager
+
+}  // Ubuntu
+
+#endif

=== modified file 'src/downloads/client/ubuntu/download_manager/manager.cpp'
--- src/downloads/client/ubuntu/download_manager/manager.cpp	2014-02-12 12:01:11 +0000
+++ src/downloads/client/ubuntu/download_manager/manager.cpp	2014-07-03 14:40:18 +0000
@@ -16,9 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QDebug>
-#include "manager_impl.h"
-#include "manager.h"
+#include <ubuntu/download_manager/manager_impl.h>
+#include <ubuntu/download_manager/manager.h>
 
 namespace {
     const QString DOWNLOAD_SERVICE = "com.canonical.applications.Downloader";

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2014-04-09 11:10:26 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2014-07-03 14:40:18 +0000
@@ -16,12 +16,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QDebug>
-#include <glog/logging.h>
-#include "download_impl.h"
-#include "downloads_list.h"
+#include <ubuntu/download_manager/download_impl.h>
+#include <ubuntu/download_manager/downloads_list.h>
+#include <ubuntu/download_manager/logging/logger.h>
+
 #include "manager_impl.h"
 
+
 namespace {
     const QString MANAGER_PATH = "/";
 }
@@ -30,6 +31,8 @@
 
 namespace DownloadManager {
 
+using namespace Logging;
+
 ManagerImpl::ManagerImpl(const QDBusConnection& conn,
                          const QString& path,
                          QObject* parent)
@@ -80,12 +83,14 @@
 
 Download*
 ManagerImpl::getDownloadForId(const QString& id) {
+    Logger::log(Logger::Debug, QString("Manager getDownloadForId(%1)").arg(id));
     auto down = new DownloadImpl(_conn, _servicePath, QDBusObjectPath(id));
     return down;
 }
 
 void
 ManagerImpl::createDownload(DownloadStruct downStruct) {
+    Logger::log(Logger::Debug, "Manager createDownload(%1)", downStruct);
     DownloadCb cb = [](Download*) {};
     createDownload(downStruct, cb, cb);
 }
@@ -98,8 +103,12 @@
         _dbusInterface->createDownload(downStruct);
     auto watcher = new DownloadManagerPCW(_conn,
             _servicePath, call, cb, errCb, this);
-    CHECK(connect(watcher, &DownloadManagerPCW::callbackExecuted,
-        this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
+    auto connected = connect(watcher, &DownloadManagerPCW::callbackExecuted,
+        this, &ManagerImpl::onWatcherDone);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadManagerPCW::callbackExecuted,");
+    }
 }
 
 void
@@ -125,28 +134,40 @@
             algorithm, allowed3G, metadata, headers);
     auto watcher = new GroupManagerPCW(_conn, _servicePath,
             call, cb, errCb, this);
-    CHECK(connect(watcher, &GroupManagerPCW::callbackExecuted,
-        this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
+    auto connected = connect(watcher, &GroupManagerPCW::callbackExecuted,
+        this, &ManagerImpl::onWatcherDone);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &GroupManagerPCW::callbackExecuted");
+    }
 }
 
 void
 ManagerImpl::getAllDownloads() {
+    Logger::log(Logger::Debug, "Manager getAllDownloads()");
     DownloadsListCb cb = [](DownloadsList*){};
     getAllDownloads(cb, cb);
 }
 
 void
 ManagerImpl::getAllDownloads(DownloadsListCb cb, DownloadsListCb errCb) {
+    Logger::log(Logger::Debug, "Manager getAllDownloads()");
     QDBusPendingCall call = _dbusInterface->getAllDownloads();
     auto watcher = new DownloadsListManagerPCW(
         _conn, _servicePath, call, cb, errCb, this);
-    CHECK(connect(watcher, &GroupManagerPCW::callbackExecuted,
-        this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
+    auto connected = connect(watcher, &GroupManagerPCW::callbackExecuted,
+        this, &ManagerImpl::onWatcherDone);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal");
+    }
 }
 
 void
 ManagerImpl::getAllDownloadsWithMetadata(const QString &name,
                                          const QString &value) {
+    Logger::log(Logger::Debug,
+        QString("Manager getAllDownloadsWithMetadata(%1, %2)").arg(name).arg(value));
     MetadataDownloadsListCb cb =
         [](const QString&, const QString&, DownloadsList*){};
     getAllDownloadsWithMetadata(name, value, cb, cb);
@@ -157,12 +178,17 @@
                                          const QString &value,
                                          MetadataDownloadsListCb cb,
                                          MetadataDownloadsListCb errCb) {
+    Logger::log(Logger::Debug,
+        QString("Manager getAllDownloadsWithMetadata(%1, %2)").arg(name).arg(value));
     QDBusPendingCall call = _dbusInterface->getAllDownloadsWithMetadata(
     name, value);
     auto watcher = new MetadataDownloadsListManagerPCW(
         _conn, _servicePath, call, name, value, cb, errCb, this);
-    CHECK(connect(watcher, &GroupManagerPCW::callbackExecuted,
-        this, &ManagerImpl::onWatcherDone)) << "Could not connect to signal";
+    auto connected = connect(watcher, &GroupManagerPCW::callbackExecuted,
+        this, &ManagerImpl::onWatcherDone);
+    if (!connected) {
+        Logger::log(Logger::Critical, "Could not connect to signal");
+    }
 }
 
 bool
@@ -187,27 +213,29 @@
 
 void
 ManagerImpl::allowMobileDataDownload(bool allowed) {
+    Logger::log(Logger::Debug,
+        QString("Manager allowMobileDataDownload(%1)").arg(allowed));
     QDBusPendingReply<> reply =
         _dbusInterface->allowGSMDownload(allowed);
     // we block but because we expect it to be fast
     reply.waitForFinished();
     if (reply.isError()) {
         auto err = reply.error();
-        qCritical() << "Error setting mobile data" << err;
+        Logger::log(Logger::Critical, "Error setting mobile data");
         setLastError(err);
     }
 }
 
 bool
 ManagerImpl::isMobileDataDownload() {
+    Logger::log(Logger::Debug, "Manager isMobileDataDownload()");
     QDBusPendingReply<bool> reply =
         _dbusInterface->isGSMDownloadAllowed();
     // we block but because we expect it to be fast
     reply.waitForFinished();
     if (reply.isError()) {
         auto err = reply.error();
-        qCritical() << "Error getting if mobile data is enabled"
-            << err;
+        Logger::log(Logger::Error, "Error getting if mobile data is enabled");
         setLastError(err);
         return false;
     } else {
@@ -217,13 +245,14 @@
 
 qulonglong
 ManagerImpl::defaultThrottle() {
+    Logger::log(Logger::Debug, "Manager defaultThrottle()");
     QDBusPendingReply<qulonglong> reply =
         _dbusInterface->defaultThrottle();
     // we block but because we expect it to be fast
     reply.waitForFinished();
     if (reply.isError()) {
         auto err = reply.error();
-        qCritical() << "Error getting the default throttle" << err;
+        Logger::log(Logger::Error, "Error getting the default throttle");
         setLastError(err);
         return 0;
     } else {
@@ -233,26 +262,29 @@
 
 void
 ManagerImpl::setDefaultThrottle(qulonglong speed) {
+    Logger::log(Logger::Debug,
+        QString("Manager setDefaultThrottle(%1)").arg(speed));
     QDBusPendingReply<> reply =
         _dbusInterface->setDefaultThrottle(speed);
     // we block but because we expect it to be fast
     reply.waitForFinished();
     if (reply.isError()) {
         auto err = reply.error();
-        qCritical() << "Error setting default throttle" << err;
+        Logger::log(Logger::Error, "Error setting default throttle");
         setLastError(err);
     }
 }
 
 void
 ManagerImpl::exit() {
+    Logger::log(Logger::Debug, "Manager exit()");
     QDBusPendingReply<> reply =
         _dbusInterface->exit();
     // we block but because we expect it to be fast
     reply.waitForFinished();
     if (reply.isError()) {
         auto err = reply.error();
-        qCritical() << "Error setting killing the daemon" << err;
+        Logger::log(Logger::Error, "Error setting killing the daemon");
         setLastError(err);
     }
 }

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.h'
--- src/downloads/client/ubuntu/download_manager/manager_impl.h	2014-06-06 10:05:15 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.h	2014-07-03 14:40:18 +0000
@@ -21,13 +21,16 @@
 
 #include <QDBusConnection>
 #include <QDBusObjectPath>
+
 #include <ubuntu/transfers/visibility.h>
 #include <ubuntu/transfers/system/dbus_connection.h>
-#include "download.h"
-#include "error.h"
-#include "group_download.h"
-#include "manager_interface.h"
-#include "manager_pendingcall_watcher.h"
+
+#include <ubuntu/download_manager/download.h>
+#include <ubuntu/download_manager/error.h>
+#include <ubuntu/download_manager/group_download.h>
+#include <ubuntu/download_manager/manager_interface.h>
+#include <ubuntu/download_manager/manager_pendingcall_watcher.h>
+
 #include "manager.h"
 
 
@@ -108,7 +111,6 @@
     QString _servicePath;
     Error* _lastError = nullptr;
     ManagerInterface* _dbusInterface = nullptr;
-
 };
 
 }  // DownloadManager

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.cpp'
--- src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.cpp	2014-04-09 11:10:26 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_pendingcall_watcher.cpp	2014-07-03 14:40:18 +0000
@@ -16,21 +16,27 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <QDebug>
 #include <QDBusPendingReply>
 #include <QDBusObjectPath>
-#include <glog/logging.h>
-#include "download_impl.h"
-#include "downloads_list_impl.h"
-#include "error.h"
-#include "group_download.h"
-#include "manager.h"
-#include "manager_pendingcall_watcher.h"
+
+#include <boost/log/sources/record_ostream.hpp>
+#include <boost/log/sources/severity_feature.hpp>
+
+#include <ubuntu/download_manager/download_impl.h>
+#include <ubuntu/download_manager/downloads_list_impl.h>
+#include <ubuntu/download_manager/error.h>
+#include <ubuntu/download_manager/group_download.h>
+#include <ubuntu/download_manager/manager.h>
+#include <ubuntu/download_manager/logging/logger.h>
+
+#include <ubuntu/download_manager/manager_pendingcall_watcher.h>
 
 namespace Ubuntu {
 
 namespace DownloadManager {
 
+using namespace Logging;
+
 DownloadManagerPCW::DownloadManagerPCW(const QDBusConnection& conn,
                                        const QString& servicePath,
                                        const QDBusPendingCall& call,
@@ -40,9 +46,12 @@
     : PendingCallWatcher(conn, servicePath, call, parent),
       _cb(cb),
       _errCb(errCb) {
-    CHECK(connect(this, &QDBusPendingCallWatcher::finished,
-        this, &DownloadManagerPCW::onFinished))
-            << "Could not connect to signal";
+    auto connected = connect(this, &QDBusPendingCallWatcher::finished,
+        this, &DownloadManagerPCW::onFinished);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &QDBusPendingCallWatcher::finished");
+    }
 }
 
 void
@@ -50,14 +59,14 @@
     QDBusPendingReply<QDBusObjectPath> reply = *watcher;
     auto man = static_cast<Manager*>(parent());
     if (reply.isError()) {
-        qDebug() << "ERROR" << reply.error() << reply.error().type();
-        // create error and deal with it
+        auto dbusErr = reply.error();
+        Logger::log(Logger::Error,
+            QString("%1 %2").arg(dbusErr.name()).arg(dbusErr.message()));
         auto err = new DBusError(reply.error());
         auto down = new DownloadImpl(_conn, err);
         _errCb(down);
         emit man->downloadCreated(down);
     } else {
-        qDebug() << "Success!";
         auto path = reply.value();
         auto down = new DownloadImpl(_conn, _servicePath, path);
         emit man->downloadCreated(down);
@@ -76,8 +85,12 @@
     : PendingCallWatcher(conn, servicePath, call, parent),
       _cb(cb),
       _errCb(errCb) {
-    connect(this, &QDBusPendingCallWatcher::finished,
+    auto connected = connect(this, &QDBusPendingCallWatcher::finished,
         this, &DownloadsListManagerPCW::onFinished);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &QDBusPendingCallWatcher::finished");
+    }
 }
 
 void
@@ -86,14 +99,14 @@
     DownloadsListImpl* list;
     auto man = static_cast<Manager*>(parent());
     if (reply.isError()) {
-        qDebug() << "ERROR" << reply.error() << reply.error().type();
-        // create error and deal with it
+        auto dbusErr = reply.error();
+        Logger::log(Logger::Error,
+            QString("%1 %2").arg(dbusErr.name()).arg(dbusErr.message()));
         auto err = new DBusError(reply.error());
         list = new DownloadsListImpl(err);
         _errCb(list);
         emit man->downloadsFound(list);
     } else {
-        qDebug() << "Success!";
         auto paths = reply.value();
         QList<QSharedPointer<Download> > downloads;
         list = new DownloadsListImpl();
@@ -125,8 +138,12 @@
       _value(value),
       _cb(cb),
       _errCb(errCb) {
-    connect(this, &QDBusPendingCallWatcher::finished,
+    auto connected = connect(this, &QDBusPendingCallWatcher::finished,
         this, &MetadataDownloadsListManagerPCW::onFinished);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &QDBusPendingCallWatcher::finished");
+    }
 }
 
 void
@@ -135,14 +152,14 @@
     DownloadsListImpl* list;
     auto man = static_cast<Manager*>(parent());
     if (reply.isError()) {
-        qDebug() << "ERROR" << reply.error() << reply.error().type();
-        // create error and deal with it
+        auto dbusErr = reply.error();
+        Logger::log(Logger::Error,
+            QString("%1 %2").arg(dbusErr.name()).arg(dbusErr.message()));
         auto err = new DBusError(reply.error());
         list = new DownloadsListImpl(err);
         _errCb(_key, _value, list);
         emit man->downloadsWithMetadataFound(_key, _value, list);
     } else {
-        qDebug() << "Success!";
         auto paths = reply.value();
         QList<QSharedPointer<Download> > downloads;
         list = new DownloadsListImpl();
@@ -169,9 +186,12 @@
     : PendingCallWatcher(conn, servicePath, call, parent),
       _cb(cb),
       _errCb(errCb) {
-    CHECK(connect(this, &QDBusPendingCallWatcher::finished,
-        this, &GroupManagerPCW::onFinished))
-            << "Could not connect to signal";
+    auto connected = connect(this, &QDBusPendingCallWatcher::finished,
+        this, &GroupManagerPCW::onFinished);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadPCW::finished");
+    }
 }
 
 void
@@ -179,7 +199,9 @@
     QDBusPendingReply<QDBusObjectPath> reply = *watcher;
     auto man = static_cast<Manager*>(parent());
     if (reply.isError()) {
-        // creater error and deal with it
+        auto dbusErr = reply.error();
+        Logger::log(Logger::Error,
+            QString("%1 %2").arg(dbusErr.name()).arg(dbusErr.message()));
         auto err = new DBusError(reply.error());
         auto down = new GroupDownload(err);
         _errCb(down);

=== modified file 'src/downloads/qml/CMakeLists.txt'
--- src/downloads/qml/CMakeLists.txt	2014-05-07 12:27:08 +0000
+++ src/downloads/qml/CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -3,16 +3,16 @@
 
 set(plugin_SRCS
     backend.cpp
-    ubuntu_download_manager.cpp
     download_error.cpp
     single_download.cpp
+    ubuntu_download_manager.cpp
 )
 
 set(plugin_HDRS
     backend.h
-    ubuntu_download_manager.h
     download_error.h
     single_download.h
+    ubuntu_download_manager.h
 )
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common/public)

=== modified file 'src/downloads/qml/backend.h'
--- src/downloads/qml/backend.h	2014-03-28 16:11:54 +0000
+++ src/downloads/qml/backend.h	2014-07-03 14:40:18 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
 #ifndef BACKEND_PLUGIN_H
 #define BACKEND_PLUGIN_H
 

=== modified file 'src/downloads/qml/download_error.h'
--- src/downloads/qml/download_error.h	2014-03-28 16:11:54 +0000
+++ src/downloads/qml/download_error.h	2014-07-03 14:40:18 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
 #ifndef DOWNLOAD_ERROR_H
 #define DOWNLOAD_ERROR_H
 

=== modified file 'src/downloads/qml/single_download.cpp'
--- src/downloads/qml/single_download.cpp	2014-05-07 12:27:08 +0000
+++ src/downloads/qml/single_download.cpp	2014-07-03 14:40:18 +0000
@@ -1,7 +1,6 @@
 #include "single_download.h"
 #include <glog/logging.h>
 #include <ubuntu/download_manager/download_struct.h>
-#include <QDebug>
 
 namespace Ubuntu {
 
@@ -83,7 +82,8 @@
 {
 }
 
-void SingleDownload::bindDownload(Download* download)
+void
+SingleDownload::bindDownload(Download* download)
 {
     m_download = download;
 
@@ -91,53 +91,88 @@
         static_cast<void(Download::*)(Error*)>(&Download::error),
         this, &SingleDownload::registerError))
             << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::finished, this,
-        &SingleDownload::finished)) << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::finished, this,
-        &SingleDownload::setCompleted)) << "Could not connect to signal";
-    CHECK(connect(m_download,
-         static_cast<void(Download::*)(qulonglong, qulonglong)>(
-             &Download::progress), this,
-         &SingleDownload::progressReceived))
-            << "Could not connect to signal";
-    CHECK(connect(m_download,
-         static_cast<void(Download::*)(qulonglong, qulonglong)>(
-             &Download::progress), this,
-         &SingleDownload::setProgress)) << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::canceled, this,
-         &SingleDownload::canceled)) << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::canceled, this,
-         &SingleDownload::setDownloadCanceled))
-            << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::paused, this,
-         &SingleDownload::paused)) << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::paused, this,
-         &SingleDownload::setDownloadPaused))
-            << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::resumed, this,
-         &SingleDownload::resumed)) << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::resumed, this,
-         &SingleDownload::setDownloadStarted))
-            << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::started, this,
-         &SingleDownload::started)) << "Could not connect to signal";
-    CHECK(connect(m_download, &Download::started, this,
-         &SingleDownload::setDownloadStarted))
+
+    CHECK(connect(m_download, &Download::finished, this,
+        &SingleDownload::onFinished)) << "Could not connect to signal";
+
+    CHECK(connect(m_download,
+         static_cast<void(Download::*)(qulonglong, qulonglong)>(
+             &Download::progress), this,
+         &SingleDownload::onProgress)) << "Could not connect to signal";
+
+    CHECK(connect(m_download, &Download::canceled, this,
+         &SingleDownload::onCanceled))
+            << "Could not connect to signal";
+
+    CHECK(connect(m_download, &Download::paused, this,
+         &SingleDownload::onPaused))
+            << "Could not connect to signal";
+
+    CHECK(connect(m_download, &Download::resumed, this,
+         &SingleDownload::onResumed))
+            << "Could not connect to signal";
+
+    CHECK(connect(m_download, &Download::started, this,
+         &SingleDownload::onStarted))
             << "Could not connect to signal";
 
     emit downloadIdChanged();
 
+    // is the current in memory setting dirty, if they are, we do set the before we
+    // start
+    if (m_dirty) {
+        setAllowMobileDownload(m_mobile);
+        setThrottle(m_throttle);
+        setHeaders(m_headers);
+
+        // is not really needed but we do it to be consistent
+        m_dirty = false;
+    }
+
     if (m_manager != nullptr && m_autoStart) {
         startDownload();
     }
 }
 
+void
+SingleDownload::unbindDownload(Download* download) {
+    CHECK(disconnect(download,
+        static_cast<void(Download::*)(Error*)>(&Download::error),
+        this, &SingleDownload::registerError))
+            << "Could not connect to signal";
+
+    CHECK(disconnect(download, &Download::finished, this,
+        &SingleDownload::onFinished)) << "Could not connect to signal";
+
+    CHECK(disconnect(download,
+         static_cast<void(Download::*)(qulonglong, qulonglong)>(
+             &Download::progress), this,
+         &SingleDownload::onProgress)) << "Could not connect to signal";
+
+    CHECK(disconnect(download, &Download::canceled, this,
+         &SingleDownload::onCanceled))
+            << "Could not connect to signal";
+
+    CHECK(disconnect(download, &Download::paused, this,
+         &SingleDownload::onPaused))
+            << "Could not connect to signal";
+
+    CHECK(disconnect(download, &Download::resumed, this,
+         &SingleDownload::onResumed))
+            << "Could not connect to signal";
+
+    CHECK(disconnect(download, &Download::started, this,
+         &SingleDownload::onStarted))
+            << "Could not connect to signal";
+}
+
 /*!
     \qmlmethod void SingleDownload::download(string url)
 
     Creates the download for the given url and reports the different states through the properties.
 */
-void SingleDownload::download(QString url)
+void
+SingleDownload::download(QString url)
 {
     if (!m_downloadInProgress) {
         if (m_manager == nullptr) {
@@ -160,71 +195,240 @@
 
     Starts the download, used when autoStart is False.
 */
-void SingleDownload::start()
+void
+SingleDownload::start()
 {
     startDownload();
 }
 
-void SingleDownload::startDownload()
+void
+SingleDownload::startDownload()
 {
     if (m_download != nullptr) {
         m_download->start();
     }
 }
 
-void SingleDownload::pause()
+/*!
+    \qmlmethod void SingleDownload::pause()
+
+    Pauses the download. An error is returned if the download was
+    already paused.
+*/
+void
+SingleDownload::pause()
 {
     m_download->pause();
 }
 
-void SingleDownload::resume()
+/*!
+    \qmlmethod void SingleDownload::resume()
+
+    Resumes and already paused download. An error is returned if the download was
+    already resumed or not paused.
+*/
+void
+SingleDownload::resume()
 {
     m_download->resume();
 }
 
-void SingleDownload::cancel()
+/*!
+    \qmlmethod void SingleDownload::cancel()
+
+    Cancels a download.
+*/
+void
+SingleDownload::cancel()
 {
     m_download->cancel();
 }
 
-void SingleDownload::setCompleted()
-{
-    m_completed = true;
-    m_downloading = false;
-    m_downloadInProgress = false;
-}
-
-void SingleDownload::registerError(Error* error)
+void
+SingleDownload::registerError(Error* error)
 {
     m_error.setMessage(error->errorString());
     emit errorFound(m_error);
     emit errorChanged();
 }
 
-void SingleDownload::setProgress(qulonglong received, qulonglong total)
+void
+SingleDownload::onFinished(const QString& path)
+{
+    m_completed = true;
+    m_downloading = false;
+    m_downloadInProgress = false;
+
+    // unbind the download so that we have no memory leaks due to the connections
+    unbindDownload(m_download);
+    m_download->deleteLater();
+    m_download = nullptr;
+    emit finished(path);
+}
+
+void
+SingleDownload::onProgress(qulonglong received, qulonglong total)
 {
     if (total > 0) {
         qulonglong result = (received * 100);
         m_progress = static_cast<int>(result / total);
         emit progressChanged();
     }
+    emit progressReceived(received, total);
 }
 
-void SingleDownload::setDownloadPaused(bool)
+void
+SingleDownload::onPaused(bool wasPaused)
 {
     m_downloading = false;
-}
-
-void SingleDownload::setDownloadStarted(bool)
+    emit paused(wasPaused);
+}
+
+void
+SingleDownload::onResumed(bool wasResumed) {
+    m_downloading = true;
+    emit resumed(wasResumed);
+}
+
+void
+SingleDownload::onStarted(bool wasStarted)
 {
     m_downloading = true;
+    emit resumed(wasStarted);
 }
 
-void SingleDownload::setDownloadCanceled(bool)
+void
+SingleDownload::onCanceled(bool wasCanceled)
 {
     m_completed = false;
     m_downloading = false;
     m_downloadInProgress = false;
+
+    // unbind the download so that we have no memory leaks due to the connections
+    unbindDownload(m_download);
+    m_download->deleteLater();
+    m_download = nullptr;
+    emit canceled(wasCanceled);
+}
+
+bool
+SingleDownload::allowMobileDownload() const {
+    if (m_download == nullptr) {
+            return m_mobile;
+    } else {
+        return m_download->isMobileDownloadAllowed();
+    }
+}
+
+void
+SingleDownload::setAllowMobileDownload(bool value) {
+    if (m_download == nullptr) {
+        m_dirty = true;
+        m_mobile = value;
+    } else {
+        m_download->allowMobileDownload(value);
+        if (m_download->isError()) {
+            // set the error details and emit the signals
+            auto err = m_download->error();
+            m_error.setType(getErrorType(err->type()));
+            m_error.setMessage(err->errorString());
+            emit errorFound(m_error);
+            emit errorChanged();
+        } else {
+            emit allowMobileDownloadChanged();
+        }
+    }
+}
+
+qulonglong
+SingleDownload::throttle() const {
+    if (m_download == nullptr) {
+        return m_throttle;
+    } else {
+        return m_download->throttle();
+    }
+}
+
+void 
+SingleDownload::setThrottle(qulonglong value) {
+    if (m_download == nullptr) {
+        m_dirty = true;
+        m_throttle = value;
+    } else {
+        m_download->setThrottle(value);
+        if (m_download->isError()) {
+            // set the error details and emit the signals
+            auto err = m_download->error();
+            m_error.setType(getErrorType(err->type()));
+            m_error.setMessage(err->errorString());
+            emit errorFound(m_error);
+            emit errorChanged();
+        } else {
+            emit throttleChanged();
+        }
+    }
+}
+
+QString
+SingleDownload::downloadId() const {
+    if (m_download == nullptr) {
+        return "";
+    } else {
+        return m_download->id();
+    }
+}
+
+QVariantMap
+SingleDownload::headers() const {
+    if (m_download == nullptr) {
+        return m_headers;
+    } else {
+        // convert the QMap<QString, QString> into a QMap<QString, QVariant>
+        auto headers = m_download->headers();
+        QVariantMap result;
+        foreach(const QString& key, headers.keys()) {
+            result[key] = headers[key]; // automatic conversion
+        }
+        return result;
+    }
+}
+
+void
+SingleDownload::setHeaders(QVariantMap headers) {
+    if (m_download == nullptr) {
+        m_dirty = true;
+        m_headers = headers;
+    } else {
+        QMap<QString, QString> stringMap;
+        // convert the QVariantMap in a QMap<QString, QString> and make sure
+        // that the variants can be converted to strings.
+        foreach(const QString& key, headers.keys()) {
+            auto data = headers[key];
+            if (data.canConvert<QString>()) {
+                stringMap[key] = data.toString();
+            } else {
+                m_error.setType("Headers Conversion Error");
+                auto msg = QString(
+                    "Could not convert data in header '%1' to string.").arg(key);
+                m_error.setMessage(msg);
+                emit errorFound(m_error);
+                emit errorChanged();
+                return;
+            }
+        }
+    
+        m_download->setHeaders(stringMap);
+        if (m_download->isError()) {
+            // set the error details and emit the signals
+            auto err = m_download->error();
+            m_error.setType(getErrorType(err->type()));
+            m_error.setMessage(err->errorString());
+            emit errorFound(m_error);
+            emit errorChanged();
+        } else {
+            emit headersChanged();
+        }
+    }
 }
 
 /*!
@@ -287,5 +491,13 @@
     within the download manager.
 */
 
+/*!
+    \qmlproperty QVariantMap SingleDownload::headers
+
+    This property allows to get and set the headers that will be used to perform
+    the download request. All headers must be strings or at least QVariant should
+    be able to convert them to strings.
+*/
+
 }
 }

=== modified file 'src/downloads/qml/single_download.h'
--- src/downloads/qml/single_download.h	2014-04-30 10:34:46 +0000
+++ src/downloads/qml/single_download.h	2014-07-03 14:40:18 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
 #ifndef FILE_DOWNLOAD_H
 #define FILE_DOWNLOAD_H
 
@@ -23,6 +41,7 @@
     Q_PROPERTY(int progress READ progress NOTIFY progressChanged)
     Q_PROPERTY(bool downloading READ downloading NOTIFY downloadingChanged)
     Q_PROPERTY(QString downloadId READ downloadId NOTIFY downloadIdChanged)
+    Q_PROPERTY(QVariantMap headers READ headers WRITE setHeaders NOTIFY headersChanged)
 
 public:
     explicit SingleDownload(QObject *parent = 0);
@@ -36,21 +55,50 @@
     void startDownload();
 
     // getters
-    bool isCompleted() const { return m_completed; }
-    DownloadError& error() { return m_error; }
-    QString errorMessage() const { return m_error.message(); }
-    qulonglong throttle() const { return m_download->throttle(); }
-    bool allowMobileDownload() const { return m_download->isMobileDownloadAllowed(); }
-    int progress() const { return m_progress; }
-    bool downloading() const { return m_downloading; }
-    bool downloadInProgress() const { return m_downloadInProgress; }
-    bool autoStart() const { return m_autoStart; }
-    QString downloadId() const { return m_download->id(); }
+    bool isCompleted() const {
+        return m_completed;
+    }
+
+    DownloadError& error() {
+        return m_error;
+    }
+
+    QString errorMessage() const {
+        return m_error.message();
+    }
+
+    qulonglong throttle() const;
+
+    bool allowMobileDownload() const;
+
+    int progress() const {
+        return m_progress;
+    }
+
+    bool downloading() const {
+        return m_downloading;
+    }
+
+    bool downloadInProgress() const {
+        return m_downloadInProgress;
+    }
+
+    bool autoStart() const {
+        return m_autoStart;
+    }
+
+    QString downloadId() const;
+    QVariantMap headers() const;
 
     // setters
-    void setAllowMobileDownload(bool value) { m_download->allowMobileDownload(value); emit allowMobileDownloadChanged(); }
-    void setThrottle(qulonglong value) { m_download->setThrottle(value); emit throttleChanged(); }
-    void setAutoStart(bool value) { m_autoStart = value; }
+    void setAllowMobileDownload(bool value);
+    void setThrottle(qulonglong value);
+    void setHeaders(QVariantMap headers);
+
+    // only property that does not access the download obj
+    void setAutoStart(bool value) {
+        m_autoStart = value;
+    }
 
 signals:
     void isCompletedChanged();
@@ -60,6 +108,7 @@
     void downloadingChanged();
     void downloadInProgressChanged();
     void downloadIdChanged();
+    void headersChanged();
 
     void canceled(bool success);
     void finished(const QString& path);
@@ -73,22 +122,46 @@
 
 public slots:
     void registerError(Error* error);
-    void setCompleted();
     void bindDownload(Download* download);
-    void setProgress(qulonglong received, qulonglong total);
-    void setDownloadPaused(bool);
-    void setDownloadStarted(bool);
-    void setDownloadCanceled(bool);
+    void unbindDownload(Download* download);
+    void onFinished(const QString& path);
+    void onProgress(qulonglong received, qulonglong total);
+    void onPaused(bool wasPaused);
+    void onResumed(bool wasResumed);
+    void onStarted(bool wasStarted);
+    void onCanceled(bool wasCanceled);
+
+private:
+    QString getErrorType(Error::Type type) {
+        switch (type) {
+            case Error::Auth:
+                return QString("Auth");
+            case Error::DBus:
+                return QString("DBus");
+            case Error::Http:
+                return QString("Http");
+            case Error::Network:
+                return QString("Network");
+            case Error::Process:
+                return QString("Process");
+            default:
+                return QString();
+        }
+    }
 
 private:
     bool m_autoStart;
     bool m_completed;
     bool m_downloading;
+    bool m_dirty = false;
     bool m_downloadInProgress;
     int m_progress;
+    bool m_mobile = false;
+    qulonglong m_throttle = 0;
+    QVariantMap m_headers;
     DownloadError m_error;
-    Download* m_download;
-    Manager* m_manager;
+    Download* m_download = nullptr;
+    Manager* m_manager = nullptr;
 
 };
 

=== modified file 'src/downloads/qml/ubuntu_download_manager.h'
--- src/downloads/qml/ubuntu_download_manager.h	2014-03-28 16:11:54 +0000
+++ src/downloads/qml/ubuntu_download_manager.h	2014-07-03 14:40:18 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
 #ifndef UBUNTUDOWNLOADMANAGER_PLUGIN_H
 #define UBUNTUDOWNLOADMANAGER_PLUGIN_H
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-07-03 14:40:17 +0000
+++ tests/CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -1,178 +1,24 @@
-set(DAEMON_TESTS
-	test_apn_request_factory
-	test_apparmor
-        test_base_download
-	test_cancel_download_transition
-        test_daemon
-	test_download
-        test_download_factory
-	test_download_manager
-	test_downloads_db
-	test_file_download_sm
-	test_filename_mutex
-	test_final_state
-        test_group_download
-        test_metadata
-	test_mms_download
-	test_network_error_transition
-	test_resume_download_transition
-	test_ssl_error_transition
-	test_start_download_transition
-	test_stop_request_transition
-        test_transfers_queue
-)
-
-foreach(test ${DAEMON_TESTS})
-        # set the sources per test
-        set(${test}_DAEMON_SOURCES
-                base_testcase.cpp
-                ${test}.cpp
-        )
-
-        set(${test}_DAEMON_HEADERS
-                application.h
-                apparmor.h
-                base_testcase.h
-                cryptographic_hash.h
-		database.h
-                dbus_connection.h
-		dbus_proxy.h
-		dbus_proxy_factory.h
-		download.h
-                factory.h
-                file_manager.h
-                filename_mutex.h
-		manager.h
-                matchers.h
-		network_reply.h
-		pending_reply.h
-                process.h
-                process_factory.h
-                queue.h
-                request_factory.h
-                sm_file_download.h
-                system_network_info.h
-                timer.h
-                transfer.h
-                uuid_factory.h
-                ${test}.h
-        )
-
-endforeach(test)
-
-set(CLIENT_TESTS
-        test_client_download
-        test_download_manager_watch
-        test_download_watch
-        test_client_manager
-)
-
-foreach(test ${CLIENT_TESTS})
-        # set the sources per test
-        set(${test}_CLIENT_SOURCES
-                base_testcase.cpp
-                daemon_testcase.cpp
-                local_tree_testcase.cpp
-                testing_interface.cpp
-                ${test}.cpp
-        )
-
-        set(${test}_CLIENT_HEADERS
-                base_testcase.h
-                daemon_testcase.h
-                local_tree_testcase.h
-                testing_interface.h
-                ${test}.h
-        )
-
-endforeach(test)
-
-include_directories(${Qt5Core_INCLUDE_DIRS})
-include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
-include_directories(${Qt5DBus_INCLUDE_DIRS})
-include_directories(${Qt5Network_INCLUDE_DIRS})
-include_directories(${Qt5Test_INCLUDE_DIRS})
-include_directories(${Qt5Sql_INCLUDE_DIRS})
-include_directories(${DBUS_INCLUDE_DIRS})
-include_directories(${GTEST_INCLUDE_DIRS})
-include_directories(${GMOCK_INCLUDE_DIRS})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
-include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
-include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
-include_directories(${CMAKE_SOURCE_DIR}/src/downloads/client)
-include_directories(${CMAKE_SOURCE_DIR}/src/downloads/priv)
-
-link_directories(${NIH_DBUS_LIBDIR})
-link_directories(${GLOG_DBUS_LIBDIR})
+# Copyright © 2014 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
 
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-add_custom_target(download-daemon-tests-data ALL
-        COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data
+add_custom_target(tests-data ALL
+        COMMAND cp -r ${CMAKE_SOURCE_DIR}/tests/data ${CMAKE_CURRENT_BINARY_DIR}/data
 )
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
-set(DAEMON_TESTS_LIBS
-	${NIH_DBUS_LIBRARIES}
-	${GLOG_LIBRARIES}
-        ${Qt5Core_LIBRARIES}
-        ${Qt5Sql_LIBRARIES}
-        ${Qt5DBus_LIBRARIES}
-	${Qt5Test_LIBRARIES}
-        ${GMOCK_LIBRARY}
-        ${GTEST_BOTH_LIBRARIES}
-	udm-common
-	udm-priv-common
-	ubuntu-download-manager-common
-	ubuntu-download-manager-priv
-)
-
-
-foreach(test ${DAEMON_TESTS})
-        # set targets, linked libs and test
-        add_executable(${test}_daemon
-                ${${test}_DAEMON_SOURCES}
-                ${${test}_DAEMON_HEADERS}
-        )
-
-        target_link_libraries(${test}_daemon
-                ${DAEMON_TESTS_LIBS}
-        )
-
-
-        ADD_TEST(NAME daemon_${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test}_daemon)
-endforeach(test)
-
-find_program(DBUS_RUNNER dbus-test-runner)
-
-set(CLIENT_TESTS_LIBS
-	${NIH_DBUS_LIBRARIES}
-	${GLOG_LIBRARIES}
-        ${Qt5Network_LIBRARIES}
-	${Qt5Test_LIBRARIES}
-	udm-common
-	udm-priv-common
-	ubuntu-download-manager-common
-	ubuntu-download-manager-client
-	ubuntu-download-manager-priv
-)
-
-if(DBUS_RUNNER)
-        foreach(test ${CLIENT_TESTS})
-                # set targets, linked libs and test
-                add_executable(${test}_client
-                        ${${test}_CLIENT_SOURCES}
-                        ${${test}_CLIENT_HEADERS}
-                )
-
-                target_link_libraries(${test}_client
-                        ${CLIENT_TESTS_LIBS}
-                )
-
-                ADD_TEST(NAME client_${test} COMMAND dbus-test-runner -m 180 --task=${CMAKE_CURRENT_BINARY_DIR}/${test}_client -c)
-
-        endforeach(test)
-else(DBUS_RUNNER)
-        message(WARNING "dbus-test-runner binary not found tests will be disabled")
-endif(DBUS_RUNNER)
+add_subdirectory(common)
+add_subdirectory(downloads)

=== added directory 'tests/common'
=== added file 'tests/common/CMakeLists.txt'
--- tests/common/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/common/CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -0,0 +1,55 @@
+set(TARGET ubuntu-download-manager-test-lib)
+
+set(SOURCES
+        base_testcase.cpp
+        daemon_testcase.cpp
+        local_tree_testcase.cpp
+        testing_interface.cpp
+)
+
+set(HEADERS
+        base_testcase.h
+        daemon_testcase.h
+        local_tree_testcase.h
+        matchers.h
+        testing_interface.h
+)
+
+include_directories(${Qt5Core_INCLUDE_DIRS})
+include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+include_directories(${Qt5Test_INCLUDE_DIRS})
+include_directories(${Qt5Sql_INCLUDE_DIRS})
+include_directories(${DBUS_INCLUDE_DIRS})
+include_directories(${GTEST_INCLUDE_DIRS})
+include_directories(${GMOCK_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/client)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/priv)
+
+link_directories(${NIH_DBUS_LIBDIR})
+link_directories(${GLOG_DBUS_LIBDIR})
+
+add_library(${TARGET} STATIC
+	${HEADERS}
+	${SOURCES}
+)
+
+target_link_libraries(${TARGET}
+	${NIH_DBUS_LIBRARIES}
+	${GLOG_LIBRARIES}
+        ${Qt5Core_LIBRARIES}
+        ${Qt5Sql_LIBRARIES}
+        ${Qt5DBus_LIBRARIES}
+	${Qt5Test_LIBRARIES}
+        ${GMOCK_LIBRARY}
+        ${GTEST_BOTH_LIBRARIES}
+	udm-common
+	ubuntu-download-manager-common
+	ubuntu-download-manager-client
+)

=== renamed file 'tests/base_testcase.cpp' => 'tests/common/base_testcase.cpp'
--- tests/base_testcase.cpp	2014-03-12 12:59:51 +0000
+++ tests/common/base_testcase.cpp	2014-07-03 14:40:18 +0000
@@ -59,7 +59,7 @@
     QDir dir(".");
     dir.makeAbsolute();
 
-    return dir.path() + "/data";
+    return dir.path() + "/tests/data";
 }
 
 bool

=== renamed file 'tests/base_testcase.h' => 'tests/common/base_testcase.h'
=== renamed file 'tests/daemon_testcase.cpp' => 'tests/common/daemon_testcase.cpp'
=== renamed file 'tests/daemon_testcase.h' => 'tests/common/daemon_testcase.h'
=== renamed file 'tests/local_tree_testcase.cpp' => 'tests/common/local_tree_testcase.cpp'
--- tests/local_tree_testcase.cpp	2014-03-27 12:54:03 +0000
+++ tests/common/local_tree_testcase.cpp	2014-07-03 14:40:18 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "local_tree_testcase.h"
-#define TEST_DAEMON "../src/downloads/test-daemon/ubuntu-download-manager-test-daemon"
+#define TEST_DAEMON "../../../src/downloads/test-daemon/ubuntu-download-manager-test-daemon"
 #define LARGE_FILE "otasigned.zip"
 #define SMALL_FILE "index.json"
 
@@ -48,4 +48,6 @@
 
     QString smallFile = dataDirectory() + "/" + QString(SMALL_FILE);
     addFileToHttpServer(smallFile);
+    Ubuntu::DownloadManager::Logging::Logger::init(
+        Ubuntu::DownloadManager::Logging::Logger::Debug, testDirectory() + "/client.log");
 }

=== renamed file 'tests/local_tree_testcase.h' => 'tests/common/local_tree_testcase.h'
--- tests/local_tree_testcase.h	2014-03-12 12:59:51 +0000
+++ tests/common/local_tree_testcase.h	2014-07-03 14:40:18 +0000
@@ -21,6 +21,8 @@
 
 #include <QObject>
 #include <QUrl>
+
+#include <ubuntu/download_manager/logging/logger.h>
 #include "daemon_testcase.h"
 
 class LocalTreeTestCase : public DaemonTestCase {

=== renamed file 'tests/matchers.h' => 'tests/common/matchers.h'
=== renamed file 'tests/testing_interface.cpp' => 'tests/common/testing_interface.cpp'
=== renamed file 'tests/testing_interface.h' => 'tests/common/testing_interface.h'
=== added directory 'tests/downloads'
=== added file 'tests/downloads/CMakeLists.txt'
--- tests/downloads/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/downloads/CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -0,0 +1,19 @@
+# Copyright © 2014 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+add_subdirectory(client)
+add_subdirectory(daemon)
+#add_subdirectory(qml)

=== added directory 'tests/downloads/client'
=== added file 'tests/downloads/client/CMakeLists.txt'
--- tests/downloads/client/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/downloads/client/CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -0,0 +1,90 @@
+# Copyright © 2014 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+
+set(CLIENT_TESTS
+        test_client_download
+        test_download_manager_watch
+        test_download_watch
+        test_client_manager
+)
+
+foreach(test ${CLIENT_TESTS})
+        # set the sources per test
+        set(${test}_CLIENT_SOURCES
+                ${test}.cpp
+        )
+
+        set(${test}_CLIENT_HEADERS
+                ${test}.h
+        )
+
+endforeach(test)
+
+include_directories(${Qt5Core_INCLUDE_DIRS})
+include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+include_directories(${Qt5Test_INCLUDE_DIRS})
+include_directories(${Qt5Sql_INCLUDE_DIRS})
+include_directories(${DBUS_INCLUDE_DIRS})
+include_directories(${GTEST_INCLUDE_DIRS})
+include_directories(${GMOCK_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/client)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/priv)
+include_directories(${CMAKE_SOURCE_DIR}/tests/common)
+
+link_directories(${NIH_DBUS_LIBDIR})
+link_directories(${GLOG_DBUS_LIBDIR})
+
+find_program(DBUS_RUNNER dbus-test-runner)
+
+set(CLIENT_TESTS_LIBS
+	${NIH_DBUS_LIBRARIES}
+	${GLOG_LIBRARIES}
+        ${Qt5Network_LIBRARIES}
+	${Qt5Test_LIBRARIES}
+	udm-common
+	udm-priv-common
+	ubuntu-download-manager-common
+	ubuntu-download-manager-client
+	ubuntu-download-manager-priv
+        ubuntu-download-manager-test-lib
+)
+
+if(DBUS_RUNNER)
+        foreach(test ${CLIENT_TESTS})
+                # set targets, linked libs and test
+                add_executable(${test}_client
+                        ${${test}_CLIENT_SOURCES}
+                        ${${test}_CLIENT_HEADERS}
+                )
+
+                target_link_libraries(${test}_client
+                        ${CLIENT_TESTS_LIBS}
+                )
+
+                ADD_TEST(NAME client_${test} COMMAND dbus-test-runner -m 180 --task=${CMAKE_CURRENT_BINARY_DIR}/${test}_client -c)
+
+        endforeach(test)
+else(DBUS_RUNNER)
+        message(WARNING "dbus-test-runner binary not found tests will be disabled")
+endif(DBUS_RUNNER)

=== renamed file 'tests/test_client_download.cpp' => 'tests/downloads/client/test_client_download.cpp'
=== renamed file 'tests/test_client_download.h' => 'tests/downloads/client/test_client_download.h'
=== renamed file 'tests/test_client_manager.cpp' => 'tests/downloads/client/test_client_manager.cpp'
=== renamed file 'tests/test_client_manager.h' => 'tests/downloads/client/test_client_manager.h'
=== renamed file 'tests/test_download_manager_watch.cpp' => 'tests/downloads/client/test_download_manager_watch.cpp'
=== renamed file 'tests/test_download_manager_watch.h' => 'tests/downloads/client/test_download_manager_watch.h'
=== renamed file 'tests/test_download_watch.cpp' => 'tests/downloads/client/test_download_watch.cpp'
=== renamed file 'tests/test_download_watch.h' => 'tests/downloads/client/test_download_watch.h'
=== renamed file 'tests/test_group_manager_watch.cpp' => 'tests/downloads/client/test_group_manager_watch.cpp'
=== renamed file 'tests/test_group_manager_watch.h' => 'tests/downloads/client/test_group_manager_watch.h'
=== added directory 'tests/downloads/daemon'
=== added file 'tests/downloads/daemon/CMakeLists.txt'
--- tests/downloads/daemon/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/downloads/daemon/CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -0,0 +1,129 @@
+# Copyright © 2014 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+set(DAEMON_TESTS
+	test_apn_request_factory
+	test_apparmor
+        test_base_download
+	test_cancel_download_transition
+        test_daemon
+	test_download
+        test_download_factory
+	test_download_manager
+	test_downloads_db
+	test_file_download_sm
+	test_filename_mutex
+	test_final_state
+        test_group_download
+        test_metadata
+	test_mms_download
+	test_network_error_transition
+	test_resume_download_transition
+	test_ssl_error_transition
+	test_start_download_transition
+	test_stop_request_transition
+        test_transfers_queue
+)
+
+foreach(test ${DAEMON_TESTS})
+        # set the sources per test
+        set(${test}_DAEMON_SOURCES
+                ${test}.cpp
+        )
+
+        set(${test}_DAEMON_HEADERS
+                application.h
+                apparmor.h
+                cryptographic_hash.h
+		database.h
+                dbus_connection.h
+		dbus_proxy.h
+		dbus_proxy_factory.h
+		download.h
+                factory.h
+                file_manager.h
+                filename_mutex.h
+		manager.h
+		network_reply.h
+		pending_reply.h
+                process.h
+                process_factory.h
+                queue.h
+                request_factory.h
+                sm_file_download.h
+                system_network_info.h
+                timer.h
+                transfer.h
+                uuid_factory.h
+                ${test}.h
+        )
+
+endforeach(test)
+
+
+include_directories(${Qt5Core_INCLUDE_DIRS})
+include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+include_directories(${Qt5Test_INCLUDE_DIRS})
+include_directories(${Qt5Sql_INCLUDE_DIRS})
+include_directories(${DBUS_INCLUDE_DIRS})
+include_directories(${GTEST_INCLUDE_DIRS})
+include_directories(${GMOCK_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/client)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/priv)
+include_directories(${CMAKE_SOURCE_DIR}/tests/common)
+
+link_directories(${NIH_DBUS_LIBDIR})
+link_directories(${GLOG_DBUS_LIBDIR})
+
+set(DAEMON_TESTS_LIBS
+	${NIH_DBUS_LIBRARIES}
+	${GLOG_LIBRARIES}
+        ${Qt5Core_LIBRARIES}
+        ${Qt5Sql_LIBRARIES}
+        ${Qt5DBus_LIBRARIES}
+	${Qt5Test_LIBRARIES}
+        ${GMOCK_LIBRARY}
+        ${GTEST_BOTH_LIBRARIES}
+	udm-common
+	udm-priv-common
+	ubuntu-download-manager-common
+	ubuntu-download-manager-priv
+        ubuntu-download-manager-test-lib
+)
+
+
+foreach(test ${DAEMON_TESTS})
+        # set targets, linked libs and test
+        add_executable(${test}_daemon
+                ${${test}_DAEMON_SOURCES}
+                ${${test}_DAEMON_HEADERS}
+        )
+
+        target_link_libraries(${test}_daemon
+                ${DAEMON_TESTS_LIBS}
+        )
+
+
+        ADD_TEST(NAME daemon_${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test}_daemon)
+endforeach(test)
+

=== renamed file 'tests/apparmor.h' => 'tests/downloads/daemon/apparmor.h'
=== renamed file 'tests/application.h' => 'tests/downloads/daemon/application.h'
=== renamed file 'tests/cryptographic_hash.h' => 'tests/downloads/daemon/cryptographic_hash.h'
=== renamed file 'tests/database.h' => 'tests/downloads/daemon/database.h'
=== renamed file 'tests/dbus_connection.h' => 'tests/downloads/daemon/dbus_connection.h'
=== renamed file 'tests/dbus_proxy.h' => 'tests/downloads/daemon/dbus_proxy.h'
=== renamed file 'tests/dbus_proxy_factory.h' => 'tests/downloads/daemon/dbus_proxy_factory.h'
=== renamed file 'tests/download.h' => 'tests/downloads/daemon/download.h'
=== renamed file 'tests/factory.h' => 'tests/downloads/daemon/factory.h'
=== renamed file 'tests/file_manager.h' => 'tests/downloads/daemon/file_manager.h'
=== renamed file 'tests/filename_mutex.h' => 'tests/downloads/daemon/filename_mutex.h'
=== renamed file 'tests/group_download.h' => 'tests/downloads/daemon/group_download.h'
=== renamed file 'tests/manager.h' => 'tests/downloads/daemon/manager.h'
=== renamed file 'tests/network_reply.h' => 'tests/downloads/daemon/network_reply.h'
=== renamed file 'tests/pending_reply.h' => 'tests/downloads/daemon/pending_reply.h'
=== renamed file 'tests/process.h' => 'tests/downloads/daemon/process.h'
=== renamed file 'tests/process_factory.h' => 'tests/downloads/daemon/process_factory.h'
=== renamed file 'tests/queue.h' => 'tests/downloads/daemon/queue.h'
=== renamed file 'tests/request_factory.h' => 'tests/downloads/daemon/request_factory.h'
=== renamed file 'tests/sm_file_download.h' => 'tests/downloads/daemon/sm_file_download.h'
=== renamed file 'tests/system_network_info.h' => 'tests/downloads/daemon/system_network_info.h'
=== renamed file 'tests/test_apn_request_factory.cpp' => 'tests/downloads/daemon/test_apn_request_factory.cpp'
=== renamed file 'tests/test_apn_request_factory.h' => 'tests/downloads/daemon/test_apn_request_factory.h'
=== renamed file 'tests/test_apparmor.cpp' => 'tests/downloads/daemon/test_apparmor.cpp'
=== renamed file 'tests/test_apparmor.h' => 'tests/downloads/daemon/test_apparmor.h'
=== renamed file 'tests/test_base_download.cpp' => 'tests/downloads/daemon/test_base_download.cpp'
=== renamed file 'tests/test_base_download.h' => 'tests/downloads/daemon/test_base_download.h'
=== renamed file 'tests/test_cancel_download_transition.cpp' => 'tests/downloads/daemon/test_cancel_download_transition.cpp'
=== renamed file 'tests/test_cancel_download_transition.h' => 'tests/downloads/daemon/test_cancel_download_transition.h'
=== renamed file 'tests/test_daemon.cpp' => 'tests/downloads/daemon/test_daemon.cpp'
=== renamed file 'tests/test_daemon.h' => 'tests/downloads/daemon/test_daemon.h'
=== renamed file 'tests/test_download.cpp' => 'tests/downloads/daemon/test_download.cpp'
=== renamed file 'tests/test_download.h' => 'tests/downloads/daemon/test_download.h'
=== renamed file 'tests/test_download_factory.cpp' => 'tests/downloads/daemon/test_download_factory.cpp'
=== renamed file 'tests/test_download_factory.h' => 'tests/downloads/daemon/test_download_factory.h'
=== renamed file 'tests/test_download_manager.cpp' => 'tests/downloads/daemon/test_download_manager.cpp'
=== renamed file 'tests/test_download_manager.h' => 'tests/downloads/daemon/test_download_manager.h'
=== renamed file 'tests/test_downloads_db.cpp' => 'tests/downloads/daemon/test_downloads_db.cpp'
=== renamed file 'tests/test_downloads_db.h' => 'tests/downloads/daemon/test_downloads_db.h'
=== renamed file 'tests/test_file_download_sm.cpp' => 'tests/downloads/daemon/test_file_download_sm.cpp'
=== renamed file 'tests/test_file_download_sm.h' => 'tests/downloads/daemon/test_file_download_sm.h'
=== renamed file 'tests/test_filename_mutex.cpp' => 'tests/downloads/daemon/test_filename_mutex.cpp'
=== renamed file 'tests/test_filename_mutex.h' => 'tests/downloads/daemon/test_filename_mutex.h'
=== renamed file 'tests/test_final_state.cpp' => 'tests/downloads/daemon/test_final_state.cpp'
=== renamed file 'tests/test_final_state.h' => 'tests/downloads/daemon/test_final_state.h'
=== renamed file 'tests/test_group_download.cpp' => 'tests/downloads/daemon/test_group_download.cpp'
=== renamed file 'tests/test_group_download.h' => 'tests/downloads/daemon/test_group_download.h'
=== renamed file 'tests/test_metadata.cpp' => 'tests/downloads/daemon/test_metadata.cpp'
=== renamed file 'tests/test_metadata.h' => 'tests/downloads/daemon/test_metadata.h'
=== renamed file 'tests/test_mms_download.cpp' => 'tests/downloads/daemon/test_mms_download.cpp'
=== renamed file 'tests/test_mms_download.h' => 'tests/downloads/daemon/test_mms_download.h'
=== renamed file 'tests/test_network_error_transition.cpp' => 'tests/downloads/daemon/test_network_error_transition.cpp'
=== renamed file 'tests/test_network_error_transition.h' => 'tests/downloads/daemon/test_network_error_transition.h'
=== renamed file 'tests/test_resume_download_transition.cpp' => 'tests/downloads/daemon/test_resume_download_transition.cpp'
=== renamed file 'tests/test_resume_download_transition.h' => 'tests/downloads/daemon/test_resume_download_transition.h'
=== renamed file 'tests/test_ssl_error_transition.cpp' => 'tests/downloads/daemon/test_ssl_error_transition.cpp'
=== renamed file 'tests/test_ssl_error_transition.h' => 'tests/downloads/daemon/test_ssl_error_transition.h'
=== renamed file 'tests/test_start_download_transition.cpp' => 'tests/downloads/daemon/test_start_download_transition.cpp'
=== renamed file 'tests/test_start_download_transition.h' => 'tests/downloads/daemon/test_start_download_transition.h'
=== renamed file 'tests/test_stop_request_transition.cpp' => 'tests/downloads/daemon/test_stop_request_transition.cpp'
=== renamed file 'tests/test_stop_request_transition.h' => 'tests/downloads/daemon/test_stop_request_transition.h'
=== renamed file 'tests/test_transfers_queue.cpp' => 'tests/downloads/daemon/test_transfers_queue.cpp'
=== renamed file 'tests/test_transfers_queue.h' => 'tests/downloads/daemon/test_transfers_queue.h'
=== renamed file 'tests/timer.h' => 'tests/downloads/daemon/timer.h'
=== renamed file 'tests/transfer.h' => 'tests/downloads/daemon/transfer.h'
=== renamed file 'tests/uuid_factory.h' => 'tests/downloads/daemon/uuid_factory.h'
=== added directory 'tests/downloads/qml'
=== added file 'tests/downloads/qml/CMakeLists.txt'
--- tests/downloads/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/downloads/qml/CMakeLists.txt	2014-07-03 14:40:18 +0000
@@ -0,0 +1,14 @@
+set(QML_TESTS
+)
+
+foreach(test ${DAEMON_TESTS})
+        # set the sources per test
+        set(${test}_QML_SOURCES
+                ${test}.cpp
+        )
+
+        set(${test}_QML_HEADERS
+                ${test}.h
+        )
+
+endforeach(test)

=== added file 'tests/downloads/qml/download.h'
--- tests/downloads/qml/download.h	1970-01-01 00:00:00 +0000
+++ tests/downloads/qml/download.h	2014-07-03 14:40:18 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef FAKE_CLIENT_DOWNLOAD_H
+#define FAKE_CLIENT_DOWNLOAD_H
+
+#include <ubuntu/download_manager/download.h>
+#include <gmock/gmock.h>
+
+using namespace Ubuntu::DownloadManager;
+
+class MockDownload : public Download {
+
+ public:
+     explicit MockDownload(QObject* parent=0)
+         : Download(parent) {
+     }
+
+    MOCK_METHOD0(start, void());
+    MOCK_METHOD0(pause, void());
+    MOCK_METHOD0(resume, void());
+    MOCK_METHOD0(cancel, void());
+    MOCK_METHOD1(allowMobileDownload, void(bool));
+    MOCK_METHOD0(isMobileDownloadAllowed, bool());
+    MOCK_METHOD1(setDestinationDir, void(const QString&));
+    MOCK_METHOD1(setHeaders, void(QMap<QString, QString> headers));
+    MOCK_METHOD0(headers, QMap<QString, QString>());
+    MOCK_METHOD1(setThrottle, void(qulonglong));
+    MOCK_METHOD0(throttle, qulonglong());
+    MOCK_CONST_METHOD0(id, QString());
+    MOCK_METHOD0(metadata, QVariantMap());
+    MOCK_METHOD0(progress, qulonglong());
+    MOCK_METHOD0(totalSize, qulonglong());
+    MOCK_CONST_METHOD0(isError, bool());
+    MOCK_CONST_METHOD0(error, Error*());
+};
+
+#endif

=== added file 'tests/downloads/qml/manager.h'
--- tests/downloads/qml/manager.h	1970-01-01 00:00:00 +0000
+++ tests/downloads/qml/manager.h	2014-07-03 14:40:18 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef FAKE_MANAGER_DOWNLOAD_H
+#define FAKE_MANAGER_DOWNLOAD_H
+
+#include <ubuntu/download_manager/manager.h>
+#include <gmock/gmock.h>
+
+using namespace Ubuntu::DownloadManager;
+
+class MockManager : public Manager {
+ public:
+    explicit MockManager(QObject* parent=0)
+        : Manager(parent) {
+    }
+
+    MOCK_METHOD1(getDownloadForId, Download*(const QString&));
+    MOCK_METHOD1(createDownload, void(DownloadStruct));
+    MOCK_METHOD3(createDownload, void(DownloadStruct, DownloadCb, DownloadCb));
+    MOCK_METHOD4(createDownload, void(StructList downs, const QString&, bool,
+        const QVariantMap&, StringMap));
+    MOCK_METHOD7(createDownload, void(StructList, const QString&, bool,
+        const QVariantMap&, StringMap, GroupCb, GroupCb));
+    MOCK_METHOD0(getAllDownloads, void());
+    MOCK_METHOD2(getAllDownloads, void(DownloadsListCb, DownloadsListCb));
+    MOCK_METHOD2(getAllDownloadsWithMetadata, void(const QString&,
+        const QString&));
+    MOCK_METHOD2(getAllDownloadsWithMetadata, void(const QString&,
+        const QString&, MetadataDownloadsListCb, MetadataDownloadsListCb));
+    MOCK_CONST_METHOD0(isError, bool());
+    MOCK_CONST_METHOD0(lastError, Error*());
+    MOCK_METHOD1(allowMobileDataDownload, void(bool));
+    MOCK_METHOD0(isMobileDataDownload, bool());
+    MOCK_METHOD0(defaultThrottle, qulonglong());
+    MOCK_METHOD1(setDefaultThrottle, void(qulonglong));
+    MOCK_METHOD0(exit, void());
+};
+
+#endif

=== added file 'tests/downloads/qml/test_single_download.cpp'
--- tests/downloads/qml/test_single_download.cpp	1970-01-01 00:00:00 +0000
+++ tests/downloads/qml/test_single_download.cpp	2014-07-03 14:40:18 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+TestSingleDownload::TestSingleDownload(QObject *parent)
+    : LocalTreeTestCase("TestSingleDownload", parent) {
+}
+
+void
+TestSingleDownload::init() {
+    LocalTreeTestCase::init();
+}
+
+void
+TestSingleDownload::cleanup() {
+    LocalTreeTestCase::cleanup();
+}

=== added file 'tests/downloads/qml/test_single_download.h'
--- tests/downloads/qml/test_single_download.h	1970-01-01 00:00:00 +0000
+++ tests/downloads/qml/test_single_download.h	2014-07-03 14:40:18 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TEST_DOWNLOAD_H
+#define TEST_DOWNLOAD_H
+
+#include <QObject>
+#include <singled_download.h>
+#include <local_tree_testcase.h>
+
+using namespace Ubuntu::DownloadManager;
+
+class TestSingleDownload : public LocalTreeTestCase {
+    Q_OBJECT
+
+ public:
+    explicit TestSingleDownload(QObject *parent = 0);
+
+    void init() override;
+    void cleanup() override;
+};
+
+#endif