Merge lp:~michael-sheldon/ubuntu-download-manager/persistent-download-model-vivid into lp:ubuntu-download-manager/vivid

[Michael Sheldon]

Provide a persistent download model available between application restarts

Provide a persistent download model available between application restarts

Unmerged revisions

341. By Michael Sheldon on 2015-11-25

Provide a persistent download model available between application restarts

=== modified file '.bzrignore'
--- .bzrignore	2013-11-12 12:30:18 +0000
+++ .bzrignore	2015-11-26 12:58:55 +0000
@@ -12,3 +12,5 @@
 libubuntudownloadmanager-common/libubuntudownloadmanager-common.so.1
 libubuntudownloadmanager-common/libubuntudownloadmanager-common.so.1.0
 libubuntudownloadmanager-common/libubuntudownloadmanager-common.so.1.0.0
+.idea
+build

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-22 14:14:06 +0000
+++ CMakeLists.txt	2015-11-26 12:58:55 +0000
@@ -31,7 +31,7 @@
 )
 
 set(UDM_VERSION_MAJOR 1)
-set(UDM_VERSION_MINOR 1)
+set(UDM_VERSION_MINOR 2)
 set(UDM_VERSION_PATCH 0)
 
 find_package(Gtest REQUIRED)

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-22 15:27:25 +0000
+++ debian/changelog	2015-11-26 12:58:55 +0000
@@ -1,3 +1,11 @@
+ubuntu-download-manager (1.2) UNRELEASED; urgency=medium
+
+  * Provide a shared download history for the downloads model that presents
+    all uncollected downloads from previous app launches.
+  * Update symbol files
+
+ -- Michael Sheldon <[e-mail]>  Wed, 21 Oct 2015 10:03:21 +0100
+
 ubuntu-download-manager (1.1+15.04.20150922.4-0ubuntu1) vivid; urgency=medium
 
   [ Manuel de la Pena ]
@@ -11,6 +19,14 @@
 
  -- Bill Filler <[e-mail]>  Tue, 22 Sep 2015 15:27:25 +0000
 
+ubuntu-download-manager (1.1) UNRELEASED; urgency=medium
+
+  * Ensure that the app id of the application that created the download is
+    present in the metadata and can be accessed via dbus.
+  * Update the symbol files.
+
+ -- Manuel de la Pena <[e-mail]>  Tue, 01 Sep 2015 17:07:58 +0100
+
 ubuntu-download-manager (1.0+15.04-0ubuntu1) wily; urgency=medium
 
   [ Manuel de la Pena ]

=== modified file 'debian/libubuntu-download-manager-client1.symbols'
--- debian/libubuntu-download-manager-client1.symbols	2015-09-22 15:27:25 +0000
+++ debian/libubuntu-download-manager-client1.symbols	2015-11-26 12:58:55 +0000
@@ -95,17 +95,17 @@
  (c++)"Ubuntu::DownloadManager::AuthError::metaObject() const@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::DBusError::metaObject() const@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::HttpError::metaObject() const@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::operator()(Ubuntu::DownloadManager::DownloadsList*) const@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::GroupDownload*)>::operator()(Ubuntu::DownloadManager::GroupDownload*) const@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::Download*)>::operator()(Ubuntu::DownloadManager::Download*) const@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::GroupDownload*)>::function(std::function<void (Ubuntu::DownloadManager::GroupDownload*)> const&)@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::GroupDownload*)>::function(std::function<void (Ubuntu::DownloadManager::GroupDownload*)> const&)@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::Download*)>::function(std::function<void (Ubuntu::DownloadManager::Download*)> const&)@Base" 0.4+14.10.20140618
- (c++)"std::function<void (Ubuntu::DownloadManager::Download*)>::function(std::function<void (Ubuntu::DownloadManager::Download*)> const&)@Base" 0.4+14.10.20140618
- (c++)"std::function<void (QString const&, QString const&, Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (QString const&, QString const&, Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
- (c++)"std::function<void (QString const&, QString const&, Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (QString const&, QString const&, Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (Ubuntu::DownloadManager::GroupDownload*)>::function(std::function<void (Ubuntu::DownloadManager::GroupDownload*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (Ubuntu::DownloadManager::GroupDownload*)>::function(std::function<void (Ubuntu::DownloadManager::GroupDownload*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (Ubuntu::DownloadManager::Download*)>::function(std::function<void (Ubuntu::DownloadManager::Download*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (Ubuntu::DownloadManager::Download*)>::function(std::function<void (Ubuntu::DownloadManager::Download*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (QString const&, QString const&, Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (QString const&, QString const&, Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (QString const&, QString const&, Ubuntu::DownloadManager::DownloadsList*)>::function(std::function<void (QString const&, QString const&, Ubuntu::DownloadManager::DownloadsList*)> const&)@Base" 0.4+14.10.20140618
+ (c++)"std::function<void (Ubuntu::DownloadManager::DownloadsList*)>::operator()(Ubuntu::DownloadManager::DownloadsList*) const@Base" 1.2
+ (c++)"std::function<void (Ubuntu::DownloadManager::GroupDownload*)>::operator()(Ubuntu::DownloadManager::GroupDownload*) const@Base" 1.2
+ (c++)"std::function<void (Ubuntu::DownloadManager::Download*)>::operator()(Ubuntu::DownloadManager::Download*) const@Base" 1.2
  (c++)"typeinfo for Ubuntu::DownloadManager::NetworkError@Base" 0.4+14.10.20140618
  (c++)"typeinfo for Ubuntu::DownloadManager::ProcessError@Base" 0.4+14.10.20140618
  (c++)"typeinfo for Ubuntu::DownloadManager::DownloadsList@Base" 0.4+14.10.20140618

=== modified file 'debian/libubuntu-download-manager-common-dev.install'
--- debian/libubuntu-download-manager-common-dev.install	2014-06-06 10:05:15 +0000
+++ debian/libubuntu-download-manager-common-dev.install	2015-11-26 12:58:55 +0000
@@ -1,4 +1,5 @@
 usr/include/ubuntu/download_manager/metatypes.h
+usr/include/ubuntu/download_manager/download_state_struct.h
 usr/include/ubuntu/download_manager/download_struct.h
 usr/include/ubuntu/download_manager/group_download_struct.h
 usr/lib/*/pkgconfig/ubuntu-download-manager-common.pc

=== modified file 'debian/libubuntu-download-manager-common1.symbols'
--- debian/libubuntu-download-manager-common1.symbols	2015-07-23 14:02:27 +0000
+++ debian/libubuntu-download-manager-common1.symbols	2015-11-26 12:58:55 +0000
@@ -15,14 +15,29 @@
  (c++)"Ubuntu::DownloadManager::DownloadStruct::DownloadStruct(Ubuntu::DownloadManager::DownloadStruct const&)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::DownloadStruct::DownloadStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::DownloadStruct::operator=(Ubuntu::DownloadManager::DownloadStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(QString const&, QString const&, QString const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct()@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(QString const&, QString const&, QString const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct()@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::~GroupDownloadStruct()@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::~GroupDownloadStruct()@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::isValid()@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::DownloadStateStruct(Ubuntu::DownloadManager::DownloadStateStruct const&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::DownloadStateStruct(int, QString const&, QString const&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::DownloadStateStruct(int, QString const&, QString const&, QString const&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::DownloadStateStruct()@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::DownloadStateStruct(Ubuntu::DownloadManager::DownloadStateStruct const&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::DownloadStateStruct(int, QString const&, QString const&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::DownloadStateStruct(int, QString const&, QString const&, QString const&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::operator=(Ubuntu::DownloadManager::DownloadStateStruct const&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::operator<<(QDBusArgument&, Ubuntu::DownloadManager::DownloadStateStruct const&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::operator>>(QDBusArgument const&, Ubuntu::DownloadManager::DownloadStateStruct&)@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::getFilePath() const@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::getUrl() const@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::getHash() const@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::DownloadStateStruct::getState() const@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::~GroupDownloadStruct()@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::~GroupDownloadStruct()@Base" 1.2
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(QString const&, QString const&, QString const&)@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct()@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(QString const&, QString const&, QString const&)@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct(Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::GroupDownloadStruct()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::operator=(Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::operator<<(QDBusArgument&, Ubuntu::DownloadManager::DownloadStruct const&)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::operator<<(QDBusArgument&, Ubuntu::DownloadManager::GroupDownloadStruct const&)@Base" 0.4+14.10.20140618

=== modified file 'debian/libudm-common1.symbols'
--- debian/libudm-common1.symbols	2015-09-22 15:27:25 +0000
+++ debian/libudm-common1.symbols	2015-11-26 12:58:55 +0000
@@ -56,7 +56,7 @@
  (c++)"Ubuntu::Transfers::System::Logger::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::System::Logger::qt_metacast(char const*)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::System::Logger::setLogLevel(QtMsgType)@Base" 0.4+14.10.20140618
- (c++)"Ubuntu::Transfers::System::Logger::toStdString(QString const&)@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::Transfers::System::Logger::toStdString(QString const&)@Base" 0replaceme
  (c++)"Ubuntu::Transfers::System::Logger::setupLogging(QString)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::System::Logger::staticMetaObject@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::System::Logger::getLogDir()@Base" 0.4+14.10.20140618

=== modified file 'docs/dbus/com.canonical.applications.download.xml'
--- docs/dbus/com.canonical.applications.download.xml	2015-09-22 15:25:33 +0000
+++ docs/dbus/com.canonical.applications.download.xml	2015-11-26 12:58:55 +0000
@@ -49,10 +49,19 @@
         <arg name="allowed" type="b" direction="out"/>
     </method>
 
+    <method name="filePath">
+        <arg name="filepath" type="s" direction="out"/>
+    </method>
+
+    <method name="state">
+        <arg name="state" type="i" direction="out"/>
+    </method>
+
     <method name="start" />
     <method name="pause" />
     <method name="resume" />
     <method name="cancel" />
+    <method name="collected" />
 
     <signal name="started">
         <arg name="success" type="b" direction="out"/>

=== modified file 'docs/dbus/com.canonical.applications.download_manager.xml'
--- docs/dbus/com.canonical.applications.download_manager.xml	2014-04-30 14:47:38 +0000
+++ docs/dbus/com.canonical.applications.download_manager.xml	2015-11-26 12:58:55 +0000
@@ -35,6 +35,17 @@
         <arg name="downloads" type="ao" direction="out" />
     </method>
 
+    <method name="getUncollectedDownloads">
+        <arg name="appId" type="s" direction="in"/>
+        <arg name="downloads" type="ao" direction="out"/>
+    </method>
+
+    <method name="getDownloadState">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="DownloadStateStruct"/>
+        <arg name="downloadId" type="s" direction="in"/>
+        <arg name="state" type="(issss)" direction="out"/>
+    </method>
+
     <method name="setDefaultThrottle">
         <arg name="speed" type="t" direction="in"/>
     </method>

=== modified file 'docs/qml/pages/mainpage.qdoc'
--- docs/qml/pages/mainpage.qdoc	2014-06-20 10:10:50 +0000
+++ docs/qml/pages/mainpage.qdoc	2015-11-26 12:58:55 +0000
@@ -35,7 +35,7 @@
 \section1 Components
 Available through:
 \code
-    import Ubuntu.DownloadManager 0.1
+    import Ubuntu.DownloadManager 1.2
 \endcode
 
 \list
@@ -47,8 +47,8 @@
 
 \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.DownloadManager 0.1
+    import Ubuntu.Components 1.2
+    import Ubuntu.DownloadManager 1.2
 
     Rectangle {
         width: units.gu(100)

=== modified file 'docs/qml/pages/moduledef.qdoc'
--- docs/qml/pages/moduledef.qdoc	2014-06-20 10:10:50 +0000
+++ docs/qml/pages/moduledef.qdoc	2015-11-26 12:58:55 +0000
@@ -1,3 +1,3 @@
 /*!
- \qmlmodule Ubuntu.DownloadManager 0.1
+ \qmlmodule Ubuntu.DownloadManager 1.2
 */

