content-hub

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

  1. serialized_content_transfers
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Michael Sheldon
Approved revision: 205
Merged at revision: 200
Proposed branch: lp://staging/~ken-vandine/content-hub/serialized_content_transfers
Merge into: lp://staging/content-hub
Diff against target: 565 lines (+189/-28)
21 files modified
examples/exporter/exampleexporter.cpp (+5/-1)
examples/importer/exampleimporter.cpp (+6/-3)
examples/importer/importer.cpp (+1/-0)
import/Ubuntu/Content/contentitem.cpp (+20/-0)
import/Ubuntu/Content/contentitem.h (+5/-0)
import/Ubuntu/Content/contenttype.cpp (+6/-0)
import/Ubuntu/Content/contenttype.h (+2/-1)
include/com/ubuntu/content/item.h (+11/-1)
include/com/ubuntu/content/type.h (+1/-0)
src/com/ubuntu/content/detail/transfer.cpp (+12/-9)
src/com/ubuntu/content/item.cpp (+56/-6)
src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml (+12/-0)
src/com/ubuntu/content/service/hook.cpp (+1/-1)
src/com/ubuntu/content/type.cpp (+6/-0)
tests/acceptance-tests/app_hub_communication_transfer.cpp (+4/-2)
tests/peers/exporter/autoexporter.cpp (+6/-0)
tests/peers/importer/autoimporter.cpp (+6/-0)
tests/peers/importer/content-hub-test-importer.json (+2/-1)
tests/peers/sharer/autosharer.cpp (+6/-0)
tests/peers/sharer/content-hub-test-sharer.json (+2/-1)
tests/qml-tests/tst_ContentHub.qml (+19/-2)
To merge this branch: bzr merge lp://staging/~ken-vandine/content-hub/serialized_content_transfers
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+256035@code.staging.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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://staging/~ken-vandine/content-hub/serialized_content_transfers updated
201. By Ken VanDine

Added more debug output to the test peers

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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://staging/~ken-vandine/content-hub/serialized_content_transfers updated
202. By Ken VanDine

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

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

204. By Ken VanDine

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

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://staging/~ken-vandine/content-hub/serialized_content_transfers updated
205. By Ken VanDine

merged trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches