Merge lp:~ken-vandine/content-hub/serialized_content_transfers into lp:content-hub

[Ken VanDine]

Added ContentType.Text as a well known type
Added ContentItem.text property for serialized content

Added ContentType.Text as a well known type
Added ContentItem.text property for serialized content

This can be tested the following 2 clicks installed:
 * http://people.canonical.com/~kenvandine/hub-text-exporter.ken-vandine_0.1_all.click
 * http://people.canonical.com/~kenvandine/com.ubuntu.telegram_1.3.3.303_armhf.click

1. Launch the hub-text-exporter app, enter some text and click "Share with..."
2. Select "Telegram" from the peer picker
3. Choose a chat to insert the text in

Expected results: You should see the text entered posted to the chat.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:200
http://jenkins.qa.ubuntu.com/job/content-hub-ci/245/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/41

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

review: Approve (continuous-integration)

[lp:~ken-vandine/content-hub/serialized_content_transfers]

201. By Ken VanDine on 2015-04-14

Added more debug output to the test peers

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:201
http://jenkins.qa.ubuntu.com/job/content-hub-ci/246/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/42

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

review: Approve (continuous-integration)

[lp:~ken-vandine/content-hub/serialized_content_transfers]

202. By Ken VanDine on 2015-04-21

Don't force streamType to x-url when the url is set, this lets a link shared include text as well.

203. By Ken VanDine on 2015-04-21

ensure the ContentItem.text property gets set when copying/linking files

204. By Ken VanDine on 2015-04-21

Don't create a new Item to for the copied file, just change the url.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/content-hub-ci/249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/45

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

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

 * No

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?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

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

 * No change

[lp:~ken-vandine/content-hub/serialized_content_transfers]

205. By Ken VanDine on 2015-04-21

merged trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

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

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'examples/exporter/exampleexporter.cpp'
--- examples/exporter/exampleexporter.cpp	2014-03-07 19:28:54 +0000
+++ examples/exporter/exampleexporter.cpp	2015-04-21 18:26:55 +0000
@@ -46,7 +46,11 @@
 
     QVector<cuc::Item> items;
     items << cuc::Item(QUrl("file:///tmp/test1"));
-    items << cuc::Item(QUrl("file:///tmp/test2"));
+    auto i = cuc::Item();
+    i.setName("Test2");
+    i.setText("Test Two");
+    items << i;
+
     transfer->charge(items);
     qDebug() << Q_FUNC_INFO << "Items:" << items.count();
 }

=== modified file 'examples/importer/exampleimporter.cpp'
--- examples/importer/exampleimporter.cpp	2014-02-13 22:59:20 +0000
+++ examples/importer/exampleimporter.cpp	2015-04-21 18:26:55 +0000
@@ -25,14 +25,17 @@
     hub->register_import_export_handler(this);
 }
 
-
 void ExampleImporter::handle_import(cuc::Transfer *transfer)
 {
     qDebug() << Q_FUNC_INFO;
     auto items = transfer->collect();
     qDebug() << Q_FUNC_INFO << "Items:" << items.count();
-    Q_FOREACH(cuc::Item item, items)
-        qDebug() << Q_FUNC_INFO << "Item:" << item.url();
+    Q_FOREACH(cuc::Item item, items) {
+        qDebug() << Q_FUNC_INFO << "URL:" << item.url();
+        qDebug() << Q_FUNC_INFO << "Name:" << item.name();
+        qDebug() << Q_FUNC_INFO << "Text:" << item.text();
+        qDebug() << Q_FUNC_INFO << "StreamType:" << item.streamType();
+    }
     transfer->finalize();
 }
 

=== modified file 'examples/importer/importer.cpp'
--- examples/importer/importer.cpp	2014-02-13 22:59:20 +0000
+++ examples/importer/importer.cpp	2015-04-21 18:26:55 +0000
@@ -41,6 +41,7 @@
         auto peer = cuc::Peer{peerName};
         qDebug() << Q_FUNC_INFO << "PEER: " << peer.id();
         auto transfer = hub->create_import_from_peer(peer);
+        transfer->setSelectionType(cuc::Transfer::SelectionType::multiple);
         transfer->start();
     }
 