=== modified file 'src/common/priv/ubuntu/transfers/queue.cpp'
--- src/common/priv/ubuntu/transfers/queue.cpp	2014-11-24 16:39:17 +0000
+++ src/common/priv/ubuntu/transfers/queue.cpp	2015-11-26 12:58:55 +0000
@@ -127,6 +127,7 @@
             break;
         case Transfer::ERROR:
         case Transfer::FINISH:
+        case Transfer::UNCOLLECTED:
             // remove the registered object in dbus, remove the transfer
             // and the adapter from the list
             if (!_current.isEmpty() && _current == transfer->path())
@@ -177,6 +178,9 @@
             LOG(INFO) << "State is CANCEL || FINISH || ERROR";
             remove(_current);
             _current = "";
+        } else if (state == Transfer::UNCOLLECTED) {
+            LOG(INFO) << "State is UNCOLLECTED";
+            _current = "";
         } else if (!currentTransfer->canTransfer()
                 || state == Transfer::PAUSE) {
             LOG(INFO) << "States is Cannot Transfer || PAUSE";

=== modified file 'src/common/priv/ubuntu/transfers/transfer.cpp'
--- src/common/priv/ubuntu/transfers/transfer.cpp	2014-11-26 12:21:53 +0000
+++ src/common/priv/ubuntu/transfers/transfer.cpp	2015-11-26 12:58:55 +0000
@@ -194,6 +194,13 @@
         startTransfer();
 }
 
+void
+Transfer::collected() {
+    if (state() == Transfer::UNCOLLECTED) {
+        setState(Transfer::FINISH);
+    }
+}
+
 }  // General
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/transfer.h'
--- src/common/priv/ubuntu/transfers/transfer.h	2015-02-02 11:05:15 +0000
+++ src/common/priv/ubuntu/transfers/transfer.h	2015-11-26 12:58:55 +0000
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef UBUNTU_GENERAL_LIB_TRANSFER_H
-#define UBUNTU_GENERAL_LIB_TRANSFER_H
+#pragma once
 
 #include <QObject>
 #include "ubuntu/transfers/system/network_session.h"
@@ -36,6 +35,7 @@
         PAUSE,
         RESUME,
         CANCEL,
+        UNCOLLECTED,
         FINISH,
         ERROR
     };
@@ -78,6 +78,7 @@
     virtual void pause();
     virtual void resume();
     virtual void start();
+    virtual void collected();
 
  signals:
     void canceled(bool success);
@@ -112,5 +113,3 @@
 }  // Transfers
 
 }  // Ubuntu
-
-#endif

=== modified file 'src/common/public/ubuntu/transfers/metadata.cpp'
--- src/common/public/ubuntu/transfers/metadata.cpp	2015-09-22 15:25:33 +0000
+++ src/common/public/ubuntu/transfers/metadata.cpp	2015-11-26 12:58:55 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <QProcessEnvironment>
+#include <QCoreApplication>
 
 #include "metadata.h"
 
@@ -43,6 +44,8 @@
     auto environment = QProcessEnvironment::systemEnvironment();
     if (environment.contains(APP_ID_ENV)) {
         setDestinationApp(environment.value(APP_ID_ENV));
+    } else {
+        setDestinationApp(QCoreApplication::applicationFilePath());
     }
 }
 
@@ -53,6 +56,11 @@
         auto environment = QProcessEnvironment::systemEnvironment();
         environment.contains(APP_ID_ENV);
         setDestinationApp(environment.value(APP_ID_ENV));
+        if (environment.contains(APP_ID_ENV)) {
+            setDestinationApp(environment.value(APP_ID_ENV));
+        } else {
+            setDestinationApp(QCoreApplication::applicationFilePath());
+        }
     }
 }
 

=== modified file 'src/downloads/client/ubuntu/download_manager/download.h'
--- src/downloads/client/ubuntu/download_manager/download.h	2015-09-22 14:54:32 +0000
+++ src/downloads/client/ubuntu/download_manager/download.h	2015-11-26 12:58:55 +0000
@@ -56,6 +56,17 @@
     explicit Download(QObject* parent = 0)
         : QObject(parent) {}
 
