Merge lp:~ken-vandine/content-hub/download-manager-with-snapdecision into lp:content-hub

[Ken VanDine]

Use libnotify to send a snap decision with an Open action for downloads.

This also ands translation support, needed for the strings in the notification.

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * Yes
   - https://code.launchpad.net/~michael-sheldon/content-hub/download-manager-integration/+merge/217788

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * This change adds a snap decision notification. This was added as an interim
   solution until we have final designs.

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * Yes, just added libnotify as a build depends. I'm a core-dev.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ken-vandine/content-hub/download-manager-with-snapdecision/+merge/218322/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/144/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/144/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-07 21:07:27 +0000
+++ CMakeLists.txt	2014-05-05 19:54:30 +0000
@@ -66,18 +66,23 @@
 pkg_check_modules(NIH REQUIRED libnih)
 pkg_check_modules(NIH_DBUS REQUIRED libnih-dbus)
 pkg_check_modules(DBUS REQUIRED dbus-1)
-
-add_definitions( -DDEBUG_ENABLED )
+pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER REQUIRED ubuntu-download-manager-client)
+pkg_check_modules(NOTIFY REQUIRED libnotify)
+
+add_definitions(-DDEBUG_ENABLED)
+
+set(GETTEXT_PACKAGE "content-hub")
+add_definitions(-DI18N_DOMAIN="${GETTEXT_PACKAGE}")
 
 set(CONTENT_HUB_VERSION_MAJOR 0)
 set(CONTENT_HUB_VERSION_MINOR 0)
 set(CONTENT_HUB_VERSION_PATCH 1)
 set(CONTENT_HUB_VERSION "${CONTENT_HUB_VERSION_MAJOR}.${CONTENT_HUB_VERSION_MINOR}.${CONTENT_HUB_VERSION_PATCH}")
 
-
 include_directories(include)
 
 add_subdirectory(doc)
+add_subdirectory(po)
 add_subdirectory(src)
 add_subdirectory(import)
 add_subdirectory(examples)

=== added file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Translations.cmake	2014-05-05 19:54:30 +0000
@@ -0,0 +1,41 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+
+macro(add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            ${CMAKE_INSTALL_LOCALEDIR}/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro(add_translations_directory)
+
+
+macro(add_translations_catalog NLS_PACKAGE)
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+
+
+    set(C_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.cpp)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+    endforeach()
+
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
+        )
+endmacro()

=== modified file 'debian/control'
--- debian/control	2014-04-02 14:45:06 +0000
+++ debian/control	2014-05-05 19:54:30 +0000
@@ -11,6 +11,8 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                libnih-dbus-dev,
+               libnotify-dev,
+               libubuntu-download-manager-client-dev,
                libupstart-app-launch2-dev (>= 0.3+14.04.20140124),
                qt5-default,
                qtbase5-dev,

=== modified file 'import/Ubuntu/Content/contenttransfer.cpp'
--- import/Ubuntu/Content/contenttransfer.cpp	2014-04-10 16:38:11 +0000
+++ import/Ubuntu/Content/contenttransfer.cpp	2014-05-05 19:54:30 +0000
@@ -61,6 +61,12 @@
      \li ContentTransfer.InProgress
      \li Transfer is in progress.
    \row
+     \li ContentTransfer.Downloading
+     \li Transfer is downloading item specified by downloadId.
+   \row
+     \li ContentTransfer.Downloaded
+     \li Download specified by downloadId has completed.
+   \row
      \li ContentTransfer.Charged
      \li Transfer is charged with items and ready to be collected.
    \row
@@ -86,7 +92,7 @@
     if (!m_transfer)
         return;
 
