Merge lp:~mandel/ubuntu-download-manager/wily-add-appid-metadata into lp:ubuntu-download-manager

[Manuel de la Peña]

Add the app id in the download metadata.

Add the app id in the download metadata.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Most of the coode looks good only a few inline commnents.

And Jenkins still not happy with some libraries symbols.

review: Needs Fixing

[Manuel de la Peña (mandel)]

Replied inline, but yes, all comments are valid. Sorry for the qDebug, I though I removed those.

[lp:~mandel/ubuntu-download-manager/wily-add-appid-metadata]

345. By Manuel de la Peña on 2015-09-01

Update branch as per reviews.

346. By Manuel de la Peña on 2015-09-01

Use correct commiter.

347. By Manuel de la Peña on 2015-09-02

Made changes according to reviews.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:347
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/770/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

[lp:~mandel/ubuntu-download-manager/wily-add-appid-metadata]

348. By Manuel de la Peña on 2015-09-21

Rename metadata method as per reviews.

349. By Manuel de la Peña on 2015-09-21

Rename the client lib property.

350. By Manuel de la Peña on 2015-09-22

Update symbol files.

351. By Manuel de la Peña on 2015-09-22

Rename the property correctly.

352. By Manuel de la Peña on 2015-09-22

Rename setters and getters.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-23 14:02:27 +0000
+++ CMakeLists.txt	2015-09-22 15:26:07 +0000
@@ -31,7 +31,7 @@
 )
 
 set(UDM_VERSION_MAJOR 1)
-set(UDM_VERSION_MINOR 0)
+set(UDM_VERSION_MINOR 1)
 set(UDM_VERSION_PATCH 0)
 
 find_package(Gtest REQUIRED)

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-24 16:44:28 +0000
+++ debian/changelog	2015-09-22 15:26:07 +0000
@@ -1,3 +1,11 @@
+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.10.20150724-0ubuntu1) wily; urgency=medium
 
   [ Manuel de la Pena ]

=== modified file 'debian/libubuntu-download-manager-client1.symbols'
--- debian/libubuntu-download-manager-client1.symbols	2015-07-24 16:44:28 +0000
+++ debian/libubuntu-download-manager-client1.symbols	2015-09-22 15:26:07 +0000
@@ -60,6 +60,7 @@
  (c++)"Ubuntu::DownloadManager::Download::titleChanged()@Base" 0.9+14.10.20141014.1
  (c++)"Ubuntu::DownloadManager::Download::clickPackagedChanged()@Base" 0.9+14.10.20141014.1
  (c++)"Ubuntu::DownloadManager::Download::showInIndicatorChanged()@Base" 0.9+14.10.20141014.1
+ (c++)"Ubuntu::DownloadManager::Download::destinationAppChanged()@Base" 0replaceme
  (c++)"Ubuntu::DownloadManager::AuthError::errorString()@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::AuthError::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::AuthError::qt_metacast(char const*)@Base" 0.4+14.10.20140618