+    enum State {
+        IDLE,
+        START,
+        PAUSE,
+        RESUME,
+        CANCEL,
+        UNCOLLECTED,
+        FINISH,
+        ERROR
+    };
+
     /*!
         \fn void Download::start()
 
@@ -97,6 +108,15 @@
     virtual void cancel() = 0;
 
     /*!
+        \fn void Download::collected()
+
+        Notifies the download manager that the finished signal for this
+        download object has been received by the client. This allows UDM
+        to report downloads that have finished while a client isn't running.
+    */
+    virtual void collected() = 0;
+
+    /*!
         \fn void Download::allowMobileDownload(bool allowed)
 
         Notifies the download manager that the download represented by this
@@ -201,6 +221,21 @@
     virtual qulonglong totalSize() = 0;
 
     /*!
+        \fn QString filePath()
+
+        Returns the value of the downloaded file's location. This is only set once
+        the download is complete.
+    */
+    virtual QString filePath() = 0;
+
+    /*!
+        \fn State state()
+
+        Returns the current state of the download.
+    */
+    virtual State state() = 0;
+
+    /*!
         \fn bool isError() const
 
         Returns if the download represented by the object has had an error.

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/download_impl.cpp	2015-09-22 14:54:32 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.cpp	2015-11-26 12:58:55 +0000
@@ -62,6 +62,13 @@
             "Could not connect to signal &DownloadInterface::finished");
     }
 
+    connected = connect(_dbusInterface, &DownloadInterface::finished,
+        this, &DownloadImpl::onFinished);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal &DownloadInterface::finished");
+    }
+
     connected = connect(_dbusInterface, &DownloadInterface::paused,
         this, &Download::paused);
     if (!connected) {
@@ -216,6 +223,19 @@
 }
 
 void
+DownloadImpl::collected() {
+    Logger::log(Logger::Debug, QString("Download{%1} collected()").arg(_id));
+    QDBusPendingReply<> reply =
+        _dbusInterface->collected();
+    // block, the call should be fast enough
+    reply.waitForFinished();
+    if (reply.isError()) {
+        Logger::log(Logger::Error, "Error when setting download collected");
+        setLastError(reply.error());
+    }
+}
+
+void
 DownloadImpl::allowMobileDownload(bool allowed) {
     Logger::log(Logger::Debug,
         QString("Download{%1} allowMobileDownload%2())").arg(_id).arg(allowed));
@@ -304,9 +324,7 @@
     // block, the call should be fast enough
     reply.waitForFinished();
     if (reply.isError()) {
-        qDebug() << "Error setting metadata";
         Logger::log(Logger::Error, "Error setting the download metadata");
-        qDebug() << reply.error();
         setLastError(reply.error());
     }
 }
@@ -362,6 +380,40 @@
 }
 
 QString
+DownloadImpl::filePath() {
+    Logger::log(Logger::Debug, QString("Download{%1} filePath()").arg(_id));
+    QDBusPendingReply<QString> reply =
+        _dbusInterface->filePath();
+    // block, the call is fast enough
+    reply.waitForFinished();
+    if (reply.isError()) {
+        Logger::log(Logger::Error, "Error querying the download file path");
+        setLastError(reply.error());
+        return "";
+    } else {
+        auto result = reply.value();
+        return result;
+    }
+}
+
+Download::State
+DownloadImpl::state() {
+    Logger::log(Logger::Debug, QString("Download{%1} state()").arg(_id));
+    QDBusPendingReply<int> reply =
+        _dbusInterface->state();
+    // block, the call is fast enough
+    reply.waitForFinished();
+    if (reply.isError()) {
+        Logger::log(Logger::Error, "Error querying the download state");
+        setLastError(reply.error());
+        return Download::ERROR;
+    } else {
+        auto result = static_cast<Download::State>(reply.value());
+        return result;
+    }
+}
+
+QString
 DownloadImpl::id() const {
     return _id;
 }
@@ -481,6 +533,13 @@
     }
 }
 
+void DownloadImpl::onFinished(const QString &path) {
+    Q_UNUSED(path);
+    // Inform UDM that we've received the finished signal, so the download
+    // can be considered completely finished.
+    collected();
+}
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.h'
--- src/downloads/client/ubuntu/download_manager/download_impl.h	2015-09-22 14:14:06 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.h	2015-11-26 12:58:55 +0000
@@ -59,6 +59,7 @@
     void pause();
     void resume();
     void cancel();
+    void collected();
 
     void allowMobileDownload(bool allowed);
     bool isMobileDownloadAllowed();
@@ -70,6 +71,8 @@
     void setMetadata(QVariantMap map);
     void setThrottle(qulonglong speed);
     qulonglong throttle();
+    QString filePath();
+    Download::State state();
 
     QString id() const;
     qulonglong progress();
@@ -101,6 +104,7 @@
     void onPropertiesChanged(const QString& interfaceName,
                              const QVariantMap& changedProperties,
                              const QStringList& invalidatedProperties);
+    void onFinished(const QString& path);
 
  private:
     QString _id;

=== modified file 'src/downloads/client/ubuntu/download_manager/download_interface.h'
--- src/downloads/client/ubuntu/download_manager/download_interface.h	2015-09-22 14:54:32 +0000
+++ src/downloads/client/ubuntu/download_manager/download_interface.h	2015-11-26 12:58:55 +0000
@@ -66,6 +66,18 @@
         return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
     }
 
+    inline QDBusPendingReply<> collected()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("collected"), argumentList);
+    }
+
+    inline QDBusPendingReply<QString> filePath()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("filePath"), argumentList);
+    }
+
     inline QDBusPendingReply<StringMap> headers()
     {
         QList<QVariant> argumentList;
@@ -136,6 +148,12 @@
         return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
     }
 
+    inline QDBusPendingReply<int> state()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("state"), argumentList);
+    }
+
     inline QDBusPendingReply<qulonglong> throttle()
     {
         QList<QVariant> argumentList;

=== modified file 'src/downloads/client/ubuntu/download_manager/manager.h'
--- src/downloads/client/ubuntu/download_manager/manager.h	2014-06-06 10:05:15 +0000
+++ src/downloads/client/ubuntu/download_manager/manager.h	2015-11-26 12:58:55 +0000
@@ -216,6 +216,33 @@
                                              MetadataDownloadsListCb errCb) = 0;
 
     /*!
+        \fn void getUncollectedDownloads(const QString &appId)
+
+        Returns uncollected downloads in the download manager that can be accessed
+        by the calling client. If the client is not confined then the downloads
+        returned will be those belonging to the app specified via the appId 
+        parameter, on the other hand if the client is confined the result will 
+        be only those downloads created by the client. The result of the method
+        is returned via the downloadsFound signal.
+    */
+    virtual void getUncollectedDownloads(const QString &appId) = 0;
+
+    /*!
+        \fn void getUncollectedDownloads(const QString &appId)
+
+        Returns uncollected downloads in the download manager that can be accessed
+        by the calling client. If the client is not confined then the downloads
+        returned will be those belonging to the app specified via the appId 
+        parameter, on the other hand if the client is confined the result will 
+        be only those downloads created by the client. . If the method is a
+        success the \a cb is executed else \a errCb is executed.
+    */
+
+    virtual void getUncollectedDownloads(const QString &appId,
+                                         DownloadsListCb cb,
+                                         DownloadsListCb errCb) = 0;
+
+    /*!
         \fn bool isError() const
         Returns if the manager received an error during the execution
         of a command.

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2015-02-25 16:24:24 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.cpp	2015-11-26 12:58:55 +0000
@@ -193,6 +193,29 @@
     }
 }
 
+void
+ManagerImpl::getUncollectedDownloads(const QString &appId) {
+    Logger::log(Logger::Debug, "Manager getUncollectedDownloads()");
+    DownloadsListCb cb = [](DownloadsList*){};
+    getUncollectedDownloads(appId, cb, cb);
+}
+
+void
+ManagerImpl::getUncollectedDownloads(const QString &appId,
+                                     DownloadsListCb cb,
+                                     DownloadsListCb errCb) {
+    Logger::log(Logger::Debug, "Manager getUncollectedDownloads()");
+    QDBusPendingCall call = _dbusInterface->getUncollectedDownloads(appId);
+    auto watcher = new DownloadsListManagerPCW(
+        _conn, _servicePath, call, cb, errCb, this);
+    auto connected = connect(watcher, &GroupManagerPCW::callbackExecuted,
+        this, &ManagerImpl::onWatcherDone);
+    if (!connected) {
+        Logger::log(Logger::Critical,
+            "Could not connect to signal");
+    }
+}
+
 bool
 ManagerImpl::isError() const {
     return _isError;

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_impl.h'
--- src/downloads/client/ubuntu/download_manager/manager_impl.h	2014-06-29 12:45:29 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_impl.h	2015-11-26 12:58:55 +0000
@@ -81,6 +81,10 @@
                                              const QString &value,
                                              MetadataDownloadsListCb cb,
                                              MetadataDownloadsListCb errCb);
+    virtual void getUncollectedDownloads(const QString &appId);
+    virtual void getUncollectedDownloads(const QString &appId,
+                                         DownloadsListCb cb,
+                                         DownloadsListCb errCb);
 
     bool isError() const;
     Error* lastError() const;

=== modified file 'src/downloads/client/ubuntu/download_manager/manager_interface.h'
--- src/downloads/client/ubuntu/download_manager/manager_interface.h	2014-02-26 19:54:31 +0000
+++ src/downloads/client/ubuntu/download_manager/manager_interface.h	2015-11-26 12:58:55 +0000
@@ -89,6 +89,13 @@
         return asyncCallWithArgumentList(QLatin1String("getAllDownloadsWithMetadata"), argumentList);
     }
 
+    inline QDBusPendingReply<QList<QDBusObjectPath> > getUncollectedDownloads(const QString &appId)
+    {   
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(appId);
+        return asyncCallWithArgumentList(QLatin1String("getUncollectedDownloads"), argumentList);
+    }
+
     inline QDBusPendingReply<bool> isGSMDownloadAllowed()
     {
         QList<QVariant> argumentList;

=== modified file 'src/downloads/common/CMakeLists.txt'
--- src/downloads/common/CMakeLists.txt	2014-06-16 12:38:08 +0000
+++ src/downloads/common/CMakeLists.txt	2015-11-26 12:58:55 +0000
@@ -1,12 +1,14 @@
 set(TARGET ubuntu-download-manager-common)
 
 set(SOURCES
+	ubuntu/download_manager/download_state_struct.cpp
 	ubuntu/download_manager/download_struct.cpp
 	ubuntu/download_manager/group_download_struct.cpp
 	ubuntu/download_manager/system/logger.cpp
 )
 
 set(PUBLIC_HEADERS
+	ubuntu/download_manager/download_state_struct.h
 	ubuntu/download_manager/download_struct.h
 	ubuntu/download_manager/group_download_struct.h
 	ubuntu/download_manager/metatypes.h

=== added file 'src/downloads/common/ubuntu/download_manager/download_state_struct.cpp'
--- src/downloads/common/ubuntu/download_manager/download_state_struct.cpp	1970-01-01 00:00:00 +0000
+++ src/downloads/common/ubuntu/download_manager/download_state_struct.cpp	2015-11-26 12:58:55 +0000
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QDBusArgument>
+#include "download_state_struct.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+DownloadStateStruct::DownloadStateStruct()
+    : _state(-1),
+      _url(QString::null),
+      _filePath(QString::null),
+      _hash(QString::null) {
+
+}
+
+DownloadStateStruct::DownloadStateStruct(int state, const QString& url, const QString& hash)
+    : _state(state),
+      _url(url),
+      _filePath(QString::null),
+      _hash(hash) {
+
+}
+
+DownloadStateStruct::DownloadStateStruct(int state, const QString& url, const QString& filePath,
+                                         const QString& hash)
+        : _state(state),
+          _url(url),
+          _filePath(filePath),
+          _hash(hash) {
+
+}
+
+DownloadStateStruct::DownloadStateStruct(const DownloadStateStruct& other)
+        : _state(other._state),
+          _url(other._url),
+          _filePath(other._filePath),
+          _hash(other._hash) {
+}
+
+DownloadStateStruct& DownloadStateStruct::operator=(const DownloadStateStruct& other) {
+    _state = other._state;
+    _url = other._url;
+    _filePath= other._filePath;
+    _hash = other._hash;
+
+    return *this;
+}
+
+QDBusArgument &operator<<(QDBusArgument &argument,
+                          const DownloadStateStruct& download) {
+    argument.beginStructure();
+    argument << download._state;
+    argument << download._url;
+    argument << download._filePath;
+    argument << download._hash;
+    argument.endStructure();
+
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument,
+                                DownloadStateStruct& download) {
+    argument.beginStructure();
+    argument >> download._state;
+    argument >> download._url;
+    argument >> download._filePath;
+    argument >> download._hash;
+    argument.endStructure();
+
+    return argument;
+}
+
+int
+DownloadStateStruct::getState() const {
+    return _state;
+}
+
+QString
+DownloadStateStruct::getUrl() const {
+    return _url;
+}
+
+QString
+DownloadStateStruct::getFilePath() const {
+    return _filePath;
+}
+
+QString
+DownloadStateStruct::getHash() const {
+    return _hash;
+}
+
+bool
+DownloadStateStruct::isValid() {
+    return _url != QString::null;
+}
+
+}  // DownloadManager
+
+}  // Ubuntu
+

=== added file 'src/downloads/common/ubuntu/download_manager/download_state_struct.h'
--- src/downloads/common/ubuntu/download_manager/download_state_struct.h	1970-01-01 00:00:00 +0000
+++ src/downloads/common/ubuntu/download_manager/download_state_struct.h	2015-11-26 12:58:55 +0000
@@ -0,0 +1,149 @@
+/*
+ * 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 DownloadManager {
+
+namespace Daemon {
+class DownloadsDb;
+}
+
+/*!
+    \class DownloadStateStruct
+    \brief The DownloadStateStruct represents the dbus structure that is used
+           to communicate the download manager the details of a past or
+           current download.
+    \since 1.1
+
+    The DownloadStateStruct allows to get the basic information of a download that
+    was created by an application in the download manager.
+*/
+class DownloadStateStruct {
+    Q_PROPERTY(int state READ getState)
+    Q_PROPERTY(QString url READ getUrl)
+    Q_PROPERTY(QString filePath READ getFilePath)
+    Q_PROPERTY(QString hash READ getHash)
+
+    friend class Ubuntu::DownloadManager::Daemon::DownloadsDb;
+
+ public:
+
+    /*
+       Default constructor.
+     */
+    DownloadStateStruct();
+
+    /*
+       Copy constructor.
+    */
+    DownloadStateStruct(const DownloadStateStruct& other);
+
+    /*
+       Assign operator.
+    */
+    DownloadStateStruct& operator=(const DownloadStateStruct& other);
+
+    /*
+        \internal
+    */
+    friend QDBusArgument &operator<<(QDBusArgument &argument,  const DownloadStateStruct& download);
+
+    /*
+        \internal
+    */
+    friend const QDBusArgument &operator>>(const QDBusArgument &argument, DownloadStateStruct& download);
+
+    /*
+       \fn QString getUrl()
+
+       Returns the url that points to the file that will be downloaded.
+    */
+    int getState() const;
+
+    /*
+       \fn QString getUrl()
+
+       Returns the url that points to the file that will be downloaded.
+    */
+    QString getUrl() const;
+
+    /*
+       \fn QString getUrl()
+
+       Returns the url that points to the file that will be downloaded.
+    */
+    QString getFilePath() const;
+
+    /*
+       \fn QString getUrl()
+
+       Returns the url that points to the file that will be downloaded.
+    */
+    QString getHash() const;
+
+    /*
+       \fn bool isValid();
+
+       Returns if the download state if valid.
+    */
+    bool isValid();
+
+ protected:
+
+    /*
+        \internal
+    */
+    DownloadStateStruct(int state, const QString& url, const QString& hash=QString::null);
+
+    /*
+        \internal
+    */
+    DownloadStateStruct(int state, const QString& url, const QString& filePath, const QString& hash=QString::null);
+
+ private:
+
+    /*
+        \internal
+    */
+    int _state = -1;
+
+    /*
+        \internal
+    */
+    QString _url = QString::null;
+
+    /*
+        \internal
+    */
+    QString _filePath = QString::null;
+
+    /*
+        \internal
+    */
+    QString _hash = QString::null;
+};
+
+}
+
+}
\ No newline at end of file