-    if (state == Charged && m_state == InProgress) {
+    if (state == Charged && (m_state == InProgress || m_state == Downloaded)) {
         TRACE() << Q_FUNC_INFO << "Charged";
         QVector<cuc::Item> hubItems;
         hubItems.reserve(m_items.size());
@@ -95,6 +101,8 @@
         }
         m_transfer->charge(hubItems);
         return;
+    } else if (state == Downloading) {
+        m_transfer->download();
     } else if (state == Aborted) {
         TRACE() << Q_FUNC_INFO << "Aborted";
         m_transfer->abort();
@@ -268,6 +276,24 @@
 }
 
 /*!
+ * \qmlproperty string ContentTransfer::downloadId
+ * The Download Manager ID of a SingleDownload, which will then be
+ * transfered to the selected peer.
+ */
+QString ContentTransfer::downloadId()
+{
+    TRACE() << Q_FUNC_INFO;
+    return m_transfer->downloadId();
+}
+
+void ContentTransfer::setDownloadId(QString downloadId)
+{
+    TRACE() << Q_FUNC_INFO;
+    m_transfer->setDownloadId(downloadId);
+    Q_EMIT downloadIdChanged();
+} 
+
+/*!
  * \brief ContentTransfer::collectItems gets the items out of the transfer object
  * \internal
  */

=== modified file 'import/Ubuntu/Content/contenttransfer.h'
--- import/Ubuntu/Content/contenttransfer.h	2014-02-19 16:41:30 +0000
+++ import/Ubuntu/Content/contenttransfer.h	2014-05-05 19:54:30 +0000
@@ -39,6 +39,7 @@
     Q_PROPERTY(SelectionType selectionType READ selectionType WRITE setSelectionType NOTIFY selectionTypeChanged)
     Q_PROPERTY(QString store READ store NOTIFY storeChanged)
     Q_PROPERTY(QQmlListProperty<ContentItem> items READ items NOTIFY itemsChanged)
