Merge lp:~mandel/ubuntu-download-manager/general-errors into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensure that the has errors are correctly fwd to the clients via dbus.

Ensure that the has errors are correctly fwd to the clients via dbus.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:339
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/759/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/19/console

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/general-errors]

340. By Manuel de la Peña on 2015-02-26

Update symbols.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/761/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/general-errors]

341. By Manuel de la Peña on 2015-02-26

Update install to include new header.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/763/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/23/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Comments inline.

review: Needs Information

[lp:~mandel/ubuntu-download-manager/general-errors]

342. By Manuel de la Peña on 2015-04-30

Update branch as per review.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:342
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/764/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/24/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/24/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/general-errors]

343. By Manuel de la Peña on 2015-07-21

Fix some issues with the state machine tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:343
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/765/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/general-errors]

344. By Manuel de la Peña on 2015-07-22

Ensure that the tests that need x can be ran in a headless server.

345. By Manuel de la Peña on 2015-07-22

Fix small control issue.

346. By Manuel de la Peña on 2015-07-22

Do no add xvfb as a dependency, we can build anyway.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/766/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM, there are just some formatting issues in a couple of places.

review: Needs Fixing

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Not block the landing for formatting

review: Approve

[lp:~mandel/ubuntu-download-manager/general-errors]

347. By Manuel de la Peña on 2015-07-23

Link tests failing bug.

348. By Manuel de la Peña on 2015-07-23

Undo stupid changelog comment.

349. By Manuel de la Peña on 2015-07-23

Bump version number.

350. By Manuel de la Peña on 2015-07-24

