Merge lp:~michael-sheldon/content-hub/expose-transfer-source-destination into lp:content-hub

[Michael Sheldon]

Expose the source and destination app IDs on transfers.

Expose the source and destination app IDs on transfers.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/content-hub-ci/190/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/47

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good!

review: Approve

=== modified file 'import/Ubuntu/Content/contenttransfer.cpp'
--- import/Ubuntu/Content/contenttransfer.cpp	2014-08-05 20:03:08 +0000
+++ import/Ubuntu/Content/contenttransfer.cpp	2014-08-27 13:54:21 +0000
@@ -326,6 +326,29 @@
     return ContentType::hubType2contentType(m_transfer->contentType());
 }
 
+
+/*!
+ * \qmlproperty QString ContentTransfer::source
+ * Provides the app id of the source application for this transfer
+ */
+QString ContentTransfer::source()
+{
+    TRACE() << Q_FUNC_INFO;
+
+    return m_transfer->source();
+}
+
+/*!
+ * \qmlproperty QString ContentTransfer::destination
+ * Provides the app id of the destination application for this transfer
+ */
+QString ContentTransfer::destination()
+{
+    TRACE() << Q_FUNC_INFO;
+
+    return m_transfer->destination();
+}
+
 /*!
  * \brief ContentTransfer::updateState update the state from the hub transfer object
  * \internal

=== modified file 'import/Ubuntu/Content/contenttransfer.h'
--- import/Ubuntu/Content/contenttransfer.h	2014-08-04 17:57:26 +0000
+++ import/Ubuntu/Content/contenttransfer.h	2014-08-27 13:54:21 +0000
@@ -42,6 +42,8 @@
     Q_PROPERTY(QQmlListProperty<ContentItem> items READ items NOTIFY itemsChanged)
     Q_PROPERTY(QString downloadId READ downloadId WRITE setDownloadId NOTIFY downloadIdChanged)
     Q_PROPERTY(ContentType::Type contentType READ contentType CONSTANT)
+    Q_PROPERTY(QString source READ source)
+    Q_PROPERTY(QString destination READ destination)
 
 public:
     enum State {
@@ -93,6 +95,9 @@
 
     ContentType::Type contentType() const;
 
+    QString source();
+    QString destination();
+
 Q_SIGNALS:
     void stateChanged();
     void itemsChanged();

=== modified file 'include/com/ubuntu/content/transfer.h'
--- include/com/ubuntu/content/transfer.h	2014-08-04 17:56:09 +0000
+++ include/com/ubuntu/content/transfer.h	2014-08-27 13:54:21 +0000
@@ -62,6 +62,8 @@
     Q_PROPERTY(Direction direction READ direction)
     Q_PROPERTY(QString downloadId READ downloadId WRITE setDownloadId NOTIFY downloadIdChanged)
     Q_PROPERTY(QString contentType READ contentType)
+    Q_PROPERTY(QString source READ source)
+    Q_PROPERTY(QString destination READ destination)
 
   public:
     enum State
@@ -111,6 +113,8 @@
     Q_INVOKABLE virtual bool setDownloadId(const QString);
     Q_INVOKABLE virtual bool download();
     Q_INVOKABLE virtual QString contentType() const;
+    Q_INVOKABLE virtual QString source() const;
+    Q_INVOKABLE virtual QString destination() const;
 
     Q_SIGNAL void stateChanged();
     Q_SIGNAL void storeChanged();

=== modified file 'src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml'
--- src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml	2014-08-27 13:54:21 +0000
@@ -58,5 +58,11 @@
     <method name="ContentType">
       <arg name="content_type" type="s" direction="out" />
     </method>
+    <method name="source">
+      <arg name="source" type="s" direction="out" />
+    </method>
+    <method name="destination">
+      <arg name="destination" type="s" direction="out" />
+    </method>
  </interface>
 </node>

=== modified file 'src/com/ubuntu/content/transfer.cpp'
--- src/com/ubuntu/content/transfer.cpp	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/transfer.cpp	2014-08-27 13:54:21 +0000
@@ -126,3 +126,13 @@
 {
     return d->contentType();
 }
+
+QString cuc::Transfer::source() const
+{
+    return d->source();
+}
+
+QString cuc::Transfer::destination() const
+{
+    return d->destination();
+}

=== modified file 'src/com/ubuntu/content/transfer_p.h'
--- src/com/ubuntu/content/transfer_p.h	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/transfer_p.h	2014-08-27 13:54:21 +0000
@@ -227,6 +227,22 @@
         return static_cast<QString>(reply.value());
     }
 
+    QString source()
+    {
+        auto reply = remote_transfer->source();
+        reply.waitForFinished();
+
+        return static_cast<QString>(reply.value());
+    }
+
+    QString destination()
+    {
+        auto reply = remote_transfer->destination();
+        reply.waitForFinished();
+
+        return static_cast<QString>(reply.value());
+    }
+
     com::ubuntu::content::dbus::Transfer* remote_transfer;
 };
 }