=== modified file 'src/downloads/common/ubuntu/download_manager/metatypes.h'
--- src/downloads/common/ubuntu/download_manager/metatypes.h	2015-02-25 16:24:24 +0000
+++ src/downloads/common/ubuntu/download_manager/metatypes.h	2015-11-26 12:58:55 +0000
@@ -25,6 +25,7 @@
 #include <ubuntu/transfers/errors/http_error_struct.h>
 #include <ubuntu/transfers/errors/network_error_struct.h>
 #include <ubuntu/transfers/errors/process_error_struct.h>
+#include "download_state_struct.h"
 #include "download_struct.h"
 #include "group_download_struct.h"
 
@@ -40,6 +41,7 @@
 Q_DECLARE_METATYPE(NetworkErrorStruct)
 Q_DECLARE_METATYPE(ProcessErrorStruct)
 Q_DECLARE_METATYPE(DownloadStruct)
+Q_DECLARE_METATYPE(DownloadStateStruct)
 Q_DECLARE_METATYPE(StringMap)
 Q_DECLARE_METATYPE(StructList)
 

=== modified file 'src/downloads/priv/CMakeLists.txt'
--- src/downloads/priv/CMakeLists.txt	2014-11-17 23:07:13 +0000
+++ src/downloads/priv/CMakeLists.txt	2015-11-26 12:58:55 +0000
@@ -12,7 +12,7 @@
 	ubuntu/downloads/file_download.cpp
 	ubuntu/downloads/group_download.cpp
 	ubuntu/downloads/group_download_adaptor.cpp
-        ubuntu/downloads/header_parser.cpp
+	ubuntu/downloads/header_parser.cpp
 	ubuntu/downloads/manager.cpp
 	ubuntu/downloads/mms_file_download.cpp
 	ubuntu/downloads/sm_file_download.cpp
@@ -33,7 +33,7 @@
 	ubuntu/downloads/file_download.h
 	ubuntu/downloads/group_download.h
 	ubuntu/downloads/group_download_adaptor.h
-        ubuntu/downloads/header_parser.h
+	ubuntu/downloads/header_parser.h
 	ubuntu/downloads/manager.h
 	ubuntu/downloads/mms_file_download.h
 	ubuntu/downloads/sm_file_download.h

=== modified file 'src/downloads/priv/ubuntu/downloads/download.h'
--- src/downloads/priv/ubuntu/downloads/download.h	2015-09-22 14:54:32 +0000
+++ src/downloads/priv/ubuntu/downloads/download.h	2015-11-26 12:58:55 +0000
@@ -105,6 +105,7 @@
     // slots to be implemented by the children
     virtual qulonglong progress() = 0;
     virtual qulonglong totalSize() = 0;
+    virtual QString filePath() = 0;
 
  signals:
     // signals that are exposed via dbus

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.cpp'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.cpp	2015-09-22 14:54:32 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.cpp	2015-11-26 12:58:55 +0000
@@ -69,6 +69,20 @@
     QMetaObject::invokeMethod(parent(), "cancel");
 }
 
+void DownloadAdaptor::collected()
+{
+    // handle method call com.canonical.applications.Download.collected
+    QMetaObject::invokeMethod(parent(), "collected");
+}
+
+QString DownloadAdaptor::filePath()
+{
+    // handle method call com.canonical.applications.Download.filePath
+    QString filePath;
+    QMetaObject::invokeMethod(parent(), "filePath", Q_RETURN_ARG(QString, filePath));
+    return filePath;    
+}
+
 StringMap DownloadAdaptor::headers()
 {
     // handle method call com.canonical.applications.Download.headers
@@ -143,6 +157,14 @@
     QMetaObject::invokeMethod(parent(), "start");
 }
 
+int DownloadAdaptor::state()
+{
+    // handle method call com.canonical.applications.Download.state
+    int state;
+    QMetaObject::invokeMethod(parent(), "state", Q_RETURN_ARG(int, state));
+    return state;
+}
+
 qulonglong DownloadAdaptor::throttle()
 {
     // handle method call com.canonical.applications.Download.throttle

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.h'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.h	2015-09-22 14:54:32 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.h	2015-11-26 12:58:55 +0000
@@ -9,8 +9,8 @@
  * before re-generating it.
  */
 
-#ifndef DOWNLOAD_ADAPTOR_H_1440513488
-#define DOWNLOAD_ADAPTOR_H_1440513488
+#ifndef DOWNLOAD_ADAPTOR_H_1446124951
+#define DOWNLOAD_ADAPTOR_H_1446124951
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
@@ -71,10 +71,17 @@
 "    <method name=\"isGSMDownloadAllowed\">\n"
 "      <arg direction=\"out\" type=\"b\" name=\"allowed\"/>\n"
 "    </method>\n"
+"    <method name=\"filePath\">\n"
+"      <arg direction=\"out\" type=\"s\" name=\"filepath\"/>\n"
+"    </method>\n"
+"    <method name=\"state\">\n"
+"      <arg direction=\"out\" type=\"i\" name=\"state\"/>\n"
+"    </method\n"
 "    <method name=\"start\"/>\n"
 "    <method name=\"pause\"/>\n"
 "    <method name=\"resume\"/>\n"
 "    <method name=\"cancel\"/>\n"
+"    <method name=\"collected\"/>\n"
 "    <signal name=\"started\">\n"
 "      <arg direction=\"out\" type=\"b\" name=\"success\"/>\n"
 "    </signal>\n"
@@ -146,6 +153,8 @@
 public Q_SLOTS: // METHODS
     void allowGSMDownload(bool allowed);
     void cancel();
+    void collected();
+    QString filePath();
     StringMap headers();
     bool isGSMDownloadAllowed();
     QVariantMap metadata();
@@ -157,6 +166,7 @@
     void setMetadata(const QVariantMap &data);
     void setThrottle(qulonglong speed);
     void start();
+    int state();
     qulonglong throttle();
     qulonglong totalSize();
 Q_SIGNALS: // SIGNALS

=== modified file 'src/downloads/priv/ubuntu/downloads/download_manager_adaptor.cpp'
--- src/downloads/priv/ubuntu/downloads/download_manager_adaptor.cpp	2014-03-18 12:07:06 +0000
+++ src/downloads/priv/ubuntu/downloads/download_manager_adaptor.cpp	2015-11-26 12:58:55 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -c DownloadManagerAdaptor -a download_manager_adaptor.h:download_manager_adaptor.cpp -i metatypes.h com.canonical.applications.download_manager.xml
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
@@ -99,6 +99,22 @@
     return downloads;
 }
 
