Merge lp:~renatofilho/messaging-app/register-as-destination into lp:messaging-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 575
Merged at revision: 578
Proposed branch: lp:~renatofilho/messaging-app/register-as-destination
Merge into: lp:messaging-app
Diff against target: 48 lines (+16/-6)
2 files modified
src/messaging-app-content.json (+7/-0)
src/qml/messaging-app.qml (+9/-6)
To merge this branch: bzr merge lp:~renatofilho/messaging-app/register-as-destination
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Pending
Ubuntu Phablet Team Pending
Review via email: mp+300239@code.launchpad.net

Commit message

Register app as "destination" for "contacts", "pictures", "links", "text", "videos";

To post a comment you must log in.
575. By Renato Araujo Oliveira Filho

handle 'onImportRequested'.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:574
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/56/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/986/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/986
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/888
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/888
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/888
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/885/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/885
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/885/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/885
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/885/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/885/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/885
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/885/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/885
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/885/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/885/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/885
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/885/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/885
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/885/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/56/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:575
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/57/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/987/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/987
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/889
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/889
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/889
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/886/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/886
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/886/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/886
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/886/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/886/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/886
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/886/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/886
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/886/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/886/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/886
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/886/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/886
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/886/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/57/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/messaging-app-content.json'
2--- src/messaging-app-content.json 2016-01-27 19:58:52 +0000
3+++ src/messaging-app-content.json 2016-07-15 19:28:37 +0000
4@@ -1,4 +1,11 @@
5 {
6+ "destination": [
7+ "contacts",
8+ "pictures",
9+ "links",
10+ "text",
11+ "videos"
12+ ],
13 "share": [
14 "contacts",
15 "pictures",
16
17=== modified file 'src/qml/messaging-app.qml'
18--- src/qml/messaging-app.qml 2016-05-04 19:36:27 +0000
19+++ src/qml/messaging-app.qml 2016-07-15 19:28:37 +0000
20@@ -135,6 +135,13 @@
21 bottomEdge.commitWithProperties(properties)
22 }
23
24+ function startImport(transfer) {
25+ var properties = {}
26+ emptyStack()
27+ properties["sharedAttachmentsTransfer"] = transfer
28+ mainView.showBottomEdgePage(properties)
29+ }
30+
31 Connections {
32 target: telepathyHelper
33 // restore default bindings if any system settings changed
34@@ -203,12 +210,8 @@
35
36 Connections {
37 target: ContentHub
38- onShareRequested: {
39- var properties = {}
40- emptyStack()
41- properties["sharedAttachmentsTransfer"] = transfer
42- mainView.showBottomEdgePage(properties)
43- }
44+ onImportRequested: startImport(transfer)
45+ onShareRequested: startImport(transfer)
46 }
47
48 signal applicationReady

Subscribers

People subscribed via source and target branches