Bump deb package number to match the so number.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-17 23:07:13 +0000
+++ CMakeLists.txt	2015-07-24 16:42:57 +0000
@@ -30,8 +30,8 @@
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set(UDM_VERSION_MAJOR 0)
-set(UDM_VERSION_MINOR 9)
+set(UDM_VERSION_MAJOR 1)
+set(UDM_VERSION_MINOR 0)
 set(UDM_VERSION_PATCH 0)
 
 find_package(Gtest REQUIRED)

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-03 09:29:42 +0000
+++ debian/changelog	2015-07-24 16:42:57 +0000
@@ -1,3 +1,9 @@
+ubuntu-download-manager (1.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Bump version number due to the new ABI provided by the client lib. 
+
+ -- Manuel de la Pena <[e-mail]>  Fri, 24 Jul 2015 18:41:02 +0200
+
 ubuntu-download-manager (0.9+15.04.20150203-0ubuntu1) vivid; urgency=medium
 
   [ Manuel de la Pena ]

=== modified file 'debian/control'
--- debian/control	2014-11-26 12:21:53 +0000
+++ debian/control	2015-07-24 16:42:57 +0000
@@ -18,7 +18,7 @@
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
                qtdeclarative5-test-plugin,
-               network-manager
+               network-manager,
 Maintainer: Manuel de la Peña <[e-mail]>
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/ubuntu-system-image
@@ -27,7 +27,7 @@
 # upstream branch
 Vcs-Bzr: lp:ubuntu-download-manager
 
-Package: libudm-common0
+Package: libudm-common1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
@@ -42,7 +42,7 @@
 Package: libudm-common-dev
 Section: libdevel
 Architecture: any
-Depends: libudm-common0 (= ${binary:Version}),
+Depends: libudm-common1 (= ${binary:Version}),
          qtbase5-dev,
          ${shlibs:Depends},
          ${misc:Depends}
@@ -50,12 +50,12 @@
  This package contains the common headers shared between the client library and
  the daemon library.
 
-Package: libudm-priv-common0
+Package: libudm-priv-common1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libudm-common0 (= ${binary:Version}),
+         libudm-common1 (= ${binary:Version}),
 Breaks: libubuntu-download-manager-priv1
 Replaces: libubuntu-download-manager-priv1
 Description: Upload Download Manager - shared private library
@@ -63,10 +63,10 @@
  .
  This package includes the private shared library.
 
-Package: libubuntu-download-manager-common0
+Package: libubuntu-download-manager-common1
 Section: libs
 Architecture: any
-Depends: libudm-common0 (= ${binary:Version}),
+Depends: libudm-common1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: ubuntu-download-manager-common1
@@ -81,7 +81,7 @@
 Section: libdevel
 Architecture: any
 Depends: libudm-common-dev (= ${binary:Version}),
-         libubuntu-download-manager-common0 (= ${binary:Version}),
+         libubuntu-download-manager-common1 (= ${binary:Version}),
          qtbase5-dev,
          ${shlibs:Depends},
          ${misc:Depends}
@@ -91,13 +91,13 @@
  This package contains the common headers shared between the client library and
  the daemon library.
 
-Package: libubuntu-download-manager-client0
+Package: libubuntu-download-manager-client1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libudm-common0 (= ${binary:Version}),
-         libubuntu-download-manager-common0 (= ${binary:Version}),
+         libudm-common1 (= ${binary:Version}),
+         libubuntu-download-manager-common1 (= ${binary:Version}),
 Breaks: ubuntu-download-manager-client1
 Replaces: ubuntu-download-manager-client1
 Description: Ubuntu Download Manager - shared public library
@@ -110,7 +110,7 @@
 Architecture: any
 Depends: libudm-common-dev (= ${binary:Version}),
          libubuntu-download-manager-common-dev (= ${binary:Version}),
-         libubuntu-download-manager-client0 (= ${binary:Version}),
+         libubuntu-download-manager-client1 (= ${binary:Version}),
          qtbase5-dev,
          ${shlibs:Depends},
          ${misc:Depends}
@@ -128,10 +128,10 @@
 Description: Documentation files for libcontent-hub-dev 
  Documentation files for the libcontent-hub development
 
-Package: libubuntu-upload-manager-common0
+Package: libubuntu-upload-manager-common1
 Section: libs
 Architecture: any
-Depends: libudm-common0 (= ${binary:Version}),
+Depends: libudm-common1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Ubuntu Upload Manager - shared common library
@@ -144,7 +144,7 @@
 Section: libdevel
 Architecture: any
 Depends: libudm-common-dev (= ${binary:Version}),
-         libubuntu-download-manager-common0 (= ${binary:Version}),
+         libubuntu-download-manager-common1 (= ${binary:Version}),
          qtbase5-dev,
          ${shlibs:Depends},
          ${misc:Depends}
@@ -157,9 +157,9 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libudm-common0 (= ${binary:Version}),
-         libudm-priv-common0 (= ${binary:Version}),
-         libubuntu-download-manager-common0 (= ${binary:Version}),
+         libudm-common1 (= ${binary:Version}),
+         libudm-priv-common1 (= ${binary:Version}),
+         libubuntu-download-manager-common1 (= ${binary:Version}),
          unzip
 Suggests: apparmor
 Description: Ubuntu Download Manager - daemon
@@ -172,9 +172,9 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libudm-common0 (= ${binary:Version}),
-         libudm-priv-common0 (= ${binary:Version}),
-         libubuntu-upload-manager-common0 (= ${binary:Version}),
+         libudm-common1 (= ${binary:Version}),
+         libudm-priv-common1 (= ${binary:Version}),
+         libubuntu-upload-manager-common1 (= ${binary:Version}),
 Description: Ubuntu Upload Manager - daemon
  Ubuntu Upload Manager performs uploads from a centralized location.
  .
@@ -185,9 +185,9 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libudm-common0 (= ${binary:Version}),
-         libubuntu-download-manager-common0 (= ${binary:Version}),
-         libubuntu-download-manager-client0 (= ${binary:Version})
+         libudm-common1 (= ${binary:Version}),
+         libubuntu-download-manager-common1 (= ${binary:Version}),
+         libubuntu-download-manager-client1 (= ${binary:Version})
 Description: Ubuntu Download Manager Plugin
  This package contains a QML Plugin to handle downloads from a pure QML
  application, without the need to write any C++ code.

=== renamed file 'debian/libubuntu-download-manager-client0.install' => 'debian/libubuntu-download-manager-client1.install'
--- debian/libubuntu-download-manager-client0.install	2014-02-10 18:04:03 +0000
+++ debian/libubuntu-download-manager-client1.install	2015-07-24 16:42:57 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libubuntu-download-manager-client.so.0*
+usr/lib/*/libubuntu-download-manager-client.so.1*

=== renamed file 'debian/libubuntu-download-manager-client0.symbols' => 'debian/libubuntu-download-manager-client1.symbols'
--- debian/libubuntu-download-manager-client0.symbols	2014-10-14 16:08:07 +0000
+++ debian/libubuntu-download-manager-client1.symbols	2015-07-24 16:42:57 +0000
@@ -1,4 +1,4 @@
-libubuntu-download-manager-client.so.0 libubuntu-download-manager-client0 #MINVER#
+libubuntu-download-manager-client.so.1 libubuntu-download-manager-client1 #MINVER#
  (c++)"Ubuntu::DownloadManager::NetworkError::errorString()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::NetworkError::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::NetworkError::qt_metacast(char const*)@Base" 0.4+14.10.20140618
@@ -135,3 +135,19 @@
  (c++)"vtable for Ubuntu::DownloadManager::AuthError@Base" 0.4+14.10.20140618
  (c++)"vtable for Ubuntu::DownloadManager::DBusError@Base" 0.4+14.10.20140618
  (c++)"vtable for Ubuntu::DownloadManager::HttpError@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::HashError::errorString()@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::qt_metacall(QMetaObject::Call, int, void**)@Base" 0replaceme 
+ (c++)"Ubuntu::DownloadManager::HashError::qt_metacast(char const*)@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::staticMetaObject@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::method()@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::checksum()@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::expected()@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::HashError(Ubuntu::Transfers::Errors::HashErrorStruct, QObject*)@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::HashError(Ubuntu::Transfers::Errors::HashErrorStruct, QObject*)@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::~HashError()@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::~HashError()@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::~HashError()@Base" 0replaceme
+ (c++)"Ubuntu::DownloadManager::HashError::metaObject() const@Base" 0replaceme
+ (c++)"typeinfo for Ubuntu::DownloadManager::HashError@Base" 0replaceme
+ (c++)"typeinfo name for Ubuntu::DownloadManager::HashError@Base" 0replaceme
+ (c++)"vtable for Ubuntu::DownloadManager::HashError@Base" 0replaceme

=== renamed file 'debian/libubuntu-download-manager-common0.install' => 'debian/libubuntu-download-manager-common1.install'
--- debian/libubuntu-download-manager-common0.install	2014-02-10 18:04:03 +0000
+++ debian/libubuntu-download-manager-common1.install	2015-07-24 16:42:57 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libubuntu-download-manager-common.so.0*
+usr/lib/*/libubuntu-download-manager-common.so.1*

=== renamed file 'debian/libubuntu-download-manager-common0.symbols' => 'debian/libubuntu-download-manager-common1.symbols'
--- debian/libubuntu-download-manager-common0.symbols	2014-06-18 14:49:04 +0000
+++ debian/libubuntu-download-manager-common1.symbols	2015-07-24 16:42:57 +0000
@@ -1,4 +1,4 @@
-libubuntu-download-manager-common.so.0 libubuntu-download-manager-common0 #MINVER#
+libubuntu-download-manager-common.so.1 libubuntu-download-manager-common1 #MINVER#
  (c++)"Ubuntu::DownloadManager::DownloadStruct::getHeaders()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::DownloadStruct::getMetadata()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::DownloadStruct::getAlgorithm()@Base" 0.4+14.10.20140618

=== renamed file 'debian/libubuntu-upload-manager-common0.install' => 'debian/libubuntu-upload-manager-common1.install'
--- debian/libubuntu-upload-manager-common0.install	2014-02-25 15:21:34 +0000
+++ debian/libubuntu-upload-manager-common1.install	2015-07-24 16:42:57 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libubuntu-upload-manager-common.so.0*
+usr/lib/*/libubuntu-upload-manager-common.so.1*

=== renamed file 'debian/libubuntu-upload-manager-common0.symbols' => 'debian/libubuntu-upload-manager-common1.symbols'
--- debian/libubuntu-upload-manager-common0.symbols	2014-06-18 14:49:04 +0000
+++ debian/libubuntu-upload-manager-common1.symbols	2015-07-24 16:42:57 +0000
@@ -1,4 +1,4 @@
-libubuntu-upload-manager-common.so.0 libubuntu-upload-manager-common0 #MINVER#
+libubuntu-upload-manager-common.so.1 libubuntu-upload-manager-common1 #MINVER#
  (c++)"Ubuntu::UploadManager::UploadStruct::getHeaders()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::UploadManager::UploadStruct::getFilePath()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::UploadManager::UploadStruct::getMetadata()@Base" 0.4+14.10.20140618

=== modified file 'debian/libudm-common-dev.install'
--- debian/libudm-common-dev.install	2014-06-06 10:05:15 +0000
+++ debian/libudm-common-dev.install	2015-07-24 16:42:57 +0000
@@ -1,6 +1,7 @@
 usr/include/ubuntu/transfers/metadata.h
 usr/include/ubuntu/transfers/visibility.h
 usr/include/ubuntu/transfers/errors/auth_error_struct.h
+usr/include/ubuntu/transfers/errors/hash_error_struct.h
 usr/include/ubuntu/transfers/errors/http_error_struct.h
 usr/include/ubuntu/transfers/errors/network_error_struct.h
 usr/include/ubuntu/transfers/errors/process_error_struct.h

=== renamed file 'debian/libudm-common0.install' => 'debian/libudm-common1.install'
--- debian/libudm-common0.install	2014-02-25 15:21:34 +0000
+++ debian/libudm-common1.install	2015-07-24 16:42:57 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libudm-common.so.0*
+usr/lib/*/libudm-common.so.1*

=== renamed file 'debian/libudm-common0.symbols' => 'debian/libudm-common1.symbols'
--- debian/libudm-common0.symbols	2014-10-14 16:08:07 +0000
+++ debian/libudm-common1.symbols	2015-07-24 16:42:57 +0000
@@ -1,40 +1,24 @@
-libudm-common.so.0 libudm-common0 #MINVER#
- (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::getType()@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::getPhrase()@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(Ubuntu::Transfers::Errors::AuthErrorStruct::Type, QString)@Base" 0.4+14.10.20140618
+libudm-common.so.1 libudm-common1 #MINVER#
  (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(Ubuntu::Transfers::Errors::AuthErrorStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(int, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct()@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(Ubuntu::Transfers::Errors::AuthErrorStruct::Type, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(Ubuntu::Transfers::Errors::AuthErrorStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(int, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::operator=(Ubuntu::Transfers::Errors::AuthErrorStruct const&)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::HttpErrorStruct(Ubuntu::Transfers::Errors::HttpErrorStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::HttpErrorStruct(int, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::HttpErrorStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::HttpErrorStruct(Ubuntu::Transfers::Errors::HttpErrorStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::HttpErrorStruct(int, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::HttpErrorStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::operator=(Ubuntu::Transfers::Errors::HttpErrorStruct const&)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct(Ubuntu::Transfers::Errors::NetworkErrorStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct(int, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct(int)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct(Ubuntu::Transfers::Errors::NetworkErrorStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct(int, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct(int)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::operator=(Ubuntu::Transfers::Errors::NetworkErrorStruct const&)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(Ubuntu::Transfers::Errors::ProcessErrorStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, QString)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, QString, int, QString, QString)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, int, QString, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(Ubuntu::Transfers::Errors::ProcessErrorStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, QString)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, QString, int, QString, QString)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, int, QString, QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::operator=(Ubuntu::Transfers::Errors::ProcessErrorStruct const&)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::operator<<(QDBusArgument&, Ubuntu::Transfers::Errors::AuthErrorStruct const&)@Base" 0.4+14.10.20140618
@@ -79,6 +63,34 @@
  (c++)"Ubuntu::Transfers::System::Logger::~Logger()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::System::Logger::~Logger()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::System::Logger::~Logger()@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(Ubuntu::Transfers::Errors::AuthErrorStruct::Type, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(int, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(Ubuntu::Transfers::Errors::AuthErrorStruct::Type, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::AuthErrorStruct(int, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::HashErrorStruct(QString const&, QString const&, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::HashErrorStruct(Ubuntu::Transfers::Errors::HashErrorStruct const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::HashErrorStruct()@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::HashErrorStruct(QString const&, QString const&, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::HashErrorStruct(Ubuntu::Transfers::Errors::HashErrorStruct const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::HashErrorStruct()@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::operator=(Ubuntu::Transfers::Errors::HashErrorStruct const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::HttpErrorStruct(int, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::HttpErrorStruct(int, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct(int, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::NetworkErrorStruct(int, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, QString const&, int, QString const&, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, int, QString const&, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, QString const&, int, QString const&, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::ProcessErrorStruct::ProcessErrorStruct(int, int, QString const&, QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::operator<<(QDBusArgument&, Ubuntu::Transfers::Errors::HashErrorStruct const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::operator>>(QDBusArgument const&, Ubuntu::Transfers::Errors::HashErrorStruct&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::getType() const@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::AuthErrorStruct::getPhrase() const@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::getChecksum() const@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::getExpected() const@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Errors::HashErrorStruct::getMethod() const@Base" 0replaceme
  (c++)"Ubuntu::Transfers::Metadata::Metadata()@Base" 0.9+14.10.20141014.1
  (c++)"Ubuntu::Transfers::Metadata::Metadata(QMap<QString, QVariant>)@Base" 0.9+14.10.20141014.1
  (c++)"Ubuntu::Transfers::Metadata::Metadata()@Base" 0.9+14.10.20141014.1

=== renamed file 'debian/libudm-priv-common0.install' => 'debian/libudm-priv-common1.install'
--- debian/libudm-priv-common0.install	2014-04-29 09:52:30 +0000
+++ debian/libudm-priv-common1.install	2015-07-24 16:42:57 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libudm-priv-common.so.0*
+usr/lib/*/libudm-priv-common.so.1*

=== modified file 'docs/dbus/com.canonical.applications.download.xml'
--- docs/dbus/com.canonical.applications.download.xml	2014-09-05 15:11:35 +0000
+++ docs/dbus/com.canonical.applications.download.xml	2015-07-24 16:42:57 +0000
@@ -98,6 +98,11 @@
         <arg name="error" type="(isiss)" direction="out"/>
     </signal>
 
+     <signal name="hashError">
+         <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="HashErrorStruct"/>
+         <arg name="error" type="(sss)" direction="out"/>
+     </signal>
+
     <signal name="progress">
         <arg name="received" type="t" direction="out"/>
         <arg name="total" type="t" direction="out"/>

=== modified file 'docs/dbus/com.canonical.applications.testing.download_manager.xml'
--- docs/dbus/com.canonical.applications.testing.download_manager.xml	2014-04-30 14:47:38 +0000
+++ docs/dbus/com.canonical.applications.testing.download_manager.xml	2015-07-24 16:42:57 +0000
@@ -28,5 +28,12 @@
         <arg name="download" type="s" direction="in"/>
         <arg name="error" type="(is)" direction="in"/>
     </method>
+
+    <method name="returnHashError">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="HashErrorStruct"/>
+        <arg name="download" type="s" direction="in"/>
+        <arg name="error" type="(sss)" direction="in"/>
+    </method>
+
  </interface>
 </node>

=== removed file 'src/common/priv/ubuntu/transfers/system/pending_reply.cpp'
=== modified file 'src/common/public/CMakeLists.txt'
--- src/common/public/CMakeLists.txt	2014-06-16 12:38:08 +0000
+++ src/common/public/CMakeLists.txt	2015-07-24 16:42:57 +0000
@@ -5,6 +5,7 @@
 set(SOURCES
 	ubuntu/transfers/metadata.cpp
 	ubuntu/transfers/errors/auth_error_struct.cpp
+	ubuntu/transfers/errors/hash_error_struct.cpp
 	ubuntu/transfers/errors/http_error_struct.cpp
 	ubuntu/transfers/errors/network_error_struct.cpp
 	ubuntu/transfers/errors/process_error_struct.cpp
@@ -20,6 +21,7 @@
 
 set(ERRORS_PUBLIC_HEADERS
 	ubuntu/transfers/errors/auth_error_struct.h
+	ubuntu/transfers/errors/hash_error_struct.h
 	ubuntu/transfers/errors/http_error_struct.h
 	ubuntu/transfers/errors/network_error_struct.h
 	ubuntu/transfers/errors/process_error_struct.h

=== modified file 'src/common/public/ubuntu/transfers/errors/auth_error_struct.cpp'
--- src/common/public/ubuntu/transfers/errors/auth_error_struct.cpp	2014-02-26 19:54:31 +0000
+++ src/common/public/ubuntu/transfers/errors/auth_error_struct.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -30,12 +30,12 @@
       _phrase("") {
 }
 
-AuthErrorStruct::AuthErrorStruct(AuthErrorStruct::Type type, QString phrase)
+AuthErrorStruct::AuthErrorStruct(AuthErrorStruct::Type type, const QString& phrase)
     : _type(type),
       _phrase(phrase) {
 }
 
-AuthErrorStruct::AuthErrorStruct(int type, QString phrase)
+AuthErrorStruct::AuthErrorStruct(int type, const QString& phrase)
     : _type(static_cast<AuthErrorStruct::Type>(type)),
       _phrase(phrase) {
 }
@@ -80,16 +80,17 @@
 
 
 AuthErrorStruct::Type
-AuthErrorStruct::getType() {
+AuthErrorStruct::getType() const {
     return _type;
 }
 
 QString
-AuthErrorStruct::getPhrase() {
+AuthErrorStruct::getPhrase() const {
     return _phrase;
 }
 
 }  // Errors
 
 }  // Transfers
+
 }  // Ubuntu

=== modified file 'src/common/public/ubuntu/transfers/errors/auth_error_struct.h'
--- src/common/public/ubuntu/transfers/errors/auth_error_struct.h	2014-03-28 15:46:56 +0000
+++ src/common/public/ubuntu/transfers/errors/auth_error_struct.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_AUTH_ERROR_STRUCT_H
-#define DOWNLOADER_LIB_AUTH_ERROR_STRUCT_H
+#pragma once
 
 class QDBusArgument;
 
@@ -55,12 +54,12 @@
     /*!
         Creates a new structure with the given error types and message.
     */
-    AuthErrorStruct(AuthErrorStruct::Type type, QString phrase);
+    AuthErrorStruct(AuthErrorStruct::Type type, const QString& phrase);
 
     /*!
         Creates a new structure with the given error types and message.
     */
-    AuthErrorStruct(int type, QString phrase);
+    AuthErrorStruct(int type, const QString& phrase);
 
     /*!
         Copy constructor.
@@ -87,18 +86,18 @@
     // properties getters
 
     /*!
-        \fn AuthErrorStruct::Type getType()
+        \fn AuthErrorStruct::Type getType() const
 
         Returns the type of the error.
     */
-    AuthErrorStruct::Type getType();
+    AuthErrorStruct::Type getType() const;
 
     /*!
-        \fn QString getPhrase()
+        \fn QString getPhrase() const
 
         Returns the message of the error.
     */
-    QString getPhrase();
+    QString getPhrase() const;
 
  private:
 
@@ -110,7 +109,7 @@
     /*!
         \internal
     */
-    QString _phrase;
+    QString _phrase = QString::null;
 };
 
 }  // Errors
@@ -118,5 +117,3 @@
 }  // Transfers
 
 }  // Ubuntu
-
-#endif // AUTH_ERROR_STRUCT_H

=== added file 'src/common/public/ubuntu/transfers/errors/hash_error_struct.cpp'
--- src/common/public/ubuntu/transfers/errors/hash_error_struct.cpp	1970-01-01 00:00:00 +0000
+++ src/common/public/ubuntu/transfers/errors/hash_error_struct.cpp	2015-07-24 16:42:57 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015 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 <QDBusArgument>
+
+#include "hash_error_struct.h"
+
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+namespace Errors {
+
+HashErrorStruct::HashErrorStruct() {
+}
+
+HashErrorStruct::HashErrorStruct(const QString& method, const QString& expected, const QString& found)
+    : _method(method),
+      _expected(expected),
+      _found(found) {
+
+}
+
+HashErrorStruct::HashErrorStruct(const HashErrorStruct& other)
+    : _method(other._method),
+      _expected(other._expected),
+      _found(other._found) {
+}
+
+HashErrorStruct&
+HashErrorStruct::operator=(const HashErrorStruct& other) {
+    _method = other._method;
+    _expected = other._expected;
+    _found = other._found;
+
+    return *this;
+}
+
+QDBusArgument&
+operator<<(QDBusArgument &argument, const HashErrorStruct& error) {
+    argument.beginStructure();
+    argument << error._method;
+    argument << error._expected;
+    argument << error._found;
+    argument.endStructure();
+
+    return argument;
+}
+
+const QDBusArgument&
+operator>>(const QDBusArgument &argument, HashErrorStruct& error) {
+    argument.beginStructure();
+    argument >> error._method;
+    argument >> error._expected;
+    argument >> error._found;
+    argument.endStructure();
+
+    return argument;
+}
+
+QString
+HashErrorStruct::getMethod() const {
+    return _method;
+}
+
+QString
+HashErrorStruct::getExpected() const {
+    return _expected;
+}
+
+QString
+HashErrorStruct::getChecksum() const {
+    return _found;
+}
+
+}
+
+}
+
+}

=== added file 'src/common/public/ubuntu/transfers/errors/hash_error_struct.h'
--- src/common/public/ubuntu/transfers/errors/hash_error_struct.h	1970-01-01 00:00:00 +0000
+++ src/common/public/ubuntu/transfers/errors/hash_error_struct.h	2015-07-24 16:42:57 +0000
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2015 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.
+ */
+
+#pragma once
+
+#include <QString>
+
+class QDBusArgument;
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+namespace Errors {
+
+/*!
+    \class HashErrorStruct
+    \brief The HashErrorStruct represents the dbus structure that is used
+           to communicate hash errors that happened in the download
+           manager to the different clients.
+    \since 0.9
+*/
+class HashErrorStruct {
+    Q_PROPERTY(QString method READ getMethod)
+    Q_PROPERTY(QString expected READ getExpected)
+    Q_PROPERTY(QString checksum READ getChecksum)
+
+ public:
+
+    /*!
+        Creates a new structure with the default values.
+    */
+    HashErrorStruct();
+
+    /*!
+        Creates a new structure with the given method, expected result and found checksum.
+    */
+    HashErrorStruct(const QString& method, const QString& expected, const QString& found);
+
+    /*!
+        Copy constructor.
+    */
+    HashErrorStruct(const HashErrorStruct& other);
+
+    /*!
+        Assign operator.
+    */
+    HashErrorStruct& operator=(const HashErrorStruct& other);
+
+    /*!
+        \internal
+    */
+    friend QDBusArgument &operator<<(QDBusArgument &argument,
+            const HashErrorStruct& error);
+
+    /*!
+        \internal
+    */
+    friend const QDBusArgument &operator>>(const QDBusArgument &argument,
+            HashErrorStruct& error);
+
+    // properties getters
+
+    /*!
+        \fn QString getMethod() const
+
+        Returns the method that was used to calculate the checksum.
+    */
+    QString getMethod() const;
+
+    /*!
+        \fn QString getExpected() const
+
+        Returns the checksum that was expected.
+    */
+    QString getExpected() const;
+
+    /*!
+        \fn QString getChecksum() const
+
+        Returns the checksum of the completed download.
+    */
+    QString getChecksum() const;
+
+ private:
+
+    /*!
+        \internal
+    */
+    QString _method = QString::null;
+
+    /*!
+        \internal
+    */
+    QString _expected = QString::null;
+
+    /*!
+        \internal
+    */
+    QString _found = QString::null;
+};
+
+}
+
+}
+
+}

=== modified file 'src/common/public/ubuntu/transfers/errors/http_error_struct.cpp'
--- src/common/public/ubuntu/transfers/errors/http_error_struct.cpp	2014-03-28 15:46:56 +0000
+++ src/common/public/ubuntu/transfers/errors/http_error_struct.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -30,7 +30,7 @@
       _phrase("OK"){
 }
 
-HttpErrorStruct::HttpErrorStruct(int code, QString phrase)
+HttpErrorStruct::HttpErrorStruct(int code, const QString& phrase)
     : _code(code),
       _phrase(phrase) {
 }

=== modified file 'src/common/public/ubuntu/transfers/errors/http_error_struct.h'
--- src/common/public/ubuntu/transfers/errors/http_error_struct.h	2014-03-28 15:46:56 +0000
+++ src/common/public/ubuntu/transfers/errors/http_error_struct.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_HTTP_ERROR_STRUCT_H
-#define DOWNLOADER_LIB_HTTP_ERROR_STRUCT_H
+#pragma once
 
 #include <QString>
 
@@ -50,7 +49,7 @@
     /*!
         Creates a new structure with the given error types and message.
     */
-    HttpErrorStruct(int code, QString phrase);
+    HttpErrorStruct(int code, const QString& phrase);
 
     /*!
         Copy constructor.
@@ -107,4 +106,3 @@
 }  // Transfers
 
 }  // Ubuntu
-#endif // HTTP_ERROR_STRUCT_H

=== modified file 'src/common/public/ubuntu/transfers/errors/network_error_struct.cpp'
--- src/common/public/ubuntu/transfers/errors/network_error_struct.cpp	2014-03-28 15:46:56 +0000
+++ src/common/public/ubuntu/transfers/errors/network_error_struct.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -115,7 +115,7 @@
         }
 }
 
-NetworkErrorStruct::NetworkErrorStruct(int code, QString phrase)
+NetworkErrorStruct::NetworkErrorStruct(int code, const QString& phrase)
     : _code(code),
       _phrase(phrase) {
 }

=== modified file 'src/common/public/ubuntu/transfers/errors/network_error_struct.h'
--- src/common/public/ubuntu/transfers/errors/network_error_struct.h	2014-03-28 15:46:56 +0000
+++ src/common/public/ubuntu/transfers/errors/network_error_struct.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_NETWORK_ERROR_STRUCT_H
-#define DOWNLOADER_LIB_NETWORK_ERROR_STRUCT_H
+#pragma once
 
 #include <QString>
 
@@ -56,7 +55,7 @@
         Creates a network error with the given type and a human readable
         message.
     */
-    NetworkErrorStruct(int code, QString phrase);
+    NetworkErrorStruct(int code, const QString& phrase);
 
     /*!
         Copy constructor.
@@ -112,5 +111,3 @@
 }  // Transfers
 
 }  // Ubuntu
-
-#endif // NETWORK_ERROR_STRUCT_H

=== modified file 'src/common/public/ubuntu/transfers/errors/process_error_struct.cpp'
--- src/common/public/ubuntu/transfers/errors/process_error_struct.cpp	2014-03-28 15:46:56 +0000
+++ src/common/public/ubuntu/transfers/errors/process_error_struct.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -34,7 +34,7 @@
       _stderr("") {
 }
 
-ProcessErrorStruct::ProcessErrorStruct(int code, QString phrase)
+ProcessErrorStruct::ProcessErrorStruct(int code, const QString& phrase)
     : _code(code),
       _exitCode(0),
       _phrase(phrase),
@@ -44,8 +44,8 @@
 
 ProcessErrorStruct::ProcessErrorStruct(int code,
                                        int exitCode,
-                                       QString standardOutput,
-                                       QString standardError)
+                                       const QString& standardOutput,
+                                       const QString& standardError)
     : _code(code),
       _exitCode(exitCode),
       _stdout(standardOutput),
@@ -73,10 +73,10 @@
 }
 
 ProcessErrorStruct::ProcessErrorStruct(int code,
-                                       QString phrase,
+                                       const QString& phrase,
                                        int exitCode,
-                                       QString standardOutput,
-                                       QString standardError)
+                                       const QString& standardOutput,
+                                       const QString& standardError)
     : _code(code),
       _exitCode(exitCode),
       _phrase(phrase),

=== modified file 'src/common/public/ubuntu/transfers/errors/process_error_struct.h'
--- src/common/public/ubuntu/transfers/errors/process_error_struct.h	2014-03-28 15:46:56 +0000
+++ src/common/public/ubuntu/transfers/errors/process_error_struct.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_PROCESS_ERROR_STRUCT_H
-#define DOWNLOADER_LIB_PROCESS_ERROR_STRUCT_H
+#pragma once
 
 #include <QString>
 
@@ -54,7 +53,7 @@
         Create a new structure with the given error \a code and
         a given human readable message.
     */
-    ProcessErrorStruct(int code, QString phrase);
+    ProcessErrorStruct(int code, const QString& phrase);
 
     /*!
         Creates a new structure with the given error \a code and with
@@ -64,8 +63,8 @@
     */
     ProcessErrorStruct(int code,
                        int exitCode,
-                       QString standardOutput,
-                       QString standardError);
+                       const QString& standardOutput,
+                       const QString& standardError);
 
     /*!
         Creates a new structure with the given error \a code , a human
@@ -74,10 +73,10 @@
         out via \a standardOut and standard error via \a standarError
     */
     ProcessErrorStruct(int code,
-                       QString phrase,
+                       const QString& phrase,
                        int exitCode,
-                       QString standardOutput,
-                       QString standardError);
+                       const QString& standardOutput,
+                       const QString& standardError);
 
     /*!
         Copy constructor.
@@ -169,5 +168,3 @@
 }  // Transfers
 
 }  // Ubuntu
-
-#endif // PROCESS_ERROR_STRUCT_H

=== modified file 'src/downloads/client/symbols.map'
--- src/downloads/client/symbols.map	2014-06-30 12:01:15 +0000
+++ src/downloads/client/symbols.map	2015-07-24 16:42:57 +0000
@@ -9,6 +9,7 @@
         Ubuntu::DownloadManager::HttpError::*;
         Ubuntu::DownloadManager::NetworkError::*;
         Ubuntu::DownloadManager::ProcessError::*;
+        Ubuntu::DownloadManager::HashError::*;
         Ubuntu::DownloadManager::GroupDownload::*;
         Ubuntu::DownloadManager::Manager::*;
         Ubuntu::DownloadManager::Logging::Logger::init*;
@@ -20,6 +21,7 @@
         typeinfo?for?Ubuntu::DownloadManager::HttpError;
         typeinfo?for?Ubuntu::DownloadManager::NetworkError;
         typeinfo?for?Ubuntu::DownloadManager::ProcessError;
+        typeinfo?for?Ubuntu::DownloadManager::HashError;
         typeinfo?for?Ubuntu::DownloadManager::GroupDownload;
         typeinfo?for?Ubuntu::DownloadManager::Manager;
         typeinfo?for?Ubuntu::DownloadManager::Logging::Logger;
@@ -31,6 +33,7 @@
         typeinfo?name?for?Ubuntu::DownloadManager::HttpError;
         typeinfo?name?for?Ubuntu::DownloadManager::NetworkError;
         typeinfo?name?for?Ubuntu::DownloadManager::ProcessError;
+        typeinfo?name?for?Ubuntu::DownloadManager::HashError;
         typeinfo?name?for?Ubuntu::DownloadManager::GroupDownload;
         typeinfo?name?for?Ubuntu::DownloadManager::Manager;
         typeinfo?name?for?Ubuntu::DownloadManager::Logging::Logger;
@@ -42,6 +45,7 @@
         VTT?for?Ubuntu::DownloadManager::HttpError;
         VTT?for?Ubuntu::DownloadManager::NetworkError;
         VTT?for?Ubuntu::DownloadManager::ProcessError;
+        VTT?for?Ubuntu::DownloadManager::HashError;
         VTT?for?Ubuntu::DownloadManager::GroupDownload;
         VTT?for?Ubuntu::DownloadManager::Manager;
         VTT?for?Ubuntu::DownloadManager::Logging::Logger;
@@ -53,6 +57,7 @@
         virtual?thunk?to?Ubuntu::DownloadManager::HttpError;
         virtual?thunk?to?Ubuntu::DownloadManager::NetworkError;
         virtual?thunk?to?Ubuntu::DownloadManager::ProcessError;
+        virtual?thunk?to?Ubuntu::DownloadManager::HashError;
         virtual?thunk?to?Ubuntu::DownloadManager::GroupDownload;
         virtual?thunk?to?Ubuntu::DownloadManager::Manager;
         virtual?thunk?to?Ubuntu::DownloadManager::Logging::Logger;
@@ -64,6 +69,7 @@
         vtable?for?Ubuntu::DownloadManager::HttpError;
         vtable?for?Ubuntu::DownloadManager::NetworkError;
         vtable?for?Ubuntu::DownloadManager::ProcessError;
+        vtable?for?Ubuntu::DownloadManager::HashError;
         vtable?for?Ubuntu::DownloadManager::GroupDownload;
         vtable?for?Ubuntu::DownloadManager::Manager;
         vtable?for?Ubuntu::DownloadManager::Logging::Logger;

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/download_impl.cpp	2014-09-24 09:11:19 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -129,6 +129,13 @@
             "Could not connect to signal &DownloadInterface::authError");
     }
 
+    connected = connect(_dbusInterface, &DownloadInterface::hashError,
+        this, &DownloadImpl::onHashError);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::authError");
+    }
+
     connected = connect(_propertiesInterface, &PropertiesInterface::PropertiesChanged,
         this, &DownloadImpl::onPropertiesChanged);
     if (!connected) {
@@ -443,6 +450,12 @@
 }
 
 void
+DownloadImpl::onHashError(HashErrorStruct errStruct) {
+    auto err = new HashError(errStruct, this);
+    setLastError(err);
+}
+
+void
 DownloadImpl::onPropertiesChanged(const QString& interfaceName,
                                   const QVariantMap& changedProperties,
                                   const QStringList& invalidatedProperties) {

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.h'
--- src/downloads/client/ubuntu/download_manager/download_impl.h	2014-09-08 11:33:57 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_IMPL_H
-#define UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_IMPL_H
+#pragma once
 
 #include <QDBusConnection>
 #include <QDBusObjectPath>
@@ -97,6 +96,7 @@
     void onNetworkError(NetworkErrorStruct);
     void onProcessError(ProcessErrorStruct);
     void onAuthError(AuthErrorStruct);
+    void onHashError(HashErrorStruct);
     void onPropertiesChanged(const QString& interfaceName,
                              const QVariantMap& changedProperties,
                              const QStringList& invalidatedProperties);
@@ -116,4 +116,3 @@
 
 }  // DownloadManager
 
-#endif  // UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_IMPL_H

=== modified file 'src/downloads/client/ubuntu/download_manager/download_interface.cpp'
--- src/downloads/client/ubuntu/download_manager/download_interface.cpp	2014-01-13 17:26:28 +0000
+++ src/downloads/client/ubuntu/download_manager/download_interface.cpp	2015-07-24 16:42:57 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp com.canonical.applications.download.xml -i metatypes.h -p download_interface -c DownloadInterface
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments

=== modified file 'src/downloads/client/ubuntu/download_manager/download_interface.h'
--- src/downloads/client/ubuntu/download_manager/download_interface.h	2014-09-05 15:11:35 +0000
+++ src/downloads/client/ubuntu/download_manager/download_interface.h	2015-07-24 16:42:57 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp com.canonical.applications.download.xml -i metatypes.h -p download_interface -c DownloadInterface
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -149,6 +149,7 @@
     void canceled(bool success);
     void error(const QString &error);
     void finished(const QString &path);
+    void hashError(HashErrorStruct error);
     void httpError(HttpErrorStruct error);
     void networkError(NetworkErrorStruct error);
     void paused(bool success);

=== modified file 'src/downloads/client/ubuntu/download_manager/error.cpp'
--- src/downloads/client/ubuntu/download_manager/error.cpp	2014-02-26 19:54:31 +0000
+++ src/downloads/client/ubuntu/download_manager/error.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -26,6 +26,7 @@
     const QString HTTP_ERROR_STRING = "HttpError: %1 - %2";
     const QString NETWORK_ERROR_STRING = "NetworkError: %1 - %2";
     const QString PROCESS_ERROR_STRING = "ProcessError: %1 - %2\nExit code: %3\nStdout: %4\nStderr:%5";
+    const QString HASH_ERROR_STRING = "Hash validation error using %1: Expected result is %2 but result was %3.";
 }
 
 namespace Ubuntu {
@@ -45,11 +46,11 @@
           q_ptr(parent) {
     }
 
-    Error::Type type() {
+    Error::Type type() const {
         return _type;
     }
 
-    QString errorString() {
+    QString errorString() const {
         switch(_type) {
             case Error::DBus:
                 return "DBusError";
@@ -59,6 +60,8 @@
                 return "NetworkError";
             case Error::Process:
                 return "ProcessError";
+            case Error::Hash:
+                return "HashError";
             default:
                 return "";
         }
@@ -78,15 +81,15 @@
           q_ptr(parent) {
     }
 
-    inline QString message() {
+    inline QString message() const {
         return _err.message();
     }
 
-    inline QString name() {
+    inline QString name() const {
         return _err.name();
     }
 
-    inline QString errorString() {
+    inline QString errorString() const {
         return DBUS_ERROR_STRING.arg(_err.name(), _err.message());
     }
 
@@ -104,7 +107,7 @@
           q_ptr(parent) {
     }
 
-    inline AuthError::Type type() {
+    inline AuthError::Type type() const {
         switch(_err.getType()) {
             case Transfers::Errors::AuthErrorStruct::Proxy:
                 return AuthError::Proxy;
@@ -113,7 +116,7 @@
         }
     }
 
-    inline QString getTypeString() {
+    inline QString getTypeString() const {
         switch(_err.getType()) {
             case Transfers::Errors::AuthErrorStruct::Proxy:
                 return "Proxy";
@@ -122,11 +125,11 @@
         }
     }
 
-    inline QString phrase() {
+    inline QString phrase() const {
         return _err.getPhrase();
     }
 
-    inline QString errorString() {
+    inline QString errorString() const {
         return AUTH_ERROR_STRING.arg(getTypeString(), _err.getPhrase());
     }
 
@@ -144,15 +147,15 @@
           q_ptr(parent) {
     }
 
-    inline int code() {
+    inline int code() const {
         return _err.getCode();
     }
 
-    inline QString phrase() {
+    inline QString phrase() const {
         return _err.getPhrase();
     }
 
-    inline QString errorString() {
+    inline QString errorString() const {
         return HTTP_ERROR_STRING.arg(QString::number(_err.getCode()),
             _err.getPhrase());
     }
@@ -172,16 +175,16 @@
           q_ptr(parent) {
     }
 
-    inline NetworkError::ErrorCode code() {
+    inline NetworkError::ErrorCode code() const {
         auto intCode = static_cast<NetworkError::ErrorCode>(_err.getCode());
         return intCode;
     }
 
-    inline QString phrase() {
+    inline QString phrase() const {
         return _err.getPhrase();
     }
 
-    inline QString errorString() {
+    inline QString errorString() const {
         return NETWORK_ERROR_STRING.arg(QString::number(_err.getCode()),
             _err.getPhrase());
     }
@@ -201,28 +204,28 @@
           q_ptr(parent) {
     }
 
-    QProcess::ProcessError code() {
+    QProcess::ProcessError code() const {
         auto code = static_cast<QProcess::ProcessError>(_err.getCode());
         return code;
     }
 
-    QString phrase() {
+    QString phrase() const {
         return _err.getPhrase();
     }
 
-    inline int exitCode() {
+    inline int exitCode() const {
         return _err.getExitCode();
     }
 
-    inline QString standardOut() {
+    inline QString standardOut() const {
         return _err.getStandardOutput();
     }
 
-    inline QString standardError() {
+    inline QString standardError() const {
         return _err.getStandardError();
     }
 
-    inline QString errorString() {
+    inline QString errorString() const {
         return PROCESS_ERROR_STRING.arg(QString::number(_err.getCode()),
             _err.getPhrase(), QString::number(_err.getExitCode()),
             _err.getStandardOutput(), _err.getStandardError());
@@ -233,6 +236,36 @@
     ProcessError* q_ptr;
 };
 
+class HashErrorPrivate {
+    Q_DECLARE_PUBLIC(HashError)
+
+ public:
+    HashErrorPrivate (Transfers::Errors::HashErrorStruct err, HashError* parent)
+        : _err(err),
+          q_ptr(parent) {
+    }
+
+    inline QString method() const {
+        return _err.getMethod();
+    }
+
+    inline QString expected() const {
+        return _err.getExpected();
+    }
+
+    inline QString checksum() const {
+        return _err.getChecksum();
+    }
+
+    inline QString errorString() const {
+        return HASH_ERROR_STRING.arg(_err.getMethod()).arg(_err.getExpected()).arg(_err.getChecksum());
+    }
+
+ private:
+    Transfers::Errors::HashErrorStruct _err;
+    HashError* q_ptr;
+};
+
 /*
  * PUBLIC IMPLEMENTATIONS
  */
@@ -413,6 +446,39 @@
     return d->errorString();
 }
 
+HashError::HashError(Transfers::Errors::HashErrorStruct errStruct, QObject* parent)
+        : Error(Error::Hash, parent),
+          d_ptr(new HashErrorPrivate(errStruct, this)) {
+}
+
+HashError::~HashError() {
+    delete d_ptr;
+}
+
+QString
+HashError::method() {
+    Q_D(HashError);
+    return d->method();
+}
+
+QString
+HashError::expected() {
+    Q_D(HashError);
+    return d->expected();
+}
+
+QString
+HashError::checksum() {
+    Q_D(HashError);
+    return d->checksum();
+}
+
+QString
+HashError::errorString() {
+    Q_D(HashError);
+    return d->errorString();
+}
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'src/downloads/client/ubuntu/download_manager/error.h'
--- src/downloads/client/ubuntu/download_manager/error.h	2014-06-06 10:05:15 +0000
+++ src/downloads/client/ubuntu/download_manager/error.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_ERROR_H
-#define UBUNTU_DOWNLOADMANAGER_CLIENT_ERROR_H
+#pragma once
 
 #include <QObject>
 #include <QProcess>
@@ -33,6 +32,7 @@
     class HttpErrorStruct;
     class NetworkErrorStruct;
     class ProcessErrorStruct;
+    class HashErrorStruct;
 }
 
 }
@@ -66,7 +66,8 @@
         DBus,    /*! The error was due to some problem when communicating with the dbus API.*/
         Http,    /*! The error was due to a http error, for example a 404.*/
         Network, /*! The error was due to network problems such as a missing network interface.*/
-        Process  /*! The error was due to a problem when executing the post download command.*/
+        Process, /*! The error was due to a problem when executing the post download command.*/
+        Hash     /*! The error was due to a problem when verifying the checksum of the download.*/
     };
 
     /*!
@@ -468,8 +469,72 @@
     ProcessErrorPrivate* d_ptr;
 };
 
+class HashErrorPrivate;
+
+/*!
+    \class HashError 
+    \brief The HashError represents an error that occurred during the
+           hash validation after the download.
+    \since 0.3
+*/
+class HashError : public Error {
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(HashError)
+
+    friend class DownloadImpl;
+
+ public:
+
+    /*!
+        Disposes of this error and frees any resources associated with it.
+    */
+    virtual ~HashError();
+
+    /*!
+        /fn QString method()
+
+        Returns the method that was used to verify the checksum of the download.
+     */
+    QString method();
+
+    /*!
+        /fn QString expected()
+
+        Returns the checksum that passed to the download manager to check against once the download
+        was completed.
+     */
+    QString expected();
+
+    /*!
+        /fn QString checksum()
+
+        Returns the checksum of the download on disk after the download was completed.
+     */
+    QString checksum();
+
+    /*!
+        /fn QString errorString() override
+
+        Returns a string representation of the error.
+    */
+    QString errorString() override;
+
+ protected:
+
+    /*!
+        Creates a new error from the provided process error struct.
+        \internal
+    */
+    HashError(Transfers::Errors::HashErrorStruct err, QObject* parent);
+
+ private:
+    /*!
+        Use pimpl pattern so that users do not have to be recompiled
+        \internal
+    */
+    HashErrorPrivate* d_ptr;
+};
+
 }  // DownloadManager
 
 }  // Ubuntu