=== modified file 'import/Ubuntu/Content/contentitem.cpp'
--- import/Ubuntu/Content/contentitem.cpp	2014-10-07 16:52:48 +0000
+++ import/Ubuntu/Content/contentitem.cpp	2015-04-21 18:26:55 +0000
@@ -84,6 +84,26 @@
 }
 
 /*!
+ * \qmlproperty string ContentItem::text
+ * Content of the transfer
+ */
+QString ContentItem::text()
+{
+    TRACE() << Q_FUNC_INFO;
+    return QString(m_item.text());
+}
+
+void ContentItem::setText(const QString &text)
+{
+    TRACE() << Q_FUNC_INFO;
+    if (text == QString(m_item.text()))
+        return;
+
+    m_item.setText(text);
+    Q_EMIT textChanged();
+}
+
+/*!
  * \brief ContentItem::item
  * \internal
  */

=== modified file 'import/Ubuntu/Content/contentitem.h'
--- import/Ubuntu/Content/contentitem.h	2014-07-14 12:32:27 +0000
+++ import/Ubuntu/Content/contentitem.h	2015-04-21 18:26:55 +0000
@@ -28,6 +28,7 @@
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
 
 public:
     ContentItem(QObject *parent = nullptr);
@@ -38,6 +39,9 @@
     const QUrl &url() const;
     void setUrl(const QUrl &url);
 
+    QString text();
+    void setText(const QString &text);
+
     const com::ubuntu::content::Item &item() const;
     void setItem(const com::ubuntu::content::Item &item);
 
@@ -48,6 +52,7 @@
 Q_SIGNALS:
     void nameChanged();
     void urlChanged();
+    void textChanged();
 
 private:
     com::ubuntu::content::Item m_item;

=== modified file 'import/Ubuntu/Content/contenttype.cpp'
--- import/Ubuntu/Content/contenttype.cpp	2014-11-03 20:41:08 +0000
+++ import/Ubuntu/Content/contenttype.cpp	2015-04-21 18:26:55 +0000
@@ -55,6 +55,9 @@
      \li ContentType.EBooks
      \li EBooks
    \row
+     \li ContentType.Text
+     \li Text
+   \row
      \li ContentType.All
      \li Any of the above content types
    \endtable
@@ -97,6 +100,7 @@
     case Videos: return cuc::Type::Known::videos();
     case Links: return cuc::Type::Known::links();
     case EBooks: return cuc::Type::Known::ebooks();
+    case Text: return cuc::Type::Known::text();
     default: return cuc::Type::unknown();
     }
 }
@@ -122,6 +126,8 @@
         return Links;
     else if (type ==  cuc::Type::Known::ebooks().id())
         return EBooks;
+    else if (type ==  cuc::Type::Known::text().id())
+        return Text;
     else
       return Unknown;
 }

=== modified file 'import/Ubuntu/Content/contenttype.h'
--- import/Ubuntu/Content/contenttype.h	2014-11-03 20:41:08 +0000
+++ import/Ubuntu/Content/contenttype.h	2015-04-21 18:26:55 +0000
@@ -37,7 +37,8 @@
         Contacts = 4,
         Videos = 5,
         Links = 6,
-        EBooks = 7
+        EBooks = 7,
+        Text = 8
     };
 
     ContentType(QObject *parent = nullptr);

=== modified file 'include/com/ubuntu/content/item.h'
--- include/com/ubuntu/content/item.h	2014-07-14 12:31:47 +0000
+++ include/com/ubuntu/content/item.h	2015-04-21 18:26:55 +0000
@@ -33,8 +33,11 @@
 class Item : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QUrl url READ url())
+    Q_PROPERTY(QUrl url READ url() WRITE setUrl)
     Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QString text READ text WRITE setText)
+    Q_PROPERTY(QByteArray stream READ stream WRITE setStream)
+    Q_PROPERTY(QString streamType READ streamType WRITE setStreamType)
 
   public:
     Item(const QUrl& = QUrl(), QObject* = nullptr);
@@ -45,8 +48,15 @@
     bool operator==(const Item&) const;
 
     Q_INVOKABLE const QUrl& url() const;
+    Q_INVOKABLE void setUrl(const QUrl &url) const;
     Q_INVOKABLE const QString& name() const;
     Q_INVOKABLE void setName(const QString &name) const;
+    Q_INVOKABLE const QString text() const;
+    Q_INVOKABLE void setText(const QString &text) const;
+    Q_INVOKABLE const QByteArray& stream() const;
+    Q_INVOKABLE void setStream(const QByteArray &stream) const;
+    Q_INVOKABLE const QString& streamType() const;
+    Q_INVOKABLE void setStreamType(const QString &type) const;
 
   private:
     struct Private;

=== modified file 'include/com/ubuntu/content/type.h'
--- include/com/ubuntu/content/type.h	2014-11-03 20:41:08 +0000
+++ include/com/ubuntu/content/type.h	2015-04-21 18:26:55 +0000
@@ -49,6 +49,7 @@
         static const Type& videos();
         static const Type& links();
         static const Type& ebooks();