@@ -94,9 +95,6 @@
  (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

=== 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-09-22 15:26:07 +0000
@@ -21,8 +21,6 @@
  (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::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
@@ -31,4 +29,5 @@
  (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::getLocalFile() const@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::getUrl() const@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::getHash() const@Base" 0.4+14.10.20140618
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::~GroupDownloadStruct()@Base" 0replaceme
  (c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, QList<Ubuntu::DownloadManager::GroupDownloadStruct>)@Base" 0.4+14.10.20140618

=== modified file 'debian/libudm-common1.symbols'
--- debian/libudm-common1.symbols	2015-07-24 16:44:28 +0000
+++ debian/libudm-common1.symbols	2015-09-22 15:26:07 +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[abi:cxx11](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
@@ -121,6 +121,10 @@
  (c++)"Ubuntu::Transfers::Metadata::EXTRACT_KEY@Base" 0.9+14.10.20141014.1
  (c++)"Ubuntu::Transfers::Metadata::hasExtract() const@Base" 0.9+14.10.20141014.1
  (c++)"Ubuntu::Transfers::Metadata::extract() const@Base" 0.9+14.10.20141014.1
+ (c++)"Ubuntu::Transfers::Metadata::APP_ID@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Metadata::setDestinationApp(QString const&)@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Metadata::destinationApp() const@Base" 0replaceme
+ (c++)"Ubuntu::Transfers::Metadata::hasDestinationApp() const@Base" 0replaceme
  (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::getCode() const@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::HttpErrorStruct::getPhrase() const@Base" 0.4+14.10.20140618
  (c++)"Ubuntu::Transfers::Errors::NetworkErrorStruct::getCode() const@Base" 0.4+14.10.20140618

=== added file 'debian/libudm-common1.symbols.powerpc'
--- debian/libudm-common1.symbols.powerpc	1970-01-01 00:00:00 +0000
+++ debian/libudm-common1.symbols.powerpc	2015-09-22 15:26:07 +0000
@@ -0,0 +1,2 @@
+libubuntu-download-manager-common.so.1 libubuntu-download-manager-common1 #MINVER#
+ (c++)"Ubuntu::DownloadManager::GroupDownloadStruct::~GroupDownloadStruct()@Base" 0replaceme

=== modified file 'docs/dbus/com.canonical.applications.download.xml'
--- docs/dbus/com.canonical.applications.download.xml	2015-02-25 16:24:24 +0000
+++ docs/dbus/com.canonical.applications.download.xml	2015-09-22 15:26:07 +0000
@@ -118,5 +118,7 @@
 
     <property access="read" type="s" name="ClickPackage" />
 
+    <property access="read" type="s" name="DestinationApp" />
+
  </interface>
 </node>

=== modified file 'src/common/public/ubuntu/transfers/metadata.cpp'
--- src/common/public/ubuntu/transfers/metadata.cpp	2014-10-09 09:52:34 +0000
+++ src/common/public/ubuntu/transfers/metadata.cpp	2015-09-22 15:26:07 +0000
@@ -16,6 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QProcessEnvironment>
+
 #include "metadata.h"
 
 namespace Ubuntu {
@@ -31,12 +33,27 @@
 const QString Metadata::CLICK_PACKAGE_KEY = "click-package";
 const QString Metadata::DEFLATE_KEY = "deflate";
 const QString Metadata::EXTRACT_KEY = "extract";
+const QString Metadata::APP_ID = "app-id";
+
+namespace {
+    const QString APP_ID_ENV = "APP_ID";
+}
 
 Metadata::Metadata() {
+    auto environment = QProcessEnvironment::systemEnvironment();
+    if (environment.contains(APP_ID_ENV)) {
+        setOwner(environment.value(APP_ID_ENV));
+    }
 }
 
 Metadata::Metadata(const QVariantMap map)
     : QVariantMap(map) {
+    // check if the app id is present, if not, do it
+    if (!hasOwner()) {
+        auto environment = QProcessEnvironment::systemEnvironment();
+        environment.contains(APP_ID_ENV);
+        setOwner(environment.value(APP_ID_ENV));
+    }
 }
 
 QString
@@ -167,6 +184,22 @@
     return contains(Metadata::EXTRACT_KEY);
 }
 
+QString
+Metadata::destinationApp() const {
+    return (contains(Metadata::APP_ID))?
+           value(Metadata::APP_ID).toString():"";
+}
+
+void
+Metadata::setOwner(const QString &id) {
+    insert(Metadata::APP_ID, id);
+}
+
+bool
+Metadata::hasOwner() const {
+    return contains(Metadata::APP_ID);
+}
+
 }  // DownloadManager
 
 }  // Ubuntu

=== modified file 'src/common/public/ubuntu/transfers/metadata.h'
--- src/common/public/ubuntu/transfers/metadata.h	2014-10-09 09:52:34 +0000
+++ src/common/public/ubuntu/transfers/metadata.h	2015-09-22 15:26:07 +0000
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_METADATA_H
-#define DOWNLOADER_LIB_METADATA_H
+#pragma once
 
 #include <QMap>
 #include <QVariant>
@@ -41,6 +40,7 @@
     static const QString CLICK_PACKAGE_KEY;
     static const QString DEFLATE_KEY;
     static const QString EXTRACT_KEY;
+    static const QString APP_ID;
 
     // accessors to simplify the use of the metadata
     QString command() const;
@@ -74,10 +74,12 @@
     bool extract() const;
     void setExtract(bool extract);
     bool hasExtract() const;
+
+    QString destinationApp() const;
+    void setOwner(const QString &id);
+    bool hasOwner() const;
 };
 
 }  // DownloadManager
 
 }  // Ubuntu