-
-#endif // ERROR_H

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2014-06-29 12:45:29 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -69,6 +69,7 @@
     qRegisterMetaType<HttpError*>("HttpError*");
     qRegisterMetaType<NetworkError*>("NetworkError*");
     qRegisterMetaType<AuthError*>("AuthError*");
+    qRegisterMetaType<HashError*>("HashError*");
     qRegisterMetaType<ProcessError*>("ProcessError*");
     qRegisterMetaType<DownloadsList*>("DownloadsList*");
     qDBusRegisterMetaType<StringMap>();
@@ -76,6 +77,7 @@
     qDBusRegisterMetaType<GroupDownloadStruct>();
     qDBusRegisterMetaType<StructList>();
     qDBusRegisterMetaType<AuthErrorStruct>();
+    qDBusRegisterMetaType<HashErrorStruct>();
     qDBusRegisterMetaType<HttpErrorStruct>();
     qDBusRegisterMetaType<NetworkErrorStruct>();
     qDBusRegisterMetaType<ProcessErrorStruct>();

=== modified file 'src/downloads/common/ubuntu/download_manager/metatypes.h'
--- src/downloads/common/ubuntu/download_manager/metatypes.h	2014-02-26 19:54:31 +0000
+++ src/downloads/common/ubuntu/download_manager/metatypes.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -16,12 +16,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_APP_METATYPES_H
-#define DOWNLOADER_LIB_APP_METATYPES_H
+#pragma once
 
 #include <QMap>
 #include <QList>
 #include <ubuntu/transfers/errors/auth_error_struct.h>