+        static const Type& text();
     };
 
     virtual ~Type();

=== modified file 'src/com/ubuntu/content/detail/transfer.cpp'
--- src/com/ubuntu/content/detail/transfer.cpp	2015-03-18 16:03:36 +0000
+++ src/com/ubuntu/content/detail/transfer.cpp	2015-04-21 18:26:55 +0000
@@ -168,16 +168,19 @@
 
     QVariantList ret;
     Q_FOREACH(QVariant iv, items) {
-        cuc::Item origItem = qdbus_cast<Item>(iv);
-        QString newItem = copy_to_store(origItem.url().toString(), d->store);
-        if (!newItem.isEmpty()) {
-            cuc::Item copiedItem = cuc::Item{QUrl(newItem)};
-            copiedItem.setName(origItem.name());
-            TRACE() << Q_FUNC_INFO << "Item:" << copiedItem.url();
-            ret.append(QVariant::fromValue(copiedItem));
+        cuc::Item item = qdbus_cast<Item>(iv);
+        if (item.url().isEmpty()) {
+            ret.append(QVariant::fromValue(item));
         } else {
-            ret.clear();
-            break;
+            QString newUrl = copy_to_store(item.url().toString(), d->store);
+            if (!newUrl.isEmpty()) {
+                item.setUrl(QUrl(newUrl));
+                TRACE() << Q_FUNC_INFO << "Item:" << item.url();
+                ret.append(QVariant::fromValue(item));
+            } else {
+                ret.clear();
+                break;
+            }
         }
     }
 

=== modified file 'src/com/ubuntu/content/item.cpp'
--- src/com/ubuntu/content/item.cpp	2014-07-15 11:28:00 +0000
+++ src/com/ubuntu/content/item.cpp	2015-04-21 18:26:55 +0000
@@ -27,14 +27,16 @@
 {
     QUrl url;
     QString name;
+    QByteArray stream;
+    QString streamType;
 
     bool operator==(const Private& rhs) const
     {
-        return url == rhs.url && name == rhs.name;
+        return url == rhs.url && name == rhs.name && stream == rhs.stream && streamType == rhs.streamType;
     }
 };
 
-cuc::Item::Item(const QUrl& url, QObject* parent) : QObject(parent), d{new cuc::Item::Private{url, QString()}}
+cuc::Item::Item(const QUrl& url, QObject* parent) : QObject(parent), d{new cuc::Item::Private{url, QString(), QByteArray(), QString()}}
 {
 }
 
@@ -65,6 +67,14 @@
     return d->url;
 }
 
+void cuc::Item::setUrl(const QUrl& newUrl) const
+{
+    if (newUrl == d->url)
+        return;
+
+    d->url = newUrl;
+}
+
 const QString& cuc::Item::name() const
 {
     return d->name;
@@ -76,10 +86,48 @@
         d->name = newName;
 }
 
+const QString cuc::Item::text() const
+{
+    if (d->streamType == "plain/text")
+        return QString(d->stream);
+    return QString();
+}
+
+void cuc::Item::setText(const QString& text) const
+{
+    if (text == QString(d->stream))
+        return;
+
+    setStream(QByteArray::fromStdString(text.toStdString()));
+    d->streamType = QString("plain/text");
+}
+
+const QByteArray& cuc::Item::stream() const
+{
+    return d->stream;
+}
+
+void cuc::Item::setStream(const QByteArray& newStream) const
+{
+    if (newStream != d->stream)
+        d->stream = newStream;
+}
+
+const QString& cuc::Item::streamType() const
+{   
+    return d->streamType;
+}
+
+void cuc::Item::setStreamType(const QString& newStreamType) const
+{
+    if (newStreamType != d->streamType)
+        d->streamType = newStreamType;
+}
+
 QDBusArgument &operator<<(QDBusArgument &argument, const cuc::Item& item)
 {
     argument.beginStructure();
-    argument << item.name() << item.url().toDisplayString();
+    argument << item.streamType() << item.stream() << item.name() << item.url().toDisplayString();
     argument.endStructure();
     return argument;
 }
@@ -89,14 +137,16 @@
     TRACE() << Q_FUNC_INFO;
     QString name;
     QString urlString;
-
+    QByteArray stream;
+    QString streamType;
 
     argument.beginStructure();
-    argument >> name >> urlString;
+    argument >> streamType >> stream >> name >> urlString;
     argument.endStructure();
 
     item = cuc::Item{QUrl(urlString)};
     item.setName(name);
+    item.setStream(stream);
+    item.setStreamType(streamType);
     return argument;
 }