+QList<QDBusObjectPath> DownloadManagerAdaptor::getUncollectedDownloads(const QString &appId)
+{
+    // handle method call com.canonical.applications.DownloadManager.getUncollectedDownloads
+    QList<QDBusObjectPath> downloads;
+    QMetaObject::invokeMethod(parent(), "getUncollectedDownloads", Q_RETURN_ARG(QList<QDBusObjectPath>, downloads), Q_ARG(QString, appId));
+    return downloads;
+}
+
+DownloadStateStruct DownloadManagerAdaptor::getDownloadState(const QString &downloadId)
+{
+    // handle method call com.canonical.applications.DownloadManager.getDownloadState
+    DownloadStateStruct state;
+    QMetaObject::invokeMethod(parent(), "getDownloadState", Q_RETURN_ARG(DownloadStateStruct, state), Q_ARG(QString, downloadId));
+    return state;
+}
+
 bool DownloadManagerAdaptor::isGSMDownloadAllowed()
 {
     // handle method call com.canonical.applications.DownloadManager.isGSMDownloadAllowed

=== modified file 'src/downloads/priv/ubuntu/downloads/download_manager_adaptor.h'
--- src/downloads/priv/ubuntu/downloads/download_manager_adaptor.h	2014-03-18 12:07:06 +0000
+++ src/downloads/priv/ubuntu/downloads/download_manager_adaptor.h	2015-11-26 12:58:55 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -c DownloadManagerAdaptor -a download_manager_adaptor.h:download_manager_adaptor.cpp -i metatypes.h com.canonical.applications.download_manager.xml
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2015 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
@@ -70,6 +70,15 @@
 "      <arg direction=\"in\" type=\"s\" name=\"value\"/>\n"
 "      <arg direction=\"out\" type=\"ao\" name=\"downloads\"/>\n"
 "    </method>\n"
+"    <method name=\"getUncollectedDownloads\">\n"
+"      <arg direction=\"in\" type=\"s\" name=\"appId\"/>\n"
+"      <arg direction=\"out\" type=\"ao\" name=\"downloads\"/>\n"
+"    </method>\n"
+"    <method name=\"getDownloadState\">\n"
+"      <annotation value=\"DownloadStateStruct\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
+"      <arg direction=\"in\" type=\"s\" name=\"downloadId\"/>\n"
+"      <arg direction=\"out\" type=\"(issss)\" name=\"state\"/>\n"
+"    </method>\n"
 "    <method name=\"setDefaultThrottle\">\n"
 "      <arg direction=\"in\" type=\"t\" name=\"speed\"/>\n"
 "    </method>\n"
@@ -102,6 +111,8 @@
     void exit();
     QList<QDBusObjectPath> getAllDownloads();
     QList<QDBusObjectPath> getAllDownloadsWithMetadata(const QString &name, const QString &value);
+    DownloadStateStruct getDownloadState(const QString &downloadId);
+    QList<QDBusObjectPath> getUncollectedDownloads(const QString &appId);
     bool isGSMDownloadAllowed();
     void setDefaultThrottle(qulonglong speed);
 Q_SIGNALS: // SIGNALS

=== modified file 'src/downloads/priv/ubuntu/downloads/downloads_db.cpp'
--- src/downloads/priv/ubuntu/downloads/downloads_db.cpp	2014-04-15 15:15:28 +0000
+++ src/downloads/priv/ubuntu/downloads/downloads_db.cpp	2015-11-26 12:58:55 +0000
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include "ubuntu/transfers/system/logger.h"
 #include "downloads_db.h"
+#include "download_adaptor.h"
 
 namespace {
     const QString SINGLE_DOWNLOAD_TABLE = "CREATE TABLE IF NOT EXISTS SingleDownload("\
@@ -75,14 +76,26 @@
         "throttle=:throttle, metadata=:metadata, headers=:headers "\
         "WHERE uuid=:uuid";
 
+    const QString GET_SINGLE_DOWNLOAD_STATE = "SELECT state, url, local_path, hash FROM SingleDownload "\
+        "WHERE uuid=:uuid";
+
+    const QString GET_UNCOLLECTED_DOWNLOADS = "SELECT uuid, appId, url, dbus_path, "\
+        "local_path, hash, hash_algo, state FROM SingleDownload "\
+        "WHERE appId=:appId AND state='uncoll'";
+
+    const QString UPDATE_UNCOLLECTED_DOWNLOADS = "UPDATE SingleDownload SET state='finish' "\
+        "WHERE state='uncoll' AND appId=:appId";
+
     const QString IDLE_STRING = "idle";
     const QString START_STRING = "start";
     const QString PAUSE_STRING = "pause";
     const QString RESUME_STRING = "resume";
     const QString CANCEL_STRING = "cancel";
+    const QString UNCOLLECTED_STRING = "uncoll";
     const QString FINISH_STRING = "finish";
     const QString ERROR_STRING = "error";
 
+    const QString DOWNLOAD_INTERFACE = "com.canonical.applications.Download";
 }
 
 namespace Ubuntu {
@@ -178,6 +191,8 @@
             return RESUME_STRING;
         case Download::CANCEL:
             return CANCEL_STRING;
+        case Download::UNCOLLECTED:
+            return UNCOLLECTED_STRING;
         case Download::FINISH:
             return FINISH_STRING;
         case Download::ERROR:
@@ -200,6 +215,8 @@
         return Download::RESUME;
     if (lowerState == CANCEL_STRING)
         return Download::CANCEL;
+    if (lowerState == UNCOLLECTED_STRING)
+        return Download::UNCOLLECTED;
     if (lowerState == FINISH_STRING)
         return Download::FINISH;
     if (lowerState == ERROR_STRING)
@@ -235,6 +252,94 @@
     return false;
 }
 
+DownloadStateStruct
+DownloadsDb::getDownloadState(const QString &downloadId) {
+    bool opened = _db.open();
+
+    if (!opened) {
+        LOG(ERROR) << _db.lastError().text();
+        return DownloadStateStruct();
+    }
+
+    QSqlQuery query;
+    // QString GET_SINGLE_DOWNLOAD_STATE = "SELECT state, url, local_path, hash FROM SingleDownload "
+    //     "WHERE uuid=:uuid";
+    query.prepare(GET_SINGLE_DOWNLOAD_STATE);
+    query.bindValue(":uuid", downloadId);
+
+    bool success = query.exec();
+    if (success && query.next()) {
+        // grab the data and create the state structure
+        auto state = stringToState(query.value(0).toString());
+        auto url = query.value(1).toString();
+        auto localPath = query.value(2).toString();
+        auto hash = query.value(3).isValid()?query.value(3).toString():"";
+
+        DownloadStateStruct result(state, url, localPath, hash);
+        _db.close();
+
+        return result;
+    }
+    if (!success) {
+        LOG(ERROR) << query.lastError().text();
+    }
+    return DownloadStateStruct();
+}
+
+QList<Download*>
+DownloadsDb::getUncollectedDownloads(const QString &appId) {
+    bool opened = _db.open();
+    QList<Download*> downloadList;
+
+    if (!opened) {
+        LOG(ERROR) << _db.lastError().text();
+        return downloadList;
+    }
+
+    QSqlQuery query;
+    query.prepare(GET_UNCOLLECTED_DOWNLOADS);
+    query.bindValue(":appId", appId);
+
+    bool success = query.exec();
+    if (!success) {
+        LOG(ERROR) << query.lastError().text();
+        _db.close();
+        return downloadList;
+    }
+    while (query.next()) {
+        auto uuid = query.value(0).toString();
+        auto appId = query.value(1).toString();
+        auto url = query.value(2).toString();
+        auto dbusPath = query.value(3).toString();
+        auto filePath = query.value(4).toString();
+        auto basePath = QFileInfo(filePath).absolutePath();
+        auto hash = query.value(5).isValid() ? query.value(5).toString() : "";
+        auto algo = query.value(6).isValid() ? query.value(6).toString() : "";
+        auto state = stringToState(query.value(7).toString());
+        QVariantMap metadata;
+        QMap<QString, QString> headers;
+        FileDownload *download = new FileDownload(uuid, appId, dbusPath, 1, basePath, url, hash, algo, metadata, headers);
+        download->setState(state);
+        download->setFilePath(filePath);
+        auto downAdaptor = new DownloadAdaptor(download);
+        download->setAdaptor(DOWNLOAD_INTERFACE, downAdaptor);
+
+        downloadList << download;
+
+    }
+
+    QSqlQuery updateQuery;
+    updateQuery.prepare(UPDATE_UNCOLLECTED_DOWNLOADS);
+    updateQuery.bindValue(":appId", appId);
+    success = updateQuery.exec();
+    if (!success) {
+        LOG(ERROR) << updateQuery.lastError().text();
+    }
+
+    _db.close();
+    return downloadList;
+}
+
 bool
 DownloadsDb::storeSingleDownload(FileDownload* download) {
     // decide if we store it as a new download or update an existing one

=== modified file 'src/downloads/priv/ubuntu/downloads/downloads_db.h'
--- src/downloads/priv/ubuntu/downloads/downloads_db.h	2014-02-26 16:23:46 +0000
+++ src/downloads/priv/ubuntu/downloads/downloads_db.h	2015-11-26 12:58:55 +0000
@@ -16,12 +16,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_DOWNLOADS_DATABASE_H
-#define DOWNLOADER_LIB_DOWNLOADS_DATABASE_H
+#pragma once
 
 #include <QSqlDatabase>
 #include <QObject>
-#include "ubuntu/transfers/system/file_manager.h"
+
+#include <ubuntu/transfers/system/file_manager.h>
+#include <ubuntu/download_manager/download_state_struct.h>
+
 #include "file_download.h"
 
 namespace Ubuntu {
@@ -45,7 +47,11 @@
     QString filename();
     bool dbExists();  // return if the db is present and valid
     bool init();  // init or update the db
+
     virtual bool store(Download* down);
+    virtual DownloadStateStruct getDownloadState(const QString &downloadId);
+    virtual QList<Download*> getUncollectedDownloads(const QString &appId);
+
     bool storeSingleDownload(FileDownload* download);
     void connectToDownload(Download* download);
     void disconnectFromDownload(Download* download);
@@ -78,5 +84,3 @@
 }  // DownloadManager
 
 }  // Ubuntu
-
-#endif  // DOWNLOADER_LIB_DOWNLOADS_DATABASE_H

=== modified file 'src/downloads/priv/ubuntu/downloads/factory.cpp'
--- src/downloads/priv/ubuntu/downloads/factory.cpp	2014-10-22 23:32:28 +0000
+++ src/downloads/priv/ubuntu/downloads/factory.cpp	2015-11-26 12:58:55 +0000
@@ -80,7 +80,13 @@
     QScopedPointer<SecurityDetails> details(
         getSecurityDetails(dbusOwner, metadata));
     auto dbusPath = details->dbusPath.arg("download");
-    auto down = new FileDownload(details->id, details->appId,
+    QString appId = details->appId;
+    if (!details->isConfined && metadata.contains(Metadata::APP_ID)) {
+        // If we're unconfined use the metadata app id to
+        // distinguish between different unconfined apps
+        appId = metadata[Metadata::APP_ID].toString();
+    }
+    auto down = new FileDownload(details->id, appId,
         dbusPath, details->isConfined, details->localPath, url, metadata, headers);
     auto downAdaptor = new DownloadAdaptor(down);
     down->setAdaptor(DOWNLOAD_INTERFACE, downAdaptor);

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.cpp'
--- src/downloads/priv/ubuntu/downloads/file_download.cpp	2015-02-25 16:24:24 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.cpp	2015-11-26 12:58:55 +0000
@@ -1095,7 +1095,7 @@
         }
     }
 
-    setState(Download::FINISH);
+    setState(Download::UNCOLLECTED);
     unlockFilePath();
 
     DOWN_LOG(INFO) << "EMIT finished" << filePath();
@@ -1211,6 +1211,18 @@
     Download::emitError(error);
 }
 
+void
+FileDownload::setFilePath(const QString& filePath) {
+    // Used to recreate downloads from the database with the correct path
+    _fileNameMutex->unlockFileName(_filePath);
+    _filePath = filePath;
+}
+
+QString
+FileDownload::filePath() {
+    return _filePath;
+}
+
 }  // Daemon
 
 }  // DownloadManager

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.h'
--- src/downloads/priv/ubuntu/downloads/file_download.h	2015-02-25 16:24:24 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.h	2015-11-26 12:58:55 +0000
@@ -71,10 +71,6 @@
         return _url;
     }
 
-    virtual QString filePath() const {
-        return _filePath;
-    }
-
     virtual QString hash() const {
         return _hash;
     }
@@ -89,6 +85,8 @@
     virtual void resumeTransfer() override;
     virtual void startTransfer() override;
 
+    void setFilePath(const QString& path);
+
  public slots:  // NOLINT(whitespace/indent)
     qulonglong progress() override;
     qulonglong totalSize() override;
@@ -96,6 +94,7 @@
     virtual void setDestinationDir(const QString& path);
     virtual void setHeaders(StringMap headers) override;
     virtual void setMetadata(const QVariantMap& metadata) override;
+    virtual QString filePath() override;
 
  signals:
     void finished(const QString& path);

=== modified file 'src/downloads/priv/ubuntu/downloads/group_download.cpp'
--- src/downloads/priv/ubuntu/downloads/group_download.cpp	2014-05-21 15:17:52 +0000
+++ src/downloads/priv/ubuntu/downloads/group_download.cpp	2015-11-26 12:58:55 +0000
@@ -275,6 +275,13 @@
     return total;
 }
 
+QString
+GroupDownload::filePath() {
+    // A group download never has a file path of its own, each individual
+    // download within the group has its own path
+    return "";
+}
+
 void
 GroupDownload::onError(const QString& error) {
     TRACE;

=== modified file 'src/downloads/priv/ubuntu/downloads/group_download.h'
--- src/downloads/priv/ubuntu/downloads/group_download.h	2014-10-22 23:40:53 +0000
+++ src/downloads/priv/ubuntu/downloads/group_download.h	2015-11-26 12:58:55 +0000
@@ -63,6 +63,7 @@
     virtual qulonglong progress(qulonglong &started, qulonglong &paused,
         qulonglong &finished);
     virtual qulonglong totalSize() override;
+    virtual QString filePath() override;
 
  signals:
     void finished(const QStringList &path);

=== modified file 'src/downloads/priv/ubuntu/downloads/manager.cpp'
--- src/downloads/priv/ubuntu/downloads/manager.cpp	2015-09-22 14:14:06 +0000
+++ src/downloads/priv/ubuntu/downloads/manager.cpp	2015-11-26 12:58:55 +0000
@@ -334,6 +334,45 @@
     return paths;
 }
 