+#include <ubuntu/transfers/errors/hash_error_struct.h>
 #include <ubuntu/transfers/errors/http_error_struct.h>
 #include <ubuntu/transfers/errors/network_error_struct.h>
 #include <ubuntu/transfers/errors/process_error_struct.h>
@@ -35,6 +35,7 @@
 typedef QList<GroupDownloadStruct> StructList;
 
 Q_DECLARE_METATYPE(AuthErrorStruct)
+Q_DECLARE_METATYPE(HashErrorStruct)
 Q_DECLARE_METATYPE(HttpErrorStruct)
 Q_DECLARE_METATYPE(NetworkErrorStruct)
 Q_DECLARE_METATYPE(ProcessErrorStruct)
@@ -42,4 +43,3 @@
 Q_DECLARE_METATYPE(StringMap)
 Q_DECLARE_METATYPE(StructList)
 
-#endif  // DOWNLOADER_LIB_APP_METATYPES_H

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.h'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.h	2014-09-05 15:11:35 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.h	2015-07-24 16:42:57 +0000
@@ -109,6 +109,10 @@
 "      <annotation value=\"ProcessErrorStruct\" name=\"org.qtproject.QtDBus.QtTypeName.In0\"/>\n"
 "      <arg direction=\"out\" type=\"(isiss)\" name=\"error\"/>\n"
 "    </signal>\n"