-
-#endif // METADATA_H

=== modified file 'src/downloads/client/ubuntu/download_manager/download.h'
--- src/downloads/client/ubuntu/download_manager/download.h	2014-09-24 09:10:39 +0000
+++ src/downloads/client/ubuntu/download_manager/download.h	2015-09-22 15:26:07 +0000
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_H
-#define UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_H
+#pragma once
 
 #include <QObject>
 #include <QVariantMap>
@@ -51,6 +50,7 @@
     Q_PROPERTY(QString ClickPackage READ clickPackage NOTIFY clickPackagedChanged)
     Q_PROPERTY(bool ShowInIndicator READ showInIndicator NOTIFY showInIndicatorChanged)
     Q_PROPERTY(QString Title READ title NOTIFY titleChanged)
+    Q_PROPERTY(QString DownloadOwner READ destinationApp NOTIFY destinationAppChanged)
 
  public:
     explicit Download(QObject* parent = 0)
@@ -244,6 +244,14 @@
     */
     virtual QString title() const = 0;
 
+    /*!
+        \fn QString destinationApp() const = 0;
+
+        Returns the value of the destinationApp property of the download. The owner of the
+        download is the application that created the download in the system.
+    */
+    virtual QString destinationApp() const = 0;
+
  signals:
 
     /*!
@@ -346,10 +354,16 @@
     */
     void titleChanged();
 
+    /*!
+        \fn void Download::destinationAppChanged();
+
+        This signal is emitted whenever the download owner property of the download
+        has been updated.
+    */
+    void destinationAppChanged();
+
 };
 
 }  // Ubuntu
 
 }  // DownloadManager
-
-#endif  // UBUNTU_DOWNLOADMANAGER_CLIENT_DOWNLOAD_H

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.cpp'
--- src/downloads/client/ubuntu/download_manager/download_impl.cpp	2015-02-25 16:24:24 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.cpp	2015-09-22 15:26:07 +0000
@@ -425,6 +425,11 @@
     return _dbusInterface->title();
 }
 
+QString
+DownloadImpl::destinationApp() const {
+    return _dbusInterface->destinationApp();
+}
+
 void
 DownloadImpl::onHttpError(HttpErrorStruct errStruct) {
     auto err = new HttpError(errStruct, this);

=== modified file 'src/downloads/client/ubuntu/download_manager/download_impl.h'
--- src/downloads/client/ubuntu/download_manager/download_impl.h	2015-02-25 16:24:24 +0000
+++ src/downloads/client/ubuntu/download_manager/download_impl.h	2015-09-22 15:26:07 +0000
@@ -81,6 +81,7 @@
     QString clickPackage() const;
     bool showInIndicator() const;
     QString title() const;
+    QString destinationApp() const;
 
  protected:
     DownloadImpl(const QDBusConnection& conn, Error* err, QObject* parent = 0);

=== modified file 'src/downloads/client/ubuntu/download_manager/download_interface.cpp'
--- src/downloads/client/ubuntu/download_manager/download_interface.cpp	2015-02-25 16:24:24 +0000
+++ src/downloads/client/ubuntu/download_manager/download_interface.cpp	2015-09-22 15:26:07 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp com.canonical.applications.download.xml -i metatypes.h -p download_interface -c DownloadInterface
  *
- * qdbusxml2cpp is Copyright (C) 2014 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

=== modified file 'src/downloads/client/ubuntu/download_manager/download_interface.h'
--- src/downloads/client/ubuntu/download_manager/download_interface.h	2015-02-25 16:24:24 +0000
+++ src/downloads/client/ubuntu/download_manager/download_interface.h	2015-09-22 15:26:07 +0000
@@ -2,14 +2,14 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp com.canonical.applications.download.xml -i metatypes.h -p download_interface -c DownloadInterface
  *
- * qdbusxml2cpp is Copyright (C) 2014 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.
  */
 
-#ifndef DOWNLOAD_INTERFACE_H_1392136772
-#define DOWNLOAD_INTERFACE_H_1392136772
+#ifndef DOWNLOAD_INTERFACE_H_1442932929
+#define DOWNLOAD_INTERFACE_H_1442932929
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -40,6 +40,10 @@
     inline QString clickPackage() const
     { return qvariant_cast< QString >(property("ClickPackage")); }
 
+    Q_PROPERTY(QString DestinationApp READ destinationApp)
+    inline QString destinationApp() const
+    { return qvariant_cast< QString >(property("DestinationApp")); }
+
     Q_PROPERTY(bool ShowInIndicator READ showInIndicator)
     inline bool showInIndicator() const
     { return qvariant_cast< bool >(property("ShowInIndicator")); }
@@ -53,95 +57,95 @@
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(allowed);
-        return asyncCallWithArgumentList(QLatin1String("allowGSMDownload"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("allowGSMDownload"), argumentList);
     }
 
     inline QDBusPendingReply<> cancel()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("cancel"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
     }
 
     inline QDBusPendingReply<StringMap> headers()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("headers"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("headers"), argumentList);
     }
 
     inline QDBusPendingReply<bool> isGSMDownloadAllowed()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("isGSMDownloadAllowed"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("isGSMDownloadAllowed"), argumentList);
     }
 
     inline QDBusPendingReply<QVariantMap> metadata()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("metadata"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("metadata"), argumentList);
     }
 
     inline QDBusPendingReply<> pause()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("pause"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("pause"), argumentList);
     }
 
     inline QDBusPendingReply<qulonglong> progress()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("progress"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("progress"), argumentList);
     }
 
     inline QDBusPendingReply<> resume()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("resume"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("resume"), argumentList);
     }
 
     inline QDBusPendingReply<> setDestinationDir(const QString &path)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(path);