+QList<QDBusObjectPath>
+DownloadManager::getUncollectedDownloads(const QString &appId) {
+    QScopedPointer<System::AppArmor> appArmor(new System::AppArmor(_conn));
+    auto owner = getCaller();
+    auto callerAppId = appArmor->appId(owner);
+    QList<QDBusObjectPath> paths;
+    QString testAppId = appId;
+    if (appArmor->isConfined(callerAppId)) {
+        // Confined apps always get their own downloads returned
+        testAppId = callerAppId;
+    }
+
+    LOG(INFO) << "Returning uncollected downloads for app with id" << testAppId;
+
+    // Fetch uncollected downloads that are still in memory
+    auto transfers = _queue->transfers();
+    foreach(const QString& path, transfers.keys()) {
+        auto t = transfers[path];
+        if (t->transferAppId() == testAppId && t->state() != Transfer::FINISH
+                                            && t->state() != Transfer::CANCEL
+                                            && t->state() != Transfer::ERROR)
+            paths << QDBusObjectPath(path);
+    }
+
+    // Fetch uncollected downloads from previous UDM sessions that are
+    // in the database
+    foreach(Download *download, _db->getUncollectedDownloads(testAppId)) {
+        _conn->registerObject(download->path(), download);
+        paths << QDBusObjectPath(download->path());
+    }
+
+    return paths;
+}
+
+DownloadStateStruct
+DownloadManager::getDownloadState(const QString &downloadId) {
+    return _db->getDownloadState(downloadId);
+}
+
 }  // Daemon
 
 }  // DownloadManager

=== modified file 'src/downloads/priv/ubuntu/downloads/manager.h'
--- src/downloads/priv/ubuntu/downloads/manager.h	2015-08-27 09:02:19 +0000
+++ src/downloads/priv/ubuntu/downloads/manager.h	2015-11-26 12:58:55 +0000
@@ -18,14 +18,17 @@
 
 #pragma once
 
+#include <functional>
+
+#include <QByteArray>
+#include <QDBusObjectPath>
 #include <QObject>
-#include <QByteArray>
-#include <QtDBus/QDBusObjectPath>
 #include <QSslCertificate>
+
 #include <ubuntu/transfers/queue.h>
 #include <ubuntu/transfers/system/dbus_connection.h>
 #include <ubuntu/download_manager/metatypes.h>
-#include <functional>
+
 #include "ubuntu/transfers/base_manager.h"
 #include "ubuntu/transfers/system/application.h"
 #include "download.h"
@@ -83,6 +86,9 @@
     virtual QList<QDBusObjectPath> getAllDownloadsWithMetadata(
                                                       const QString& name,
                                                       const QString& value);
+    virtual QList<QDBusObjectPath> getUncollectedDownloads(
+                                                      const QString& appId);
+    virtual DownloadStateStruct getDownloadState(const QString &downloadId);
  signals:
     void downloadCreated(const QDBusObjectPath& path);
 

=== modified file 'src/downloads/priv/ubuntu/downloads/state_machines/download_sm.h'
--- src/downloads/priv/ubuntu/downloads/state_machines/download_sm.h	2014-02-21 12:46:26 +0000
+++ src/downloads/priv/ubuntu/downloads/state_machines/download_sm.h	2015-11-26 12:58:55 +0000
@@ -157,6 +157,7 @@
     static QString POST_PROCESSING;
     static QString ERROR;
     static QString CANCELED;
+    static QString UNCOLLECTED;
     static QString FINISHED;
 
  signals:

=== modified file 'src/downloads/qml/CMakeLists.txt'
--- src/downloads/qml/CMakeLists.txt	2014-09-05 14:40:54 +0000
+++ src/downloads/qml/CMakeLists.txt	2015-11-26 12:58:55 +0000
@@ -5,6 +5,7 @@
     backend.cpp
     metadata.cpp
     download_error.cpp
+    download_history.cpp
     single_download.cpp
     ubuntu_download_manager.cpp
 )
@@ -13,6 +14,7 @@
     backend.h
     metadata.h
     download_error.h
+    download_history.h
     single_download.h
     ubuntu_download_manager.h
 )

=== modified file 'src/downloads/qml/backend.cpp'
--- src/downloads/qml/backend.cpp	2014-09-23 10:38:11 +0000
+++ src/downloads/qml/backend.cpp	2015-11-26 12:58:55 +0000
@@ -15,6 +15,10 @@
     qmlRegisterType<Ubuntu::DownloadManager::Metadata>(uri, 0, 1, "Metadata");
     qmlRegisterType<Ubuntu::DownloadManager::SingleDownload>(uri, 0, 1, "SingleDownload");
     qmlRegisterType<Ubuntu::DownloadManager::UbuntuDownloadManager>(uri, 0, 1, "DownloadManager");
+    qmlRegisterType<Ubuntu::DownloadManager::DownloadError>(uri, 1, 2, "Error");
+    qmlRegisterType<Ubuntu::DownloadManager::Metadata>(uri, 1, 2, "Metadata");
+    qmlRegisterType<Ubuntu::DownloadManager::SingleDownload>(uri, 1, 2, "SingleDownload");
+    qmlRegisterType<Ubuntu::DownloadManager::UbuntuDownloadManager>(uri, 1, 2, "DownloadManager");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== added file 'src/downloads/qml/download_history.cpp'
--- src/downloads/qml/download_history.cpp	1970-01-01 00:00:00 +0000
+++ src/downloads/qml/download_history.cpp	2015-11-26 12:58:55 +0000
@@ -0,0 +1,143 @@
+#include "download_history.h"
+#include <glog/logging.h>
+#include <ubuntu/download_manager/download_struct.h>
+#include <QCoreApplication>
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+DownloadHistory::DownloadHistory(QObject *parent) :
+    QObject(parent),
+    m_manager(nullptr)
+{
+    m_manager = Manager::createSessionManager("", this);
+
+    CHECK(connect(m_manager, &Manager::downloadsFound,
+        this, &DownloadHistory::downloadsFound))
+            << "Could not connect to signal";
+
+    // Get previous downloads for this app
+    auto environment = QProcessEnvironment::systemEnvironment();
+    if (environment.contains("APP_ID")) {
+        m_manager->getUncollectedDownloads(environment.value("APP_ID"));
+    } else {
+        m_manager->getUncollectedDownloads(QCoreApplication::applicationFilePath());
+    }
+}
+
+DownloadHistory *DownloadHistory::instance()
+{
+    static DownloadHistory *downloadHistory = new DownloadHistory();
+    return downloadHistory;
+}
+
+QVariantList DownloadHistory::downloads() const
+{
+    return m_downloads;
+}
+
+void DownloadHistory::addDownload(SingleDownload *singleDownload)
+{
+    m_downloads.append(QVariant::fromValue(singleDownload));
+    CHECK(connect(singleDownload, &SingleDownload::finished,
+        this, &DownloadHistory::downloadCompleted))
+            << "Could not connect to signal";
+    CHECK(connect(singleDownload, &SingleDownload::errorFound,
+        this, &DownloadHistory::onError))
+            << "Could not connect to signal";
+    CHECK(connect(singleDownload, &SingleDownload::paused,
+        this, &DownloadHistory::onPaused))
+            << "Could not connect to signal";
+    CHECK(connect(singleDownload, &SingleDownload::resumed,
+        this, &DownloadHistory::onResumed))
+            << "Could not connect to signal";
+    CHECK(connect(singleDownload, &SingleDownload::canceled,
+        this, &DownloadHistory::onCanceled))
+            << "Could not connect to signal";
+    emit downloadsChanged();
+}
+
+void DownloadHistory::downloadsFound(DownloadsList* downloadsList)
+{
+    foreach(QSharedPointer<Download> download, downloadsList->downloads()) {
+        SingleDownload* singleDownload = new SingleDownload(this);
+        singleDownload->bindDownload(download.data());
+        if (download->state() == Download::UNCOLLECTED && !download->filePath().isEmpty()) {
+            emit singleDownload->finished(download.data()->filePath());
+        }
+    }
+    emit downloadsChanged();
+}
+
+bool DownloadHistory::cleanDownloads() const
+{
+    return m_cleanDownloads;
+}
+
+void DownloadHistory::setCleanDownloads(bool value)
+{
+    m_cleanDownloads = value;
+    if (m_cleanDownloads) {
+        QVariantList newList;
+        foreach(QVariant var, m_downloads) {
+            SingleDownload *download = qobject_cast<SingleDownload*>(var.value<SingleDownload*>());
+            if (download != nullptr && !download->isCompleted()) {
+                newList.append(QVariant::fromValue(download));
+            } else {
+                download->deleteLater();
+            }
+        }
+        m_downloads = newList;
+        emit downloadsChanged();
+    }
+}
+
+void DownloadHistory::downloadCompleted(const QString& path)
+{
+    SingleDownload* download = qobject_cast<SingleDownload*>(sender());
+    if (download != nullptr) {
+        emit downloadFinished(download, path);
+        if (m_cleanDownloads) {
+            int index = m_downloads.indexOf(QVariant::fromValue(download));
+            m_downloads.removeAt(index);
+            emit downloadsChanged();
+        }
+    }
+}
+
+void DownloadHistory::onError(DownloadError& downloadError)
+{
+    Q_UNUSED(downloadError);
+    SingleDownload* download = qobject_cast<SingleDownload*>(sender());
+    if (download != nullptr) {
+        emit errorFound(download);
+    }
+}
+
+void DownloadHistory::onPaused()
+{
+    SingleDownload* download = qobject_cast<SingleDownload*>(sender());
+    if (download != nullptr) {
+        emit downloadPaused(download);
+    }
+}
+
+void DownloadHistory::onResumed()
+{
+    SingleDownload* download = qobject_cast<SingleDownload*>(sender());
+    if (download != nullptr) {
+        emit downloadResumed(download);
+    }
+}
+
+void DownloadHistory::onCanceled()
+{
+    SingleDownload* download = qobject_cast<SingleDownload*>(sender());
+    if (download != nullptr) {
+        emit downloadCanceled(download);
+    }
+}
+
+}
+}