+    Q_PROPERTY(QString downloadId READ downloadId WRITE setDownloadId NOTIFY downloadIdChanged)
 
 public:
     enum State {
@@ -48,7 +49,9 @@
         Charged = com::ubuntu::content::Transfer::charged,
         Collected = com::ubuntu::content::Transfer::collected,
         Aborted = com::ubuntu::content::Transfer::aborted,
-        Finalized = com::ubuntu::content::Transfer::finalized
+        Finalized = com::ubuntu::content::Transfer::finalized,
+        Downloading = com::ubuntu::content::Transfer::downloading,
+        Downloaded = com::ubuntu::content::Transfer::downloaded
     };
     enum Direction {
         Import = com::ubuntu::content::Transfer::Import,
@@ -81,6 +84,9 @@
     com::ubuntu::content::Transfer *transfer() const;
     void setTransfer(com::ubuntu::content::Transfer *transfer);
 
+    QString downloadId();
+    void setDownloadId(QString downloadId);
+
     void collectItems();
 
 Q_SIGNALS:
@@ -88,6 +94,7 @@
     void itemsChanged();
     void selectionTypeChanged();
     void storeChanged();
+    void downloadIdChanged();
 
 private Q_SLOTS:
     void updateState();

=== modified file 'include/com/ubuntu/content/transfer.h'
--- include/com/ubuntu/content/transfer.h	2014-02-19 16:41:30 +0000
+++ include/com/ubuntu/content/transfer.h	2014-05-05 19:54:30 +0000
@@ -24,6 +24,7 @@
 #include <QObject>
 #include <QSharedPointer>
 #include <QVector>
+#include <QString>
 
 namespace com
 {
@@ -59,6 +60,7 @@
     Q_PROPERTY(Store store READ store NOTIFY storeChanged)
     Q_PROPERTY(SelectionType selectionType READ selectionType WRITE setSelectionType NOTIFY selectionTypeChanged)
     Q_PROPERTY(Direction direction READ direction)
+    Q_PROPERTY(QString downloadId READ downloadId WRITE setDownloadId NOTIFY downloadIdChanged)
 
   public:
     enum State
@@ -69,7 +71,9 @@
         charged,
         collected,
         aborted,
-        finalized
+        finalized,
+        downloading,
+        downloaded
     };
 
     enum SelectionType
@@ -97,15 +101,19 @@
     Q_INVOKABLE virtual bool start();
     Q_INVOKABLE virtual bool abort();
     Q_INVOKABLE virtual bool finalize();
+    Q_INVOKABLE virtual bool download();
     Q_INVOKABLE virtual bool charge(const QVector<Item>& items);
     Q_INVOKABLE virtual QVector<Item> collect();
     Q_INVOKABLE virtual Store store() const;
     Q_INVOKABLE virtual bool setStore(const Store*);
     Q_INVOKABLE virtual bool setSelectionType(const SelectionType&);
+    Q_INVOKABLE virtual QString downloadId() const;
+    Q_INVOKABLE virtual bool setDownloadId(const QString);
 
     Q_SIGNAL void stateChanged();
     Q_SIGNAL void storeChanged();
     Q_SIGNAL void selectionTypeChanged();
+    Q_SIGNAL void downloadIdChanged();
 
   private:
     struct Private;

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2014-05-05 19:54:30 +0000
@@ -0,0 +1,3 @@
+include (Translations)
+add_translations_directory ("${GETTEXT_PACKAGE}")
+add_translations_catalog ("${GETTEXT_PACKAGE}" ../src/com/ubuntu/content/detail)

=== added file 'po/POTFILES.in'
--- po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ po/POTFILES.in	2014-05-05 19:54:30 +0000
@@ -0,0 +1,1 @@
+src/com/ubuntu/content/detail/service.cpp

=== added file 'po/content-hub.pot'
--- po/content-hub.pot	1970-01-01 00:00:00 +0000
+++ po/content-hub.pot	2014-05-05 19:54:30 +0000
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-05 15:51-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/com/ubuntu/content/detail/service.cpp:212
+msgid "Download Complete"
+msgstr ""
+
+#: ../src/com/ubuntu/content/detail/service.cpp:227
+msgid "Open"
+msgstr ""
+
+#: ../src/com/ubuntu/content/detail/service.cpp:234
+msgid "Dismiss"
+msgstr ""

=== modified file 'src/com/ubuntu/content/CMakeLists.txt'
--- src/com/ubuntu/content/CMakeLists.txt	2014-03-04 21:47:48 +0000
+++ src/com/ubuntu/content/CMakeLists.txt	2014-05-05 19:54:30 +0000
@@ -26,6 +26,8 @@
   ${NIH_INCLUDE_DIRS}
   ${NIH_DBUS_INCLUDE_DIRS}
   ${UPSTART_LAUNCH_INCLUDE_DIRS}
+  ${UBUNTU_DOWNLOAD_MANAGER_INCLUDE_DIRS}
+  ${NOTIFY_INCLUDE_DIRS}
 )
 
 qt5_add_dbus_interface(
@@ -74,6 +76,7 @@
   detail/service.cpp
   detail/transfer.cpp
   detail/handler.cpp
+  detail/i18n.cpp
 
   ${CONTENT_HUB_MOCS}
   ${CONTENT_SERVICE_STUB}
@@ -100,6 +103,8 @@
     ${NIH_LIBRARIES}
     ${NIH_DBUS_LIBRARIES}
     ${GIO_LIBRARIES}
+    ${UBUNTU_DOWNLOAD_MANAGER_LIBRARIES}
+    ${NOTIFY_LIBRARIES}
 )
 
 install(

=== modified file 'src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml'
--- src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml	2014-02-19 16:41:30 +0000
+++ src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml	2014-05-05 19:54:30 +0000
@@ -17,6 +17,8 @@
     </method>
     <method name="Finalize">
     </method>
+    <method name="Download">
+    </method>
     <method name="Charge">
       <arg name="items" type="as" direction="in" />
     </method>
@@ -41,6 +43,15 @@
     <signal name="SelectionTypeChanged">
       <arg name="selection_type" type="i"/>
     </signal>
+    <method name="DownloadId">
+      <arg name="download_id" type="s" direction="out" />
+    </method>
+    <method name="SetDownloadId">
+      <arg name="download_id" type="s" direction="in" />
+    </method>
+    <signal name="DownloadIdChanged">
+      <arg name="download_id" type="s"/>
+    </signal>
     <method name="Direction">
       <arg name="direction" type="i" direction="out" />
     </method>

=== added file 'src/com/ubuntu/content/detail/i18n.cpp'
--- src/com/ubuntu/content/detail/i18n.cpp	1970-01-01 00:00:00 +0000
+++ src/com/ubuntu/content/detail/i18n.cpp	2014-05-05 19:54:30 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ken VanDine <[e-mail]>
+ */
+
+#define NO_TR_OVERRIDE
+#include "i18n.h"
+
+#include <libintl.h>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace content
+{
+namespace detail
+{
+
+void initTr(const char *domain, const char *localeDir)
+{
+    bindtextdomain(domain, localeDir);
+    textdomain(domain);
+}
+
+QString _(const char *text, const char *domain)
+{
+    return QString::fromUtf8(dgettext(domain, text));
+}
+
+}
+}
+}
+}