-        return asyncCallWithArgumentList(QLatin1String("setDestinationDir"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("setDestinationDir"), argumentList);
     }
 
     inline QDBusPendingReply<> setHeaders(StringMap headers)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(headers);
-        return asyncCallWithArgumentList(QLatin1String("setHeaders"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("setHeaders"), argumentList);
     }
 
     inline QDBusPendingReply<> setMetadata(const QVariantMap &data)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(data);
-        return asyncCallWithArgumentList(QLatin1String("setMetadata"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("setMetadata"), argumentList);
     }
 
     inline QDBusPendingReply<> setThrottle(qulonglong speed)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(speed);
-        return asyncCallWithArgumentList(QLatin1String("setThrottle"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("setThrottle"), argumentList);
     }
 
     inline QDBusPendingReply<> start()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("start"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
     }
 
     inline QDBusPendingReply<qulonglong> throttle()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("throttle"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("throttle"), argumentList);
     }
 
     inline QDBusPendingReply<qulonglong> totalSize()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("totalSize"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("totalSize"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS

=== modified file 'src/downloads/priv/ubuntu/downloads/download.h'
--- src/downloads/priv/ubuntu/downloads/download.h	2014-12-01 09:20:00 +0000
+++ src/downloads/priv/ubuntu/downloads/download.h	2015-09-22 15:26:07 +0000
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_DOWNLOAD_H
-#define DOWNLOADER_LIB_DOWNLOAD_H
+#pragma once
 
 #include <QNetworkAccessManager>
 #include <QObject>
@@ -43,6 +42,7 @@
     Q_PROPERTY(QString ClickPackage READ clickPackage)
     Q_PROPERTY(bool ShowInIndicator READ showInIndicator)
     Q_PROPERTY(QString Title READ title)
+    Q_PROPERTY(QString DownloadOwner READ destinationApp)
 
  public:
     Download(const QString& id,
@@ -77,12 +77,15 @@
         // rename the transfer method
         Transfer::allowGSMData(allowed);
     }
+
     virtual bool isGSMDownloadAllowed() {
         return Transfer::isGSMDataAllowed();
     }
+
     virtual StringMap headers() const {
         return _headers;
     }
+
     virtual void setHeaders(StringMap headers) {
         _headers = headers;
     }
@@ -91,6 +94,14 @@
         _metadata = data;
     }
 
+    virtual QString destinationApp() {
+        return _destinationApp;
+    }
+
+    virtual void setDownloadOwner(const QString& owner) {
+        _destinationApp = owner;
+    }
+
     // slots to be implemented by the children
     virtual qulonglong progress() = 0;
     virtual qulonglong totalSize() = 0;
@@ -110,6 +121,7 @@
     QVariantMap _metadata;
 
  private:
+    QString _destinationApp = QString::null;
     QMap<QString, QString> _headers;
     QMap<QString, QObject*> _adaptors;
 };