+"    <signal name=\"hashError\">\n"
+"      <annotation value=\"HashErrorStruct\" name=\"org.qtproject.QtDBus.QtTypeName.In0\"/>\n"
+"      <arg direction=\"out\" type=\"(sss)\" name=\"error\"/>\n"
+"    </signal>\n"
 "    <signal name=\"progress\">\n"
 "      <arg direction=\"out\" type=\"t\" name=\"received\"/>\n"
 "      <arg direction=\"out\" type=\"t\" name=\"total\"/>\n"
@@ -156,6 +160,7 @@
     void canceled(bool success);
     void error(const QString &error);
     void finished(const QString &path);
+    void hashError(HashErrorStruct error);
     void httpError(HttpErrorStruct error);
     void networkError(NetworkErrorStruct error);
     void paused(bool success);

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.cpp'
--- src/downloads/priv/ubuntu/downloads/file_download.cpp	2015-01-23 11:59:19 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -931,6 +931,7 @@
         QString fileSig = QString(hash->result().toHex());
         if (fileSig != _hash) {
             DOWN_LOG(ERROR) << HASH_ERROR << fileSig << "!=" << _hash;
+            emit hashError(HashErrorStruct(HashAlgorithm::getHashAlgo(_algo), _hash, fileSig));
             return false;
         }
     }

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.h'
--- src/downloads/priv/ubuntu/downloads/file_download.h	2015-01-22 22:08:41 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -103,6 +103,7 @@
     void httpError(HttpErrorStruct error);
     void networkError(NetworkErrorStruct error);
     void processError(ProcessErrorStruct error);