=== added file 'src/com/ubuntu/content/detail/i18n.h'
--- src/com/ubuntu/content/detail/i18n.h	1970-01-01 00:00:00 +0000
+++ src/com/ubuntu/content/detail/i18n.h	2014-05-05 19:54:30 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ken VanDine <[e-mail]>
+ */
+
+#ifndef I18N_H
+#define I18N_H
+
+#include <QString>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace content
+{
+namespace detail
+{
+
+void initTr(const char *domain, const char *localeDir);
+QString _(const char *text, const char *domain = 0);
+
+}
+}
+}
+}
+
+#endif // I18N_H
+

=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2014-03-24 19:29:56 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2014-05-05 19:54:30 +0000
@@ -16,14 +16,22 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
+// NEEDED for libnotify include
+#define QT_NO_KEYWORDS
+
 #include "debug.h"
 #include "service.h"
 #include "peer_registry.h"
+#include "i18n.h"
 #include "transfer.h"
 #include "transferadaptor.h"
 #include "utils.cpp"
 #include "ContentHandlerInterface.h"
 
+#include <glib.h>
+#include <unistd.h>
+#include <libnotify/notify.h>
+
 #include <com/ubuntu/content/peer.h>
 #include <com/ubuntu/content/type.h>
 #include <com/ubuntu/content/transfer.h>
@@ -177,6 +185,65 @@
             && st != cuc::Transfer::aborted);
 }
 
+void action_dismiss(NotifyNotification *notification, char *action, gpointer data)
+{
+    TRACE() << Q_FUNC_INFO;
+    Q_UNUSED(notification);
+    Q_UNUSED(action);
+    Q_UNUSED(data);
+}
+
+void action_accept(NotifyNotification *notification, char *action, gpointer data)
+{
+    TRACE() << Q_FUNC_INFO;
+    Q_UNUSED(notification);
+    Q_UNUSED(action);
+
+    cucd::Transfer* t = (cucd::Transfer*)data;
+    t->Charge(QStringList());
+}
+
+void download_notify (cucd::Transfer* t)
+{
+    TRACE() << Q_FUNC_INFO;
+    notify_init(t->source().toStdString().c_str());
+    NotifyNotification* notification;
+
+    notification = notify_notification_new (_("Download Complete"),
+                                            "",
+                                            "save");
+
+    notify_notification_set_hint_string(notification,
+                                        "x-canonical-snap-decisions",
+                                        "true");
+
+
+    notify_notification_set_hint_string(notification,
+                                        "x-canonical-private-button-tint",
+                                        "true");
+
+    notify_notification_add_action (notification,
+                                    "action_accept",
+                                    _("Open"),
+                                    action_accept,
+                                    t,
+                                    NULL);
+
+    notify_notification_add_action (notification,
+                                    "action_dismiss",
+                                    _("Dismiss"),
+                                    action_dismiss,
+                                    t,
+                                    NULL);
+
+    GError *error = NULL;
+    if (!notify_notification_show(notification, &error)) {
+        qWarning() << "Failed to show snap decision:" << error->message;
+        g_error_free (error);
+    }
+
+}
+
 QDBusObjectPath cucd::Service::CreateExportToPeer(const QString& peer_id, const QString& app_id)
 {
     TRACE() << Q_FUNC_INFO;
@@ -338,6 +405,12 @@
         transfer->Handled();
     }
 