=== added file 'src/downloads/qml/download_history.h'
--- src/downloads/qml/download_history.h	1970-01-01 00:00:00 +0000
+++ src/downloads/qml/download_history.h	2015-11-26 12:58:55 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+#ifndef DOWNLOAD_HISTORY_H
+#define DOWNLOAD_HISTORY_H
+
+#include <ubuntu/download_manager/manager.h>
+#include <ubuntu/download_manager/downloads_list.h>
+
+#include "single_download.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+class DownloadHistory : public QObject {
+    Q_OBJECT
+
+ public:
+    explicit DownloadHistory(QObject* parent=0);
+    static DownloadHistory *instance();
+
+    QVariantList downloads() const;
+    void downloadsFound(DownloadsList* downloadsList);
+    void addDownload(SingleDownload *singleDownload);
+    bool cleanDownloads() const;
+    void setCleanDownloads(bool value);
+
+ signals:
+    void downloadsChanged();
+    void downloadFinished(SingleDownload *singleDownload, const QString& path);
+    void errorFound(SingleDownload *download);
+    void downloadPaused(SingleDownload *singleDownload);
+    void downloadResumed(SingleDownload *singleDownload);
+    void downloadCanceled(SingleDownload *singleDownload);
+
+ private slots:
+    void downloadCompleted(const QString& path);
+    void onError(DownloadError& error);
+    void onPaused();
+    void onResumed();
+    void onCanceled();
+
+ private:
+    Manager* m_manager;
+    QVariantList m_downloads;
+    bool m_cleanDownloads;
+};
+
+} // Ubuntu
+
+} // DownloadManager
+
+#endif

=== modified file 'src/downloads/qml/single_download.cpp'
--- src/downloads/qml/single_download.cpp	2014-10-07 14:44:11 +0000
+++ src/downloads/qml/single_download.cpp	2015-11-26 12:58:55 +0000
@@ -20,6 +20,7 @@
 #include <ubuntu/download_manager/download_struct.h>
 
 #include "single_download.h"
+#include "download_history.h"
 
 namespace Ubuntu {
 
@@ -28,7 +29,7 @@
 /*!
     \qmltype SingleDownload
     \instantiates SingleDownload
-    \inqmlmodule Ubuntu.DownloadManager 0.1
+    \inqmlmodule Ubuntu.DownloadManager 1.2
     \ingroup download
     \brief Manage file downloads and tracking the progress.
 
@@ -39,8 +40,8 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.DownloadManager 0.1
+    import Ubuntu.Components 1.2
+    import Ubuntu.DownloadManager 1.2
 
     Rectangle {
         width: units.gu(100)
@@ -152,8 +153,6 @@
          &SingleDownload::onStarted))
             << "Could not connect to signal";
 
-    emit downloadIdChanged();
-
     // is the current in memory setting dirty, if they are, we do set the before we
     // start
     if (m_dirty) {
@@ -169,6 +168,14 @@
     if (m_manager != nullptr && m_autoStart) {
         startDownload();
     }
+
+    DownloadHistory::instance()->addDownload(this);
+
+    // Keep a record of the downloadId so clients can still access the property
+    // after a download has finished
+    m_downloadId = m_download->id();
+
+    emit downloadIdChanged();
 }
 
 void
@@ -222,7 +229,9 @@
                 &SingleDownload::bindDownload))
                     << "Could not connect to signal";
         }
-        DownloadStruct dstruct(url);
+        Metadata metadata;
+        QMap<QString, QString> headers;
+        DownloadStruct dstruct(url, metadata.map(), headers);
         m_manager->createDownload(dstruct);
     } else {
         m_error.setMessage("Current download still in progress.");
@@ -258,7 +267,9 @@
 void
 SingleDownload::pause()
 {
-    m_download->pause();
+    if (m_download != nullptr) {
+        m_download->pause();
+    }
 }
 
 /*!
@@ -270,7 +281,9 @@
 void
 SingleDownload::resume()
 {
-    m_download->resume();
+    if (m_download != nullptr) {
+        m_download->resume();
+    }
 }
 
 /*!
@@ -281,7 +294,9 @@
 void
 SingleDownload::cancel()
 {
-    m_download->cancel();
+    if (m_download != nullptr) {
+        m_download->cancel();
+    }
 }
 
 void
@@ -354,7 +369,7 @@
 bool
 SingleDownload::allowMobileDownload() const {
     if (m_download == nullptr) {
-            return m_mobile;
+        return m_mobile;
     } else {
         return m_download->isMobileDownloadAllowed();
     }
@@ -412,7 +427,7 @@
 QString
 SingleDownload::downloadId() const {
     if (m_download == nullptr) {
-        return "";
+        return m_downloadId;
     } else {
         return m_download->id();
     }
@@ -577,11 +592,20 @@
 */
 
 /*!
-    \qmlproperty QVariantMap SingleDownload:metadata:
+    \qmlproperty QVariantMap SingleDownload::metadata
 
     This property allows to get and set the metadata that will be linked to 
     the download request. 
 */
 
+/*!
+    \qmlsignal SingleDownload::downloadFinished(QString path)
+
+    This signal is emitted when a download has finished. The downloaded file 
+    path is provided via the 'path' paremeter. The corresponding handler is 
+    \c onDownloadFinished
+*/
+
+
 }
 }

=== modified file 'src/downloads/qml/single_download.h'
--- src/downloads/qml/single_download.h	2015-02-02 11:22:26 +0000
+++ src/downloads/qml/single_download.h	2015-11-26 12:58:55 +0000
@@ -171,6 +171,7 @@
     DownloadError m_error;
     Download* m_download = nullptr;
     Manager* m_manager = nullptr;
+    QString m_downloadId;
 
 };
 

=== modified file 'src/downloads/qml/ubuntu_download_manager.cpp'
--- src/downloads/qml/ubuntu_download_manager.cpp	2014-05-07 12:27:08 +0000
+++ src/downloads/qml/ubuntu_download_manager.cpp	2015-11-26 12:58:55 +0000
@@ -1,6 +1,8 @@
 #include "ubuntu_download_manager.h"
+#include "download_history.h"
 #include <glog/logging.h>
 #include <ubuntu/download_manager/download_struct.h>
+#include <QDebug>
 
 namespace Ubuntu {
 
@@ -9,7 +11,7 @@
 /*!
     \qmltype DownloadManager
     \instantiates DownloadManager
-    \inqmlmodule Ubuntu.DownloadManager 0.1
+    \inqmlmodule Ubuntu.DownloadManager 1.2
     \ingroup download
     \brief Manage downloads for several files.
 
@@ -23,8 +25,8 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.DownloadManager 0.1
+    import Ubuntu.Components 1.2
+    import Ubuntu.DownloadManager 1.2
 
     Rectangle {
         width: units.gu(100)
@@ -89,6 +91,24 @@
     CHECK(connect(m_manager, &Manager::downloadCreated,
         this, &UbuntuDownloadManager::downloadFileCreated))
             << "Could not connect to signal";
+    CHECK(connect(DownloadHistory::instance(), &DownloadHistory::downloadsChanged,
+        this, &UbuntuDownloadManager::downloadsChanged))
+            << "Could not connect to signal";
+    CHECK(connect(DownloadHistory::instance(), &DownloadHistory::downloadFinished,
+        this, &UbuntuDownloadManager::downloadFinished))
+            << "Could not connect to signal";
+    CHECK(connect(DownloadHistory::instance(), &DownloadHistory::downloadPaused,
+        this, &UbuntuDownloadManager::downloadPaused))
+            << "Could not connect to signal";
+    CHECK(connect(DownloadHistory::instance(), &DownloadHistory::downloadResumed,
+        this, &UbuntuDownloadManager::downloadResumed))
+            << "Could not connect to signal";
+    CHECK(connect(DownloadHistory::instance(), &DownloadHistory::downloadCanceled,
+        this, &UbuntuDownloadManager::downloadCanceled))
+            << "Could not connect to signal";
+    CHECK(connect(DownloadHistory::instance(), &DownloadHistory::errorFound,
+        this, &UbuntuDownloadManager::errorFound))
+            << "Could not connect to signal";
 }
 
 UbuntuDownloadManager::~UbuntuDownloadManager()
@@ -96,7 +116,6 @@
     if (m_manager != nullptr) {
         m_manager->deleteLater();
     }
-    m_downloads.clear();
 }
 
 /*!
@@ -106,7 +125,9 @@
 */
 void UbuntuDownloadManager::download(QString url)
 {
-    DownloadStruct dstruct(url);
+    Metadata metadata;
+    QMap<QString, QString> headers;
+    DownloadStruct dstruct(url, metadata.map(), headers);
     m_manager->createDownload(dstruct);
 }
 
@@ -116,12 +137,7 @@
     CHECK(connect(singleDownload, &SingleDownload::errorFound,
         this, &UbuntuDownloadManager::registerError))
             << "Could not connect to signal";
-    CHECK(connect(singleDownload, &SingleDownload::finished,
-        this, &UbuntuDownloadManager::downloadCompleted))
-            << "Could not connect to signal";
     singleDownload->bindDownload(download);
-    m_downloads.append(QVariant::fromValue(singleDownload));
-    emit downloadsChanged();
     if (m_autoStart) {
         singleDownload->startDownload();
     }
@@ -132,41 +148,25 @@
     Q_UNUSED(group);
 }
 
-void UbuntuDownloadManager::registerError(DownloadError& error)
+void UbuntuDownloadManager::registerError(DownloadError& downloadError)
 {
-    m_errorMessage = error.message();
+    m_errorMessage = downloadError.message();
     emit errorChanged();
 }
 
+bool UbuntuDownloadManager::cleanDownloads() const
+{
+    return DownloadHistory::instance()->cleanDownloads();
+}
+
 void UbuntuDownloadManager::setCleanDownloads(bool value)
 {
-    m_cleanDownloads = value;
-    if (m_cleanDownloads) {
-        QVariantList newList;
-        foreach(QVariant var, m_downloads) {
-            SingleDownload *download = qobject_cast<SingleDownload*>(var.value<SingleDownload*>());
-            if (download != nullptr && !download->isCompleted()) {
-                newList.append(QVariant::fromValue(download));
-            } else {
-                download->deleteLater();
-            }
-        }
-        m_downloads = newList;
-        emit downloadsChanged();
-    }
+    DownloadHistory::instance()->setCleanDownloads(value);
 }
 
-void UbuntuDownloadManager::downloadCompleted()
+QVariantList UbuntuDownloadManager::downloads()
 {
-    if (m_cleanDownloads) {
-        SingleDownload* download = qobject_cast<SingleDownload*>(sender());
-        if (download != nullptr) {
-            int index = m_downloads.indexOf(QVariant::fromValue(download));
-            m_downloads.removeAt(index);
-            emit downloadsChanged();
-            download->deleteLater();
-        }
-    }
+    return DownloadHistory::instance()->downloads();
 }
 
 /*!
@@ -198,5 +198,47 @@
     started, and let a custom delegate how to represent the UI for each download.
 */
 