@@ -120,4 +132,3 @@
 
 }  // Ubuntu
 
-#endif  // DOWNLOADER_LIB_APP_DOWNLOAD_H

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.cpp'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.cpp	2014-09-05 15:11:35 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.cpp	2015-09-22 15:26:07 +0000
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -c DownloadAdaptor -a download_adaptor.h:download_adaptor.cpp com.canonical.applications.download.xml
  *
- * qdbusxml2cpp is Copyright (C) 2014 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.
@@ -39,6 +39,12 @@
     return qvariant_cast< QString >(parent()->property("ClickPackage"));
 }
 
+QString DownloadAdaptor::destinationApp() const
+{
+    // get the value of property DownloadOwner
+    return qvariant_cast< QString >(parent()->property("DownloadOwner"));
+}
+
 bool DownloadAdaptor::showInIndicator() const
 {
     // get the value of property ShowInIndicator

=== modified file 'src/downloads/priv/ubuntu/downloads/download_adaptor.h'
--- src/downloads/priv/ubuntu/downloads/download_adaptor.h	2015-02-25 16:24:24 +0000
+++ src/downloads/priv/ubuntu/downloads/download_adaptor.h	2015-09-22 15:26:07 +0000
@@ -2,15 +2,15 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -c DownloadAdaptor -a download_adaptor.h:download_adaptor.cpp com.canonical.applications.download.xml
  *
- * qdbusxml2cpp is Copyright (C) 2014 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
  * before re-generating it.
  */
 
-#ifndef DOWNLOAD_ADAPTOR_H_1392117488
-#define DOWNLOAD_ADAPTOR_H_1392117488
+#ifndef DOWNLOAD_ADAPTOR_H_1440513488
+#define DOWNLOAD_ADAPTOR_H_1440513488
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
@@ -123,6 +123,7 @@
 "    <property access=\"read\" type=\"b\" name=\"ShowInIndicator\"/>\n"
 "    <property access=\"read\" type=\"s\" name=\"Title\"/>\n"
 "    <property access=\"read\" type=\"s\" name=\"ClickPackage\"/>\n"
+"    <property access=\"read\" type=\"s\" name=\"DestinationApp\"/>\n"
 "  </interface>\n"
         "")
 public:
@@ -133,6 +134,9 @@
     Q_PROPERTY(QString ClickPackage READ clickPackage)
     QString clickPackage() const;
 
+    Q_PROPERTY(QString DestinationApp READ destinationApp)
+    QString destinationApp() const;
+
     Q_PROPERTY(bool ShowInIndicator READ showInIndicator)
     bool showInIndicator() const;
 

=== modified file 'src/downloads/priv/ubuntu/downloads/manager.cpp'
--- src/downloads/priv/ubuntu/downloads/manager.cpp	2015-02-25 16:24:24 +0000
+++ src/downloads/priv/ubuntu/downloads/manager.cpp	2015-09-22 15:26:07 +0000
@@ -133,8 +133,27 @@
     return caller;
 }
 
+QString
+DownloadManager::getDownloadOwner(const QVariantMap& metadata) {
+    QScopedPointer<System::AppArmor> appArmor(new System::AppArmor(_conn));
+    auto owner = getCaller();
+    auto appId = appArmor->appId(owner);
+    if(appArmor->isConfined(appId)) {
+        return appId;
+    } else {
+        if (metadata.contains(Metadata::APP_ID)){
+            return metadata[Metadata::APP_ID].toString();
+        } else {
+            return "";
+        }
+    }
+    return "";
+}
+
 QDBusObjectPath
 DownloadManager::registerDownload(Download* download) {
+    download->setDownloadOwner(getDownloadOwner(download->metadata()));
+
     download->setThrottle(_throttle);
     download->allowGSMDownload(_allowMobileData);
     if (!_db->store(download)) {

=== modified file 'src/downloads/priv/ubuntu/downloads/manager.h'
--- src/downloads/priv/ubuntu/downloads/manager.h	2014-07-30 09:19:10 +0000
+++ src/downloads/priv/ubuntu/downloads/manager.h	2015-09-22 15:26:07 +0000
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_DOWNLOADER_H
-#define DOWNLOADER_LIB_DOWNLOADER_H
+#pragma once
 
 #include <QObject>
 #include <QByteArray>
@@ -95,7 +94,6 @@
     virtual QDBusObjectPath registerDownload(Download* download);
 
  private:
-
     typedef std::function<Download*(QString)> DownloadCreationFunc;
 
     void init();
@@ -109,6 +107,7 @@
                                    StringMap headers);
     void onDownloadsChanged(QString);
     QString getCaller();
+    QString getDownloadOwner(const QVariantMap& metadata);
 
  private:
     Application* _app = nullptr;
@@ -126,4 +125,3 @@
 }  // DownloadManager
 
 }  // Manager