+    if (state == cuc::Transfer::downloaded)
+    {
+        TRACE() << Q_FUNC_INFO << "Downloaded";
+        download_notify(transfer);
+    }
+
     if (state == cuc::Transfer::charged)
     {
         TRACE() << Q_FUNC_INFO << "Charged";

=== modified file 'src/com/ubuntu/content/detail/transfer.cpp'
--- src/com/ubuntu/content/detail/transfer.cpp	2014-03-04 21:47:48 +0000
+++ src/com/ubuntu/content/detail/transfer.cpp	2014-05-05 19:54:30 +0000
@@ -23,6 +23,8 @@
 #include <com/ubuntu/content/hub.h>
 #include <com/ubuntu/content/store.h>
 #include <com/ubuntu/content/transfer.h>
+#include <ubuntu/download_manager/download.h>
+#include <ubuntu/download_manager/manager.h>
 
 namespace cuc = com::ubuntu::content;
 namespace cucd = com::ubuntu::content::detail;
@@ -52,6 +54,7 @@
     int selection_type;
     QStringList items;
     bool source_started_by_content_hub;
+    QString download_id;
 };
 
 cucd::Transfer::Transfer(const int id,
@@ -145,6 +148,19 @@
     if (d->state == cuc::Transfer::charged)
         return;
 
+    if (d->state == cuc::Transfer::downloading)
+    {
+        qWarning() << "Unable to charge, download still in progress.";
+        return;
+    }
+
+    if (d->state == cuc::Transfer::downloaded)
+    {
+        d->state = cuc::Transfer::charged;
+        Q_EMIT(StateChanged(d->state));
+        return;
+    } 
+
     QStringList ret;
     Q_FOREACH(QString i, items)
         ret.append(copy_to_store(i, d->store));
@@ -165,6 +181,40 @@
     Q_EMIT(StateChanged(d->state));
 }
 
+void cucd::Transfer::Download()
+{
+    TRACE() << __PRETTY_FUNCTION__;
+    if(d->download_id.isEmpty()) 
+    {
+        return;
+    }
+
+    Manager *downloadManager = Manager::createSessionManager();
+    auto download = downloadManager->getDownloadForId(d->download_id);
+    if (download == nullptr) 
+    {
+        TRACE() << downloadManager->lastError();
+    }
+    else
+    {
+        QDir dir;
+        dir.mkpath(d->store);
+        download->setDestinationDir(d->store);
+        connect(download, SIGNAL(finished(QString)), this, SLOT(DownloadComplete(QString)));
+        download->start();
+        d->state = cuc::Transfer::downloading;
+        Q_EMIT(StateChanged(d->state));
+    }
+}
+
+void cucd::Transfer::DownloadComplete(QString destFilePath)
+{
+    TRACE() << __PRETTY_FUNCTION__;
+    d->items.append(QUrl::fromLocalFile(destFilePath).toString());
+    d->state = cuc::Transfer::downloaded;
+    Q_EMIT(StateChanged(d->state));
+}
+
 QStringList cucd::Transfer::Collect()
 {
     TRACE() << __PRETTY_FUNCTION__;
@@ -226,6 +276,22 @@
     Q_EMIT(SelectionTypeChanged(d->selection_type));
 }
 