+/*!
+    \qmlsignal DownloadManager::errorFound(SingleDownload download)
+    \since Ubuntu.DownloadManager 1.2
+
+    This signal is emitted when an error occurs in a download. The download in which the
+    error occurred is provided via the 'download' parameter, from which the error message
+    can be accessed via download.errorMessage. The corresponding handler is \c onErrorFound
+*/
+
+/*!
+    \qmlsignal DownloadManager::downloadFinished(SingleDownload download, QString path)
+    \since Ubuntu.DownloadManager 1.2
+
+    This signal is emitted when a download has finished. The finished download is provided
+    via the 'download' parameter and the downloaded file path is provided via the 'path' 
+    paremeter. The corresponding handler is \c onDownloadFinished
+*/
+
+/*!
+    \qmlsignal DownloadManager::downloadPaused(SingleDownload download)
+    \since Ubuntu.DownloadManager 1.2
+
+    This signal is emitted when a download has been paused. The paused download is provided
+    via the 'download' parameter. The corresponding handler is \c onDownloadPaused
+*/
+
+/*!
+    \qmlsignal DownloadManager::downloadResumed(SingleDownload download)
+    \since Ubuntu.DownloadManager 1.2
+
+    This signal is emitted when a download has been resumed. The resumed download is provided
+    via the 'download' parameter. The corresponding handler is \c onDownloadResumed
+*/
+
+/*!
+    \qmlsignal DownloadManager::downloadCanceled(SingleDownload download)
+    \since Ubuntu.DownloadManager 1.2
+
+    This signal is emitted when a download has been canceled. The canceled download is provided
+    via the 'download' parameter. The corresponding handler is \c onDownloadCanceled
+*/
 }
+
 }

=== modified file 'src/downloads/qml/ubuntu_download_manager.h'
--- src/downloads/qml/ubuntu_download_manager.h	2014-06-25 08:46:25 +0000
+++ src/downloads/qml/ubuntu_download_manager.h	2015-11-26 12:58:55 +0000
@@ -45,27 +45,31 @@
 
     Q_INVOKABLE void download(QString url);
 
-    QVariantList downloads() { return m_downloads; }
+    QVariantList downloads();
     QString errorMessage() const { return m_errorMessage; }
     bool autoStart() const { return m_autoStart; }
-    bool cleanDownloads() const { return m_cleanDownloads; }
+    bool cleanDownloads() const;
     void setCleanDownloads(bool value);
     void setAutoStart(bool value) { m_autoStart = value; }
 
 signals:
     void errorChanged();
     void downloadsChanged();
+    void downloadFinished(SingleDownload *download, const QString& path);
+    void errorFound(SingleDownload *download);
+    void downloadPaused(SingleDownload *download);
+    void downloadResumed(SingleDownload *download);
+    void downloadCanceled(SingleDownload *download);
 
 private slots:
     void registerError(DownloadError& error);
     void downloadFileCreated(Download* download);
     void downloadGroupCreated(GroupDownload* group);
-    void downloadCompleted();
+    void downloadsFound(DownloadsList* downloads);
 
 private:
     bool m_autoStart;
     bool m_cleanDownloads;
-    QVariantList m_downloads;
     QString m_errorMessage;
     Manager* m_manager;
 };

=== modified file 'tests/downloads/daemon/download.h'
--- tests/downloads/daemon/download.h	2014-07-03 09:01:01 +0000
+++ tests/downloads/daemon/download.h	2015-11-26 12:58:55 +0000
@@ -84,8 +84,8 @@
     MOCK_METHOD0(pauseTransfer, void());
     MOCK_METHOD0(resumeTransfer, void());
     MOCK_METHOD0(startTransfer, void());
+    MOCK_METHOD0(filePath, QString());
     MOCK_CONST_METHOD0(isValid, bool());
-    MOCK_CONST_METHOD0(filePath, QString());
     MOCK_CONST_METHOD0(state, Transfer::State());
     MOCK_CONST_METHOD0(path, QString());
     MOCK_CONST_METHOD0(metadata, QVariantMap());

=== modified file 'tests/downloads/daemon/test_download.cpp'
--- tests/downloads/daemon/test_download.cpp	2015-02-25 16:24:24 +0000
+++ tests/downloads/daemon/test_download.cpp	2015-11-26 12:58:55 +0000
@@ -1301,7 +1301,7 @@
     QVERIFY(spy.ensureSignalEmitted());
     QTRY_COMPARE(spy.count(), 1);
     QTRY_COMPARE(processingSpy.count(), 0);
-    QCOMPARE(download->state(), Download::FINISH);
+    QCOMPARE(download->state(), Download::UNCOLLECTED);
 
     delete download;
 
@@ -1481,7 +1481,7 @@
     QVERIFY(spy.ensureSignalEmitted());
     QTRY_COMPARE(spy.count(), 1);
     QTRY_COMPARE(processingSpy.count(), 1);
-    QCOMPARE(download->state(), Download::FINISH);
+    QCOMPARE(download->state(), Download::UNCOLLECTED);
 
     delete download;
 
@@ -2196,7 +2196,7 @@
 
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
     QTRY_COMPARE_WITH_TIMEOUT(processingSpy.count(), 1, 20000);
-    QCOMPARE(download->state(), Download::FINISH);
+    QCOMPARE(download->state(), Download::UNCOLLECTED);
 
     delete download;
 
@@ -2309,7 +2309,7 @@
 
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
     QTRY_COMPARE_WITH_TIMEOUT(processingSpy.count(), 1, 20000);
-    QCOMPARE(download->state(), Download::FINISH);
+    QCOMPARE(download->state(), Download::UNCOLLECTED);
 
     delete download;
 
@@ -2431,7 +2431,7 @@
     QVERIFY(spy.ensureSignalEmitted());
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
     QTRY_COMPARE_WITH_TIMEOUT(processingSpy.count(), 1, 20000);
-    QCOMPARE(download->state(), Download::FINISH);
+    QCOMPARE(download->state(), Download::UNCOLLECTED);
 
     delete download;
 
@@ -3735,7 +3735,7 @@
     QVERIFY(spy.ensureSignalEmitted());
     QCOMPARE(spy.count(), 1);
     QCOMPARE(processingSpy.count(), 1);
-    QCOMPARE(download->state(), Download::FINISH);
+    QCOMPARE(download->state(), Download::UNCOLLECTED);
 
     delete download;
 
@@ -4167,7 +4167,7 @@
 
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
     QTRY_COMPARE_WITH_TIMEOUT(processingSpy.count(), 1, 20000);
-    QCOMPARE(download->state(), Download::FINISH);
+    QCOMPARE(download->state(), Download::UNCOLLECTED);
 
     delete download;
 

=== modified file 'tests/downloads/daemon/test_downloads_db.cpp'
--- tests/downloads/daemon/test_downloads_db.cpp	2014-11-17 20:34:24 +0000
+++ tests/downloads/daemon/test_downloads_db.cpp	2015-11-26 12:58:55 +0000
@@ -351,4 +351,77 @@
     QTRY_COMPARE(1, spy.count()); 
 }
 
+void
+TestDownloadsDb::testGetStateMissingDownload() {
+    _db->init();
+    auto result = _db->getDownloadState("random uuid");
+    QVERIFY(!result.isValid());
+}
+
+void
+TestDownloadsDb::testGetStateDownload_data() {
+    QTest::addColumn<QString>("id");
+    QTest::addColumn<QString>("appId");
+    QTest::addColumn<QString>("path");
+    QTest::addColumn<QUrl>("url");
+    QTest::addColumn<QString>("hash");
+    QTest::addColumn<QString>("hashAlgoString");
+    QTest::addColumn<QVariantMap>("metadata");
+    QTest::addColumn<QMap<QString, QString> >("headers");
+
+    QTest::newRow("First Row") << UuidUtils::getDBusString(QUuid::createUuid())
+    << "FIRST APP" << "first path" << QUrl("http://ubuntu.com") << ""
+    << "md5" << QVariantMap() << QMap<QString, QString>();
+
+    QVariantMap secondMetadata;
+    secondMetadata["test"] = 1;
+    secondMetadata["command"] = "cd";
+    secondMetadata["hello"] = 23;
+
+    QTest::newRow("Second Row") << UuidUtils::getDBusString(QUuid::createUuid())
+    << "SECOND APP" << "second path" << QUrl("http://ubuntu.com/phone")
+    << "" << "sha512" << secondMetadata << QMap<QString, QString>();
+
+    QVariantMap thirdMetadata;
+    secondMetadata["test"] = 3;
+    secondMetadata["command"] = "return";
+    secondMetadata["hello"] = 500;
+
+    QMap<QString, QString> thirdHeaders;
+    thirdHeaders["my-header"] = "I do something cool";
+
+    QTest::newRow("Third Row") << UuidUtils::getDBusString(QUuid::createUuid())
+    << "THIRD APP" << "third path" << QUrl("http://ubuntu.com/tablet")
+    << "" << "sha384" << thirdMetadata << thirdHeaders;
+}
+
+void
+TestDownloadsDb::testGetStateDownload() {
+    _db->init();
+    QFETCH(QString, id);
+    QFETCH(QString, appId);
+    QFETCH(QString, path);
+    QFETCH(QUrl, url);
+    QFETCH(QString, hash);
+    QFETCH(QString, hashAlgoString);
+    QFETCH(QVariantMap, metadata);
+    QFETCH(StringMap, headers);
+
+    QScopedPointer<FileDownload> download(new FileDownload(id, appId, path, true, "", url, hash,
+                                                           hashAlgoString, metadata, headers));
+
+    _db->storeSingleDownload(download.data());
+
+    // create a second download with same id but a diff path to test is update
+    QString newPath = path + path;
+    QScopedPointer<FileDownload> secondDownload(new FileDownload(id, appId,
+                                                                 newPath, true, "", url, hash, hashAlgoString, metadata, headers));
+
+    _db->storeSingleDownload(secondDownload.data());
+    auto state = _db->getDownloadState(id);
+    QVERIFY(state.isValid());
+    QCOMPARE(state.getUrl(), url.toString());
+    QCOMPARE(state.getHash(), state.getHash());
+}
+
 QTEST_MAIN(TestDownloadsDb)

=== modified file 'tests/downloads/daemon/test_downloads_db.h'
--- tests/downloads/daemon/test_downloads_db.h	2014-07-03 09:01:01 +0000
+++ tests/downloads/daemon/test_downloads_db.h	2015-11-26 12:58:55 +0000
@@ -15,8 +15,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef TEST_DOWNLOADS_DB_H
-#define TEST_DOWNLOADS_DB_H
+#pragma once
 
 #include <QDir>
 #include <QObject>
@@ -65,9 +64,10 @@
     void testStoreSingleDownloadPresent();
     void testConnectedToDownload();
     void testDisconnectedFromDownload();
+    void testGetStateMissingDownload();
+    void testGetStateDownload_data();
+    void testGetStateDownload();
 
  private:
     DownloadsDb* _db;
 };
-
-#endif  // TEST_DOWNLOADS_DB_H