-#endif  // DOWNLOADER_LIB_DOWNLOADER_H

=== modified file 'tests/downloads/daemon/test_download_manager.cpp'
--- tests/downloads/daemon/test_download_manager.cpp	2014-12-01 09:20:00 +0000
+++ tests/downloads/daemon/test_download_manager.cpp	2015-09-22 15:26:07 +0000
@@ -145,6 +145,27 @@
     SignalBarrier spy(_man, SIGNAL(downloadCreated(QDBusObjectPath)));
     DownloadStruct downStruct(url, metadata, headers);
 
+    auto dbusProxy = new MockDBusProxy();
+    auto reply = new MockPendingReply<QString>();
+    EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(_conn, _))
+            .Times(1)
+            .WillOnce(Return(dbusProxy));
+
+    EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(_))
+            .Times(1)
+            .WillOnce(Return(reply));
+
+    EXPECT_CALL(*reply, waitForFinished())
+            .Times(1);
+
+    EXPECT_CALL(*reply, isError())
+            .Times(1)
+            .WillOnce(Return(false));
+
+    EXPECT_CALL(*reply, value())
+            .Times(1)
+            .WillOnce(Return("TEST_APP_ID"));
+
     // set the expectations of the factory since is the one that
     // creates the downloads. The matchers will ensure that the
     // correct value is used.
@@ -157,10 +178,18 @@
     EXPECT_CALL(*down.data(), setThrottle(_man->defaultThrottle()))
         .Times(1);
 
+    EXPECT_CALL(*down.data(), allowGSMDownload(_))
+            .Times(1);
+
+
     EXPECT_CALL(*down.data(), path())
         .Times(1)
         .WillRepeatedly(Return(dbusPath));
 
+    EXPECT_CALL(*down.data(), metadata())
+        .Times(1)
+        .WillRepeatedly(Return(QVariantMap()));
+
     // expected actions performed by the db
     EXPECT_CALL(*_database, store(down.data()))
         .Times(1)
@@ -248,6 +277,27 @@
             .Times(1)
             .WillRepeatedly(Return(down.data()));
 
+    auto dbusProxy = new MockDBusProxy();
+    auto reply = new MockPendingReply<QString>();
+    EXPECT_CALL(*_dbusProxyFactory, createDBusProxy(_conn, _))
+            .Times(1)
+            .WillOnce(Return(dbusProxy));
+
+    EXPECT_CALL(*dbusProxy, GetConnectionAppArmorSecurityContext(_))
+            .Times(1)
+            .WillOnce(Return(reply));
+
+    EXPECT_CALL(*reply, waitForFinished())
+            .Times(1);
+
+    EXPECT_CALL(*reply, isError())
+            .Times(1)
+            .WillOnce(Return(false));
+
+    EXPECT_CALL(*reply, value())
+            .Times(1)
+            .WillOnce(Return("TEST_APP_ID"));
+
     // expected actions to be performed on the download
     EXPECT_CALL(*down.data(), setThrottle(_man->defaultThrottle()))
         .Times(1);
@@ -259,6 +309,10 @@
         .Times(1)
         .WillRepeatedly(Return(dbusPath));
 
+    EXPECT_CALL(*down.data(), metadata())
+            .Times(1)
+            .WillRepeatedly(Return(QVariantMap()));
+
     // expected actions performed by the db
     EXPECT_CALL(*_database, store(down.data()))
         .Times(1)