-

=== modified file 'src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml'
--- src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2014-11-03 20:41:08 +0000
+++ src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2015-04-21 18:26:55 +0000
@@ -22,6 +22,9 @@
     <key name="ebooks" type="as">
       <default>[]</default>
     </key>
+    <key name="text" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.source" path="/com/ubuntu/content/hub/source/">
     <key name="pictures" type="as">
@@ -45,6 +48,9 @@
     <key name="ebooks" type="as">
       <default>[]</default>
     </key>
+    <key name="text" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.destination" path="/com/ubuntu/content/hub/destination/">
     <key name="pictures" type="as">
@@ -68,6 +74,9 @@
     <key name="ebooks" type="as">
       <default>[]</default>
     </key>
+    <key name="text" type="as">
+      <default>[]</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.share" path="/com/ubuntu/content/hub/share/">
     <key name="pictures" type="as">
@@ -91,5 +100,8 @@
     <key name="ebooks" type="as">
       <default>[]</default>
     </key>
+    <key name="text" type="as">
+      <default>[]</default>
+    </key>
   </schema>
 </schemalist>

=== modified file 'src/com/ubuntu/content/service/hook.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2014-11-03 20:41:08 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2015-04-21 18:26:55 +0000
@@ -126,7 +126,7 @@
     TRACE() << Q_FUNC_INFO << "Hook:" << result.filePath();
 
     QStringList knownTypes;
-    knownTypes << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks";
+    knownTypes << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks" << "text";
     QString app_id = result.fileName();
     auto peer = cuc::Peer(app_id);
 

=== modified file 'src/com/ubuntu/content/type.cpp'
--- src/com/ubuntu/content/type.cpp	2014-11-03 20:41:08 +0000
+++ src/com/ubuntu/content/type.cpp	2015-04-21 18:26:55 +0000
@@ -110,3 +110,9 @@
     static cuc::Type t("ebooks", nullptr);
     return t;
 }
+
+const cuc::Type& cuc::Type::Known::text()
+{
+    static cuc::Type t("text", nullptr);
+    return t;
+}

=== modified file 'tests/acceptance-tests/app_hub_communication_transfer.cpp'
--- tests/acceptance-tests/app_hub_communication_transfer.cpp	2015-03-18 18:19:15 +0000
+++ tests/acceptance-tests/app_hub_communication_transfer.cpp	2015-04-21 18:26:55 +0000
@@ -133,16 +133,18 @@
             source_items[0].setName("name1");
             source_items << cuc::Item(QUrl::fromLocalFile(QFileInfo("file2").absoluteFilePath()));
             source_items[1].setName("name2");
-            source_items << cuc::Item(QUrl::fromLocalFile(QFileInfo("file3").absoluteFilePath()));
+            source_items << cuc::Item();
             source_items[2].setName("name3");
+            source_items[2].setText("data3");
             
             QVector<cuc::Item> expected_items;
             expected_items << cuc::Item(QUrl("file://" + store_dir.path() + "/file1"));
             expected_items[0].setName("name1");
             expected_items << cuc::Item(QUrl("file://" + store_dir.path() + "/file2"));
             expected_items[1].setName("name2");
-            expected_items << cuc::Item(QUrl("file://" + store_dir.path() + "/file3"));
+            expected_items << cuc::Item();
             expected_items[2].setName("name3");
+            expected_items[2].setText("data3");
 
             /** [Importing pictures] */
             auto hub = cuc::Hub::Client::instance();

=== modified file 'tests/peers/exporter/autoexporter.cpp'
--- tests/peers/exporter/autoexporter.cpp	2014-08-07 18:48:10 +0000
+++ tests/peers/exporter/autoexporter.cpp	2015-04-21 18:26:55 +0000
@@ -62,6 +62,12 @@
     connect(transfer, SIGNAL(stateChanged()), this, SLOT(stateChanged()));
 
     qDebug() << Q_FUNC_INFO << "Items:" << items.count();
+    Q_FOREACH(cuc::Item item, items) {
+        qDebug() << Q_FUNC_INFO << "URL:" << item.url();
+        qDebug() << Q_FUNC_INFO << "Name:" << item.name();
+        qDebug() << Q_FUNC_INFO << "Text:" << item.text();
+        qDebug() << Q_FUNC_INFO << "StreamType:" << item.streamType();
+    }
 }
 
 void AutoExporter::handle_share(cuc::Transfer *transfer)