+    void hashError(HashErrorStruct error);
     void propertiesChanged(const QVariantMap& changes);
 
  protected:

=== modified file 'src/downloads/priv/ubuntu/downloads/manager.cpp'
--- src/downloads/priv/ubuntu/downloads/manager.cpp	2014-10-22 23:32:28 +0000
+++ src/downloads/priv/ubuntu/downloads/manager.cpp	2015-07-24 16:42:57 +0000
@@ -78,6 +78,7 @@
     qDBusRegisterMetaType<StructList>();
     qDBusRegisterMetaType<AuthErrorStruct>();
     qDBusRegisterMetaType<HttpErrorStruct>();
+    qDBusRegisterMetaType<HashErrorStruct>();
     qDBusRegisterMetaType<NetworkErrorStruct>();
     qDBusRegisterMetaType<ProcessErrorStruct>();
 

=== modified file 'src/downloads/test-daemon/testing_daemon.cpp'
--- src/downloads/test-daemon/testing_daemon.cpp	2014-03-12 12:59:51 +0000
+++ src/downloads/test-daemon/testing_daemon.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -65,6 +65,17 @@
 }
 
 void
+TestingDaemon::returnHashError(const QString &download,
+                               HashErrorStruct error) {
+    qDebug() << "############################################";
+    qDebug() << "returnHashError from error";
+    qDebug() << "############################################";
+
+    auto man = qobject_cast<TestingManager*>(manager());
+    man->returnHashError(download, error);
+}
+
+void
 TestingDaemon::returnHttpError(const QString &download,
                                HttpErrorStruct error) {
     auto man = qobject_cast<TestingManager*>(manager());

=== modified file 'src/downloads/test-daemon/testing_daemon.h'
--- src/downloads/test-daemon/testing_daemon.h	2014-03-12 12:59:51 +0000
+++ src/downloads/test-daemon/testing_daemon.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef TESTING_DAEMON_H
-#define TESTING_DAEMON_H
+#pragma once
 
 #include <QObject>
 #include <ubuntu/download_manager/metatypes.h>
@@ -36,6 +35,7 @@
     // let the client test to tell the manager to return dbus errors
     void returnDBusErrors(bool errors);
     void returnAuthError(const QString &download, AuthErrorStruct error);
+    void returnHashError(const QString &download, HashErrorStruct error);
     void returnHttpError(const QString &download, HttpErrorStruct error);
     void returnNetworkError(const QString &download, NetworkErrorStruct error);
     void returnProcessError(const QString &download, ProcessErrorStruct error);
@@ -52,4 +52,3 @@
 
 };
 
-#endif // TESTING_DAEMON_H

=== modified file 'src/downloads/test-daemon/testing_file_download.cpp'
--- src/downloads/test-daemon/testing_file_download.cpp	2014-09-08 10:10:43 +0000
+++ src/downloads/test-daemon/testing_file_download.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -94,9 +94,20 @@
     _returnHttpError = false;
     _returnNetworkError = false;
     _returnProcessError = false;
+    _returnHashError = false;
     _authErr = error;
 }
 
+void
+TestingFileDownload::returnHashError(HashErrorStruct error) {
+    _returnAuthError = false;
+    _returnHttpError = false;
+    _returnNetworkError = false;
+    _returnProcessError = false;
+    _returnHashError = true;
+    _hashErr = error;
+}
+
 qulonglong
 TestingFileDownload::progress() {
     if (calledFromDBus() && _returnErrors) {
@@ -246,6 +257,11 @@
         emitError("Forced processerror");
     }
 
+    if (_returnHashError) {
+        emit hashError(_hashErr);
+        emitError("Forced hash error");
+    }
+
 }
 
 void

=== modified file 'src/downloads/test-daemon/testing_file_download.h'
--- src/downloads/test-daemon/testing_file_download.h	2014-09-08 10:10:43 +0000
+++ src/downloads/test-daemon/testing_file_download.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef TESTING_FILE_DOWNLOAD_H
-#define TESTING_FILE_DOWNLOAD_H
+#pragma once
 
 #include <QDBusContext>
 #include <QObject>
@@ -38,6 +37,7 @@
     void returnNetworkError(NetworkErrorStruct error);
     void returnProcessError(ProcessErrorStruct error);
     void returnAuthError(AuthErrorStruct error);
+    void returnHashError(HashErrorStruct error);
 
  public slots:  // NOLINT(whitespace/indent)
     qulonglong progress() override;
@@ -73,11 +73,12 @@
     bool _returnHttpError = false;
     bool _returnNetworkError = false;
     bool _returnProcessError = false;
+    bool _returnHashError = false;
     AuthErrorStruct _authErr;
     HttpErrorStruct _httpErr;
     NetworkErrorStruct _networkErr;
     ProcessErrorStruct _processErr;
+    HashErrorStruct _hashErr;
     FileDownload* _down = nullptr;
 };
 
-#endif // TESTING_FILE_DOWNLOAD_H

=== modified file 'src/downloads/test-daemon/testing_interface.cpp'
--- src/downloads/test-daemon/testing_interface.cpp	2014-03-12 12:59:51 +0000
+++ src/downloads/test-daemon/testing_interface.cpp	2015-07-24 16:42:57 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp com.canonical.applications.testing.download_manager.xml -p testing_interface -c TestingInterface
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments

=== modified file 'src/downloads/test-daemon/testing_interface.h'
--- src/downloads/test-daemon/testing_interface.h	2014-03-12 12:59:51 +0000
+++ src/downloads/test-daemon/testing_interface.h	2015-07-24 16:42:57 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp com.canonical.applications.testing.download_manager.xml -p testing_interface -c TestingInterface
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -51,6 +51,13 @@
         return asyncCallWithArgumentList(QLatin1String("returnDBusErrors"), argumentList);
     }
 
+    inline QDBusPendingReply<> returnHashError(const QString &download, HashErrorStruct error)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(download) << QVariant::fromValue(error);
+        return asyncCallWithArgumentList(QLatin1String("returnHashError"), argumentList);
+    }
+
     inline QDBusPendingReply<> returnHttpError(const QString &download, HttpErrorStruct error)
     {
         QList<QVariant> argumentList;

=== modified file 'src/downloads/test-daemon/testing_manager.cpp'
--- src/downloads/test-daemon/testing_manager.cpp	2014-03-25 17:28:41 +0000
+++ src/downloads/test-daemon/testing_manager.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -86,12 +86,22 @@
     }
 }
 
+void
+TestingManager::returnHashError(const QString &download, HashErrorStruct error) {
+    auto q = queue();
+    foreach(auto transfer, q->transfers().values()) {
+        auto testDown = qobject_cast<TestingFileDownload*>(transfer);
+        if (testDown != nullptr && testDown->url() == download) {
+            testDown->returnHashError(error);
+        }
+    }
+}
+
 QDBusObjectPath
 TestingManager::registerDownload(Download* download) {
     QDBusObjectPath path;
     auto fileDown = qobject_cast<FileDownload*>(download);
     if (fileDown != nullptr) {
-    qDebug() << "Register testing file";
     auto testDown = new TestingFileDownload(fileDown);
         auto downAdaptor = new DownloadAdaptor(testDown);
     Q_UNUSED(downAdaptor);
@@ -101,7 +111,6 @@
         path = DownloadManager::registerDownload(download);
     }
     // create an adaptor so that we can be exposed to Dbus
-    qDebug() << "Path" << path.path();
     return path;
 }
 