=== modified file 'tests/downloads/daemon/test_metadata.cpp'
--- tests/downloads/daemon/test_metadata.cpp	2014-09-22 23:24:34 +0000
+++ tests/downloads/daemon/test_metadata.cpp	2015-09-22 15:26:07 +0000
@@ -16,6 +16,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <stdlib.h>
+
+#include <QProcessEnvironment>
+
 #include "test_metadata.h"
 
 using namespace Ubuntu::Transfers;
@@ -348,5 +352,91 @@
     QVERIFY(!metadata.hasDeflate());
 }
 
+void
+TestMetadata::testDownloadOwner_data() {
+    QTest::addColumn<QString>("owner");
+
+    QTest::newRow("First app") << "First app";
+    QTest::newRow("Browser") << "Browser";
+    QTest::newRow("Test") << "Test";
+}
+
+void
+TestMetadata::testDownloadOwner() {
+    QFETCH(QString, owner);
+
+    Metadata metadata;
+    metadata[Metadata::APP_ID] = owner;
+    QCOMPARE(owner, metadata.destinationApp());
+}
+
+void
+TestMetadata::testSetDownloadDestinationApp_data() {
+    QTest::addColumn<QString>("owner");
+
+    QTest::newRow("First app") << "First app";
+    QTest::newRow("Browser") << "Browser";
+    QTest::newRow("Test") << "Test";
+}
+
+void
+TestMetadata::testSetDownloadDestinationApp() {
+    QFETCH(QString, owner);
+
+    Metadata metadata;
+    metadata.setOwner(owner);
+    QCOMPARE(metadata[Metadata::APP_ID].toString(), owner);
+}
+
+void
+TestMetadata::testHasDownloadDestinationAppTrue() {
+    Metadata metadata;
+    metadata.setOwner("pedro");
+
+    QVERIFY(metadata.hasOwner());
+}
+
+void
+TestMetadata::testHasDownloadDestinationAppFalse() {
+    Metadata metadata;
+    metadata.clear();
+
+    QVERIFY(!metadata.hasOwner());
+}
+
+void
+TestMetadata::testDestinationAppIsPickedFromEnv_data() {
+    QTest::addColumn<QString>("appid");
+
+    QTest::newRow("First app") << "Chanco";
+    QTest::newRow("Browser") << "Browser";
+    QTest::newRow("Test") << "Test";
+}
+
+
+void
+TestMetadata::testDestinationAppIsPickedFromEnv() {
+    QFETCH(QString, appid);
+
+    // set the used envar
+    setenv("APP_ID", appid.toStdString().c_str(), 1);
+
+    Metadata metadata;
+    QVERIFY(metadata.hasOwner());
+    QCOMPARE(metadata.destinationApp(), appid);
+}
+
+void
+TestMetadata::testDestinationAppIsAlreadyPresent() {
+    QString appid("Test");
+    QVariantMap map;
+
+    // set the used envar
+    setenv("APP_ID", appid.toStdString().c_str(), 1);
+    Metadata metadata(map);
+    QVERIFY(metadata.hasOwner());
+    QCOMPARE(metadata.destinationApp(), appid);
+}
+
 QTEST_MAIN(TestMetadata)
 #include "moc_test_metadata.cpp"

=== modified file 'tests/downloads/daemon/test_metadata.h'
--- tests/downloads/daemon/test_metadata.h	2014-09-22 23:24:34 +0000
+++ tests/downloads/daemon/test_metadata.h	2015-09-22 15:26:07 +0000
@@ -16,8 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef TEST_METADATA_H
-#define TEST_METADATA_H
+#pragma once
 
 #include <QObject>
 #include <ubuntu/transfers/metadata.h>
@@ -71,6 +70,14 @@
     void testSetDeflate();
     void testHasDeflateTrue();
     void testHasDeflateFalse();
+    void testDownloadOwner_data();
+    void testDownloadOwner();
+    void testSetDownloadDestinationApp_data();
+    void testSetDownloadDestinationApp();
+    void testHasDownloadDestinationAppTrue();
+    void testHasDownloadDestinationAppFalse();
+    void testDestinationAppIsPickedFromEnv_data();
+    void testDestinationAppIsPickedFromEnv();
+    void testDestinationAppIsAlreadyPresent();
 };
 
-#endif // TEST_METADATA_H