=== modified file 'tests/peers/importer/autoimporter.cpp'
--- tests/peers/importer/autoimporter.cpp	2014-08-07 19:51:09 +0000
+++ tests/peers/importer/autoimporter.cpp	2015-04-21 18:26:55 +0000
@@ -38,6 +38,12 @@
     QVector<cuc::Item> items;
     items = transfer->collect();
     qDebug() << Q_FUNC_INFO << "Items:" << items.count();
+    Q_FOREACH(cuc::Item item, items) {
+        qDebug() << Q_FUNC_INFO << "URL:" << item.url();
+        qDebug() << Q_FUNC_INFO << "Name:" << item.name();
+        qDebug() << Q_FUNC_INFO << "Text:" << item.text();
+        qDebug() << Q_FUNC_INFO << "StreamType:" << item.streamType();
+    }
 }
 
 void AutoImporter::handle_export(cuc::Transfer *transfer)

=== modified file 'tests/peers/importer/content-hub-test-importer.json'
--- tests/peers/importer/content-hub-test-importer.json	2014-11-25 14:18:13 +0000
+++ tests/peers/importer/content-hub-test-importer.json	2015-04-21 18:26:55 +0000
@@ -6,6 +6,7 @@
         "music",
         "contacts",
         "links",
-        "ebooks"
+        "ebooks",
+        "text"
     ]
 }

=== modified file 'tests/peers/sharer/autosharer.cpp'
--- tests/peers/sharer/autosharer.cpp	2014-08-07 18:48:10 +0000
+++ tests/peers/sharer/autosharer.cpp	2015-04-21 18:26:55 +0000
@@ -50,6 +50,12 @@
     QVector<cuc::Item> items;
     items = transfer->collect();
     qDebug() << Q_FUNC_INFO << "Items:" << items.count();
+    Q_FOREACH(cuc::Item item, items) {
+        qDebug() << Q_FUNC_INFO << "URL:" << item.url();
+        qDebug() << Q_FUNC_INFO << "Name:" << item.name();
+        qDebug() << Q_FUNC_INFO << "Text:" << item.text();
+        qDebug() << Q_FUNC_INFO << "StreamType:" << item.streamType();
+    }
 }
 
 void AutoSharer::stateChanged()

=== modified file 'tests/peers/sharer/content-hub-test-sharer.json'
--- tests/peers/sharer/content-hub-test-sharer.json	2014-11-25 14:18:13 +0000
+++ tests/peers/sharer/content-hub-test-sharer.json	2015-04-21 18:26:55 +0000
@@ -6,6 +6,7 @@
         "music",
         "contacts",
         "links",
-        "ebooks"
+        "ebooks",
+        "text"
     ]
 }

=== modified file 'tests/qml-tests/tst_ContentHub.qml'
--- tests/qml-tests/tst_ContentHub.qml	2014-07-15 11:36:57 +0000
+++ tests/qml-tests/tst_ContentHub.qml	2015-04-21 18:26:55 +0000
@@ -31,7 +31,7 @@
         verify(transfer !== null, "No transer Object returned")
     }
 
-    function test_export_request() {
+    function test_export_request_pictures() {
         var filePath = "file:///foo/bar.png";
         var transfer = destPeer.request();
         transfer.items = [ resultComponent.createObject(test, {"url": filePath, "name": "test"}) ];
@@ -39,16 +39,33 @@
         // This shouldn't be necessary, but without it we compare the results to fast
         ContentHub.exportRequested(transfer);
         compare(test.exportTransfer, transfer, "Transfer object not correcty set");
-        compare(test.exportTransfer.items[0].url, filePath, "Transfer contents incorrect");
+        compare(test.exportTransfer.items[0].url, filePath, "Transfer url incorrect");
         compare(test.exportTransfer.items[0].name, "test", "Transfer name incorrect");
     }
 
+    function test_export_request_text() {
+        var transfer = textPeer.request();
+        transfer.items = [ resultComponent.createObject(test, {"url": "", "name": "test", "text": "some text"}) ];
+        transfer.state = ContentTransfer.Charged;
+        // This shouldn't be necessary, but without it we compare the results to fast
+        ContentHub.exportRequested(transfer);
+        compare(test.exportTransfer, transfer, "Transfer object not correcty set");
+        compare(test.exportTransfer.items[0].text, "some text", "Transfer text incorrect");
+    }
+
     Component {
         id: resultComponent
         ContentItem {}
     }
 
     ContentPeer {
+        id: textPeer
+        handler: ContentHandler.Destination
+        contentType: ContentType.Text
+        appId: "com.some.dest"
+    }
+
+    ContentPeer {
         id: sourcePeer
         handler: ContentHandler.Source
         contentType: ContentType.Pictures