+QString cucd::Transfer::DownloadId()
+{
+    TRACE() << Q_FUNC_INFO;
+    return d->download_id;
+}
+
+void cucd::Transfer::SetDownloadId(QString DownloadId)
+{
+    TRACE() << Q_FUNC_INFO;
+    if (d->download_id == DownloadId)
+        return;
+
+    d->download_id = DownloadId;
+    Q_EMIT(DownloadIdChanged(d->download_id));
+}
+
 /* returns the object path for the export */
 QString cucd::Transfer::export_path()
 {

=== modified file 'src/com/ubuntu/content/detail/transfer.h'
--- src/com/ubuntu/content/detail/transfer.h	2014-02-19 16:41:30 +0000
+++ src/com/ubuntu/content/detail/transfer.h	2014-05-05 19:54:30 +0000
@@ -35,6 +35,7 @@
     Q_PROPERTY(int State READ State NOTIFY StateChanged)
     Q_PROPERTY(QString Store READ Store WRITE SetStore NOTIFY StoreChanged)
     Q_PROPERTY(int SelectionType READ SelectionType WRITE SetSelectionType NOTIFY SelectionTypeChanged)
+    Q_PROPERTY(QString DownloadId READ DownloadId WRITE SetDownloadId NOTIFY DownloadIdChanged)
     Q_PROPERTY(int id READ Id)
     Q_PROPERTY(QString source READ source)
     Q_PROPERTY(QString destination READ destination)
@@ -54,6 +55,7 @@
     void StateChanged(int State);
     void StoreChanged(QString Store);
     void SelectionTypeChanged(int SelectionType);
+    void DownloadIdChanged(QString DownloadId);
 
   public Q_SLOTS:
     int State();
@@ -73,6 +75,10 @@
     QString destination();
     QString export_path();
     QString import_path();
+    QString DownloadId();
+    void SetDownloadId(QString DownloadId);
+    void DownloadComplete(QString destFilePath);
+    void Download();
 
   private:
     struct Private;

=== modified file 'src/com/ubuntu/content/service/main.cpp'
--- src/com/ubuntu/content/service/main.cpp	2014-03-27 16:03:14 +0000
+++ src/com/ubuntu/content/service/main.cpp	2014-05-05 19:54:30 +0000
@@ -24,6 +24,7 @@
 #include "debug.h"
 #include "common.h"
 #include "registry.h"
+#include "detail/i18n.h"
 #include "detail/service.h"
 #include "detail/peer_registry.h"
 #include "serviceadaptor.h"
@@ -45,6 +46,8 @@
     int ret = 0;
     QCoreApplication *app = new QCoreApplication(argc, argv);
 
+    cucd::initTr(I18N_DOMAIN, NULL);
+
     /* read environment variables */
     QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
     if (environment.contains(QLatin1String("CONTENT_HUB_LOGGING_LEVEL"))) {

=== modified file 'src/com/ubuntu/content/transfer.cpp'
--- src/com/ubuntu/content/transfer.cpp	2014-03-04 21:47:48 +0000
+++ src/com/ubuntu/content/transfer.cpp	2014-05-05 19:54:30 +0000
@@ -106,3 +106,19 @@
 {
     return d->direction();
 }
+
+QString cuc::Transfer::downloadId() const
+{
+    return d->downloadId();
+} 
+
+bool cuc::Transfer::setDownloadId(QString downloadId)
+{
+    return d->setDownloadId(downloadId);
+}
+
+bool cuc::Transfer::download()
+{
+    return d->download();
+}
+

=== modified file 'src/com/ubuntu/content/transfer_p.h'
--- src/com/ubuntu/content/transfer_p.h	2014-02-19 16:41:30 +0000
+++ src/com/ubuntu/content/transfer_p.h	2014-05-05 19:54:30 +0000
@@ -117,7 +117,7 @@
 
         return not reply.isError();
     }
-    
+
     QVector<Item> collect()
     {
         QVector<Item> result;
@@ -190,6 +190,33 @@
         return static_cast<Transfer::Direction>(reply.value());
     }
 
+    QString downloadId()
+    {
+        auto reply = remote_transfer->DownloadId();
+        reply.waitForFinished();
+
+        if (reply.isError())
+            return QString();
+
+        return static_cast<QString>(reply.value());
+    }
+
+    bool setDownloadId(QString downloadId)
+    {
+        auto reply = remote_transfer->SetDownloadId(downloadId);
+        reply.waitForFinished();
+
+        return not reply.isError();
+    }
+
+    bool download()
+    {
+        auto reply = remote_transfer->Download();
+        reply.waitForFinished();
+
+        return not reply.isError();
+    }
+    
     com::ubuntu::content::dbus::Transfer* remote_transfer;
 };
 }