=== modified file 'src/downloads/test-daemon/testing_manager.h'
--- src/downloads/test-daemon/testing_manager.h	2014-03-25 17:28:41 +0000
+++ src/downloads/test-daemon/testing_manager.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef TESTING_MANAGER_H
-#define TESTING_MANAGER_H
+#pragma once
 
 #include <QObject>
 #include <ubuntu/download_manager/metatypes.h>
@@ -60,6 +59,7 @@
     void returnNetworkError(const QString &download, NetworkErrorStruct error);
     void returnProcessError(const QString &download, ProcessErrorStruct error);
     void returnAuthError(const QString &download, AuthErrorStruct error);
+    void returnHashError(const QString &download, HashErrorStruct error);
 
  protected:
     QDBusObjectPath registerDownload(Download* download) override;
@@ -67,4 +67,3 @@
     bool _returnErrors = false;
 };
 
-#endif // TESTING_MANAGER_H

=== modified file 'src/downloads/test-daemon/testing_manager_adaptor.cpp'
--- src/downloads/test-daemon/testing_manager_adaptor.cpp	2014-03-12 12:59:51 +0000
+++ src/downloads/test-daemon/testing_manager_adaptor.cpp	2015-07-24 16:42:57 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -c TestingManagerAdaptor -a testing_manager_adaptor.h:testing_manager_adaptor.cpp com.canonical.applications.testing.download_manager.xml
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -17,6 +17,8 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 
+#include <QDebug>
+
 /*
  * Implementation of adaptor class TestingManagerAdaptor
  */
@@ -45,6 +47,12 @@
     QMetaObject::invokeMethod(parent(), "returnDBusErrors", Q_ARG(bool, returnErrors));
 }
 
+void TestingManagerAdaptor::returnHashError(const QString &download, HashErrorStruct error)
+{
+    // handle method call com.canonical.applications.testing.DownloadManager.returnHashError
+    QMetaObject::invokeMethod(parent(), "returnHashError", Q_ARG(QString, download), Q_ARG(HashErrorStruct, error));
+}
+
 void TestingManagerAdaptor::returnHttpError(const QString &download, HttpErrorStruct error)
 {
     // handle method call com.canonical.applications.testing.DownloadManager.returnHttpError

=== modified file 'src/downloads/test-daemon/testing_manager_adaptor.h'
--- src/downloads/test-daemon/testing_manager_adaptor.h	2014-03-12 12:59:51 +0000
+++ src/downloads/test-daemon/testing_manager_adaptor.h	2015-07-24 16:42:57 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -c TestingManagerAdaptor -a testing_manager_adaptor.h:testing_manager_adaptor.cpp com.canonical.applications.testing.download_manager.xml
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
@@ -57,6 +57,11 @@
 "      <arg direction=\"in\" type=\"s\" name=\"download\"/>\n"
 "      <arg direction=\"in\" type=\"(is)\" name=\"error\"/>\n"
 "    </method>\n"
+"    <method name=\"returnHashError\">\n"
+"      <annotation value=\"HashErrorStruct\" name=\"org.qtproject.QtDBus.QtTypeName.In1\"/>\n"
+"      <arg direction=\"in\" type=\"s\" name=\"download\"/>\n"
+"      <arg direction=\"in\" type=\"(sss)\" name=\"error\"/>\n"
+"    </method>\n"
 "  </interface>\n"
         "")
 public:
@@ -67,6 +72,7 @@
 public Q_SLOTS: // METHODS
     void returnAuthError(const QString &download, AuthErrorStruct error);
     void returnDBusErrors(bool returnErrors);
+    void returnHashError(const QString &download, HashErrorStruct error);
     void returnHttpError(const QString &download, HttpErrorStruct error);
     void returnNetworkError(const QString &download, NetworkErrorStruct error);
     void returnProcessError(const QString &download, ProcessErrorStruct error);

=== removed file 'src/downloads/test-daemon/ubuntu-download-manager-test-daemon.pro.THIS'
--- src/downloads/test-daemon/ubuntu-download-manager-test-daemon.pro.THIS	2014-03-07 15:39:14 +0000
+++ src/downloads/test-daemon/ubuntu-download-manager-test-daemon.pro.THIS	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-include( ../common-project-config.pri )
-include( ../common-vars.pri )
-
-QT       += core systeminfo
-
-QT       -= gui
-
-TARGET = ubuntu-download-manager-test-daemon
-CONFIG   += console
-CONFIG   -= app_bundle
-
-TEMPLATE = app
-
-SOURCES += main.cpp
-
-LIBS += -L$$OUT_PWD/../udm-common/ -ludm-common
-
-INCLUDEPATH += $$PWD/../udm-common
-DEPENDPATH += $$PWD/../udm-common
-
-LIBS += -L$$OUT_PWD/../udm-priv-common/ -ludm-priv-common
-
-INCLUDEPATH += $$PWD/../udm-priv-common
-DEPENDPATH += $$PWD/../udm-priv-common
-
-LIBS += -L$$OUT_PWD/../ubuntu-download-manager-common/ -lubuntu-download-manager-common
-
-INCLUDEPATH += $$PWD/../ubuntu-download-manager-common
-DEPENDPATH += $$PWD/../ubuntu-download-manager-common
-
-LIBS += -L$$OUT_PWD/../ubuntu-download-manager-priv/ -lubuntu-download-manager-priv
-
-INCLUDEPATH += $$PWD/../ubuntu-download-manager-priv
-DEPENDPATH += $$PWD/../ubuntu-download-manager-priv
-
-LIBS += -L$$OUT_PWD/../udm-testing/ -ludm-testing
-
-INCLUDEPATH += $$PWD/../udm-testing
-DEPENDPATH += $$PWD/../udm-testing
-
-LIBS += -L$$OUT_PWD/../ubuntu-download-manager-test-lib/ -lubuntu-download-manager-test-lib
-
-INCLUDEPATH += $$PWD/../ubuntu-download-manager-test-lib
-DEPENDPATH += $$PWD/../ubuntu-download-manager-test-lib

=== modified file 'tests/common/daemon_testcase.cpp'
--- tests/common/daemon_testcase.cpp	2014-11-17 20:57:20 +0000
+++ tests/common/daemon_testcase.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -21,8 +21,10 @@
 #include <QDBusMessage>
 #include <QFile>
 #include <QFileInfo>
+#include <QProcessEnvironment>
 #include <QScopedPointer>
-#include <QProcessEnvironment>
+#include <QThread>
+
 #include "testing_interface.h"
 #include "daemon_testcase.h"
 #define TEST_DAEMON "ubuntu-download-manager-test-daemon"
@@ -105,7 +107,7 @@
             QSKIP(msg.toUtf8(), SkipSingle);
         }
     } else {
-        QFAIL("returnHttpError must be used after init has been executed.");
+        QFAIL("returnAuthError must be used after init has been executed.");
     }
 }
 
@@ -175,6 +177,27 @@
 }
 
 void
+DaemonTestCase::returnHashError(const QString &download, HashErrorStruct error) {
+    if (_daemonProcess != nullptr) {
+        auto conn = QDBusConnection::sessionBus();
+        QScopedPointer<TestingInterface> testingInterface(new TestingInterface(
+                _daemonPath, "/", conn));
+        QDBusPendingReply<> reply =
+                testingInterface->returnHashError(download, error);
+        reply.waitForFinished();
+
+        if (reply.isError()) {
+            auto error = reply.error();
+            QString msg = "Could not tell the daemon to return Hash errors: "
+                    + error.name() + ":" +  error.message();
+            QSKIP(msg.toUtf8(), SkipSingle);
+        }
+    } else {
+        QFAIL("returnHashError must be used after init has been executed.");
+    }
+}
+
+void
 DaemonTestCase::startUDMDaemon() {
     _daemonProcess = new QProcess();
 

=== modified file 'tests/common/daemon_testcase.h'
--- tests/common/daemon_testcase.h	2014-07-03 09:01:01 +0000
+++ tests/common/daemon_testcase.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DAEMON_TESTCASE_H
-#define DAEMON_TESTCASE_H
+#pragma once
 
 #include <QDebug>
 #include <QObject>
@@ -46,6 +45,7 @@
     void returnHttpError(const QString &download, HttpErrorStruct error);
     void returnNetworkError(const QString &download, NetworkErrorStruct error);
     void returnProcessError(const QString &download, ProcessErrorStruct error);
+    void returnHashError(const QString &download, HashErrorStruct error);
 
  private:
     void startUDMDaemon();
@@ -73,4 +73,3 @@
 
 };
 
-#endif // DAEMON_TESTCASE_H

=== modified file 'tests/common/testing_interface.cpp'
--- tests/common/testing_interface.cpp	2014-07-03 09:01:01 +0000
+++ tests/common/testing_interface.cpp	2015-07-24 16:42:57 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp com.canonical.applications.testing.download_manager.xml -p testing_interface -c TestingInterface
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments

=== modified file 'tests/common/testing_interface.h'
--- tests/common/testing_interface.h	2014-07-03 09:01:01 +0000
+++ tests/common/testing_interface.h	2015-07-24 16:42:57 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp com.canonical.applications.testing.download_manager.xml -p testing_interface -c TestingInterface
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -51,6 +51,13 @@
         return asyncCallWithArgumentList(QLatin1String("returnDBusErrors"), argumentList);
     }
 
+    inline QDBusPendingReply<> returnHashError(const QString &download, HashErrorStruct error)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(download) << QVariant::fromValue(error);
+        return asyncCallWithArgumentList(QLatin1String("returnHashError"), argumentList);
+    }
+
     inline QDBusPendingReply<> returnHttpError(const QString &download, HttpErrorStruct error)
     {
         QList<QVariant> argumentList;

=== modified file 'tests/downloads/client/CMakeLists.txt'
--- tests/downloads/client/CMakeLists.txt	2014-11-17 23:07:13 +0000
+++ tests/downloads/client/CMakeLists.txt	2015-07-24 16:42:57 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2014 Canonical Ltd.
+# Copyright © 2014-2015 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
@@ -17,9 +17,10 @@
 
 set(CLIENT_TESTS
         test_client_download
-	#        test_download_manager_watch
-	#        test_download_watch
-	#        test_client_manager
+	test_download_manager_watch
+	test_download_watch
+	test_client_manager
+	test_group_manager_watch
 )
 
 foreach(test ${CLIENT_TESTS})
@@ -59,14 +60,14 @@
 set(CLIENT_TESTS_LIBS
 	${NIH_DBUS_LIBRARIES}
 	${GLOG_LIBRARIES}
-        ${Qt5Network_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
+    ubuntu-download-manager-test-lib
 )
 
 if(DBUS_RUNNER)

=== modified file 'tests/downloads/client/test_client_download.cpp'
--- tests/downloads/client/test_client_download.cpp	2014-09-28 01:15:28 +0000
+++ tests/downloads/client/test_client_download.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -440,4 +440,40 @@
     QCOMPARE(Error::DBus, _down->error()->type());
 }
 
+void
+TestDownload::testHashErrorRaised_data() {
+    QTest::addColumn<QString>("method");
+    QTest::addColumn<QString>("expected");
+    QTest::addColumn<QString>("found");
+
+    QTest::newRow("MD5") << "MD5" << "2323nlkmwe" << "sdscopw";
+    QTest::newRow("SHA524") << "Sha524" << "eww23sds" << "dscbnnt32";
+    QTest::newRow("Ransom") << "Sha245" << "ew23fv4t" << "2edbg92";
+}
+
+void
+TestDownload::testHashErrorRaised() {
+    QFETCH(QString, method);
+    QFETCH(QString, expected);
+    QFETCH(QString, found);
+
+    HashErrorStruct err(method, expected, found);
+    returnHashError(_url, err);
+
+    SignalBarrier spy(_down, SIGNAL(error(Error*)));
+    _down->start();
+
+    QVERIFY(spy.ensureSignalEmitted());
+    QTRY_COMPARE(1, spy.count());
+    auto error = spy.takeFirst().at(0).value<Error*>();
+    QVERIFY(_down->isError());
+    QVERIFY(_down->error() != nullptr);
+    QCOMPARE(Error::Hash, error->type());
+
+    auto hashError = qobject_cast<HashError*>(error);
+    QCOMPARE(method, hashError->method());
+    QCOMPARE(expected, hashError->expected());
+    QCOMPARE(found, hashError->checksum());
+}
+
 QTEST_MAIN(TestDownload)

=== modified file 'tests/downloads/client/test_client_download.h'
--- tests/downloads/client/test_client_download.h	2014-09-08 10:10:43 +0000
+++ tests/downloads/client/test_client_download.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef TEST_DOWNLOAD_H
-#define TEST_DOWNLOAD_H
+#pragma once
 
 #include <QObject>
 #include <ubuntu/download_manager/manager.h>
@@ -61,6 +60,8 @@
     void testNetworkErroRaised();
     void testProcessErrorRaised_data();
     void testProcessErrorRaised();
+    void testHashErrorRaised_data();
+    void testHashErrorRaised();
 
     // set local dir tests
     void testSetLocalDirectory();
@@ -77,4 +78,3 @@
     Download* _down = nullptr;
 };
 
-#endif // TEST_DOWNLOAD_H

=== modified file 'tests/downloads/client/test_client_manager.cpp'
--- tests/downloads/client/test_client_manager.cpp	2014-09-22 12:09:16 +0000
+++ tests/downloads/client/test_client_manager.cpp	2015-07-24 16:42:57 +0000
@@ -165,7 +165,7 @@
 
     // ensure that all of the are created
     QVERIFY(managerSpy.ensureSignalEmitted());
-    QTRY_COMPARE(count, managerSpy.count());
+    QTRY_COMPARE_WITH_TIMEOUT(count, managerSpy.count(), 20000);
     _man->getAllDownloads();
 
     QVERIFY(listSpy.ensureSignalEmitted());

=== modified file 'tests/downloads/client/test_group_manager_watch.h'
--- tests/downloads/client/test_group_manager_watch.h	2014-07-03 09:01:01 +0000
+++ tests/downloads/client/test_group_manager_watch.h	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -16,15 +16,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef TEST_GROUP_WATCH_H
-#define TEST_GROUP_WATCH_H
+#pragma once
 
 #include <functional>
 #include <ubuntu/download_manager/group_download.h>
 #include <ubuntu/download_manager/error.h>
 #include <ubuntu/download_manager/manager.h>
+
 #include <QObject>
-#include <ubuntu/transfers/tests/test_runner.h>
 #include "local_tree_testcase.h"
 
 using namespace Ubuntu::DownloadManager;
@@ -55,4 +54,3 @@
     Manager* _manager = nullptr;
 };
 
-#endif // TEST_GROUP_WATCH_H

=== modified file 'tests/downloads/daemon/CMakeLists.txt'
--- tests/downloads/daemon/CMakeLists.txt	2015-01-22 16:25:08 +0000
+++ tests/downloads/daemon/CMakeLists.txt	2015-07-24 16:42:57 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2014 Canonical Ltd.
+# Copyright © 2014-2015 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
@@ -53,6 +53,7 @@
                 download.h
                 factory.h
                 filename_mutex.h
+                group_download.h
                 manager.h
                 pending_reply.h
                 queue.h

=== modified file 'tests/downloads/daemon/test_download.cpp'
--- tests/downloads/daemon/test_download.cpp	2015-02-02 11:05:15 +0000
+++ tests/downloads/daemon/test_download.cpp	2015-07-24 16:42:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 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
@@ -1374,6 +1374,7 @@
         _isConfined, _rootPath, _url, "imposible-hash-is-not-hex",
         _algo, _metadata, _headers);
 
+    SignalBarrier hashSpy(download, SIGNAL(hashError(HashErrorStruct)));
     SignalBarrier errorSpy(download, SIGNAL(error(QString)));
     SignalBarrier startedSpy(download, SIGNAL(started(bool)));
     SignalBarrier processingSpy(download, SIGNAL(processing(QString)));
@@ -1386,6 +1387,7 @@
 
     // the has is a random string so we should get an error signal
 
+    QVERIFY(hashSpy.ensureSignalEmitted());
     QVERIFY(errorSpy.ensureSignalEmitted());
     QTRY_COMPARE(errorSpy.count(), 1);
     QTRY_COMPARE(processingSpy.count(), 1);

=== modified file 'tests/downloads/daemon/test_final_state.cpp'
--- tests/downloads/daemon/test_final_state.cpp	2014-07-03 09:01:01 +0000
+++ tests/downloads/daemon/test_final_state.cpp	2015-07-24 16:42:57 +0000
@@ -43,10 +43,6 @@
     BaseTestCase::cleanup();
     _stateMachine.removeState(_s1);
     _stateMachine.removeState(_s2);
-    delete _obj;
-    delete _transition;
-    delete _s1;
-    delete _s2;
 }
 
 void

=== modified file 'tests/downloads/qml/CMakeLists.txt'
--- tests/downloads/qml/CMakeLists.txt	2014-11-17 23:07:13 +0000
+++ tests/downloads/qml/CMakeLists.txt	2015-07-24 16:42:57 +0000
@@ -20,18 +20,18 @@
 )
 
 foreach(test ${QML_TESTS})
-        # set the sources per test
-        set(${test}_QML_SOURCES
-                ${test}.cpp
-        )
+    # set the sources per test
+    set(${test}_QML_SOURCES
+            ${test}.cpp
+    )
 
-        set(${test}_QML_HEADERS
-		download.h
-		error.h
-		manager.h
-		testable_single_download.h
-                ${test}.h
-        )
+    set(${test}_QML_HEADERS
+        wnload.h
+        error.h
+	    manager.h
+	    testable_single_download.h
+        ${test}.h
+    )
 
 endforeach(test)
 
@@ -57,30 +57,36 @@
 set(QML_TESTS_LIBS
 	${NIH_DBUS_LIBRARIES}
 	${GLOG_LIBRARIES}
-        ${Qt5Core_LIBRARIES}
-        ${Qt5Sql_LIBRARIES}
-        ${Qt5DBus_LIBRARIES}
+    ${Qt5Core_LIBRARIES}
+    ${Qt5Sql_LIBRARIES}
+    ${Qt5DBus_LIBRARIES}
 	${Qt5Test_LIBRARIES}
-        ${GMOCK_LIBRARY}
-        ${GTEST_BOTH_LIBRARIES}
+    ${GMOCK_LIBRARY}
+    ${GTEST_BOTH_LIBRARIES}
 	udm-common
 	ubuntu-download-manager-common
-        ubuntu-download-manager-test-lib
-        UbuntuDownloadManager
+    ubuntu-download-manager-test-lib
+    UbuntuDownloadManager
 )
 
-foreach(test ${QML_TESTS})
+find_program(XVFB xvfb)
+
+if(XVFB)
+    foreach(test ${QML_TESTS})
         # set targets, linked libs and test
         add_executable(${test}_qml
-                ${${test}_QML_SOURCES}
-                ${${test}_QML_HEADERS}
+            ${${test}_QML_SOURCES}
+            ${${test}_QML_HEADERS}
         )
 
         target_link_libraries(${test}_qml
-                ${QML_TESTS_LIBS}
+            ${QML_TESTS_LIBS}
         )
 
 
-        ADD_TEST(NAME qml_${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test}_qml)
-endforeach(test)
+    ADD_TEST(NAME qml_${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test}_qml)
+    endforeach(test)
+else(XVFB)
+        message(WARNING "dbus-test-runner binary not found tests will be disabled")
+endif(XVFB)