Merge lp:~fboucault/messaging-app/async_bottom_edge into lp:messaging-app

[Florian Boucault]

Always load MessagingBottomEdge asynchronously.
Saves around 1000ms at startup.

Always load MessagingBottomEdge asynchronously.
Saves around 1000ms at startup.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:562
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/656/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/656
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/620
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/620
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/620
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/612/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/612/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/612/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/612/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/612/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/612/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/612/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/612/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/612/console

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

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

From tiago's testing: "it breaks the use case where we can start messaging-app directly in the new message view via url dispatcher"

review: Needs Fixing

[system-apps-ci-bot (system-apps-ci-bot)]

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

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good now.
Thanks

review: Approve

[Bill Filler (bfiller)]

This is not working correctly in 2 column mode, compared to shipping version. Found two issues, testing as follows:

Hardware: Arale
Changed the grid units to make arale go into 2 column mode when rotate:
create this file: /etc/ubuntu-touch-session.d/arale.conf with contents
GRID_UNIT_PX=14

Tests:
1) rotate phone into landscape, causes 2 column mode
Expected results: no bottom edge hint in column 1, only + button on toolbar to create new page
Actual result: bottom edge hint displayed in column 1, invoking it brings up empty page

2) rotate phone into landscape, causes 2 column mode
-- select an existing conversation, verify thread view is open
-- press the + button from header
Expected results: thread view in column 2 is fully replaced with New Message view, "New Message" entry added to top of column 1
Actual results: thread view is not replaced (or partially replaced) in column 2, no "New Message" entry added to column 1

review: Needs Fixing

[system-apps-ci-bot (system-apps-ci-bot)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/messaging-app/async_bottom_edge]

566. By Florian Boucault on 2016-07-08

Revert delaying QML compilation as it triggers a bug in QtQuick

567. By Florian Boucault on 2016-07-08

Do not call emptyStack too often as it is slower

568. By Florian Boucault on 2016-07-08

Do not show an empty page if we know another page will be loaded right after

569. By Florian Boucault on 2016-07-08

Clear the reference to the bottomEdge in the main page if it about to be destroyed.

[Florian Boucault (fboucault)]

> This is not working correctly in 2 column mode, compared to shipping version.
> Found two issues, testing as follows:
>
> Hardware: Arale
> Changed the grid units to make arale go into 2 column mode when rotate:
> create this file: /etc/ubuntu-touch-session.d/arale.conf with contents
> GRID_UNIT_PX=14
>
> Tests:
> 1) rotate phone into landscape, causes 2 column mode
> Expected results: no bottom edge hint in column 1, only + button on toolbar to
> create new page
> Actual result: bottom edge hint displayed in column 1, invoking it brings up
> empty page
>
> 2) rotate phone into landscape, causes 2 column mode
> -- select an existing conversation, verify thread view is open
> -- press the + button from header
> Expected results: thread view in column 2 is fully replaced with New Message
> view, "New Message" entry added to top of column 1
> Actual results: thread view is not replaced (or partially replaced) in column
> 2, no "New Message" entry added to column 1

Both issues should be resolved now. One of them was caused by https://bugreports.qt.io/browse/QTBUG-54657

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:569
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/41/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/905/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/905
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/815
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/815
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/815
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/821/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/821/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/821/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/821/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/821/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/821/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/821/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/821/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/821/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/messaging-app/async_bottom_edge]

570. By Florian Boucault on 2016-07-08

reverted latest commit

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:570
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/42/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/907/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/907
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/817
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/817
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/817
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/823/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/823/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/823/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/823/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/823/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/823/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/823/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/823/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/823/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/messaging-app/async_bottom_edge]

571. By Florian Boucault on 2016-07-08

reverted latest commit

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:571
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/44/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/910/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/910
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/820
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/820
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/820
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/826/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/826/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/826/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/826/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/826/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/826/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/826/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/826/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/826/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/messaging-app/async_bottom_edge]

572. By Florian Boucault on 2016-07-11

more robust tests

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:572
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/47/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/934/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/934
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/841
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/841
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/841
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/838/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/838/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/838/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/838/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/838/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/838/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/838/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/838/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/838/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/messaging-app/async_bottom_edge]

573. By Florian Boucault on 2016-07-11

ensure that bottomEdge is set only when a single instance exists

574. By Florian Boucault on 2016-07-11

Simplified bottom edge queue

[system-apps-ci-bot (system-apps-ci-bot)]

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

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

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/messaging-app/async_bottom_edge]

575. By Florian Boucault on 2016-07-12

Document queuing behaviour

[Florian Boucault (fboucault)]

Should be good to go now

[lp:~fboucault/messaging-app/async_bottom_edge]

576. By Florian Boucault on 2016-07-12

Merged from trunk

[system-apps-ci-bot (system-apps-ci-bot)]

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

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

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

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

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Just verified that all bugs found by bill are fixed.
Tested on arale.
Could not find any other regression.
Looks good to me.

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2016-06-24 13:46:28 +0000
+++ debian/rules	2016-07-12 08:56:26 +0000
@@ -10,7 +10,7 @@
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 # Skip tests on the archs they are known to be flaky with current configuration
 # Ref.: https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1585942
-testskip_architectures := arm64
+testskip_architectures := arm64 s390x
 
 %:
 	dh $@ --parallel --fail-missing --with translations

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2016-05-23 13:02:03 +0000
+++ src/qml/MainPage.qml	2016-07-12 08:56:26 +0000
@@ -96,7 +96,7 @@
                     text: i18n.tr("Settings")
                     iconName: "settings"
                     onTriggered: {
-                        emptyStack()
+                        emptyStack(false)
                         pageStack.addFileToNextColumnSync(mainPage, Qt.resolvedUrl("SettingsPage.qml"))
                     }
                 },
@@ -229,7 +229,8 @@
         section.delegate: searching && searchField.text !== ""  ? null : sectionDelegate
         header: ListItem.Standard {
             id: newItem
-            height: mainView.bottomEdge.status === BottomEdge.Committed &&
+            height: mainView.bottomEdge &&
+                    mainView.bottomEdge.status === BottomEdge.Committed &&
                     !mainView.bottomEdge.showingConversation &&
                     mainView.dualPanel ? units.gu(10) : 0
             text: i18n.tr("New message")
@@ -281,7 +282,7 @@
                     if (displayedEvent != null) {
                         properties["scrollToEventId"] = displayedEvent.eventId
                     }
-                    emptyStack()
+                    emptyStack(false)
                     mainStack.addComponentToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
 
                     // mark this item as current
@@ -326,6 +327,11 @@
     Loader {
         id: bottomEdgeLoader
         active: !selectionMode && !searching && !mainView.dualPanel
+        asynchronous: true
+        /* FIXME: would be even more efficient to use setSource() to
+           delay the compilation step but a bug in Qt prevents us.
+           Ref.: https://bugreports.qt.io/browse/QTBUG-54657
+        */
         sourceComponent: MessagingBottomEdge {
             parent: mainPage
         }

=== modified file 'src/qml/MessagingBottomEdge.qml'
--- src/qml/MessagingBottomEdge.qml	2016-05-02 18:35:28 +0000
+++ src/qml/MessagingBottomEdge.qml	2016-07-12 08:56:26 +0000
@@ -23,7 +23,9 @@
     id: bottomEdge
 
     function commitWithProperties(properties) {
-        _realPage.destroy()
+        if (_realPage) {
+            _realPage.destroy()
+        }
         _realPage = messagesComponent.createObject(null, properties)
         commit()
     }
@@ -42,16 +44,23 @@
     }
 
     Component.onCompleted: {
-        mainView.bottomEdge = bottomEdge
-        _realPage = messagesComponent.createObject(null)
+        if (!_realPage) {
+            _realPage = messagesComponent.createObject(null)
+        }
+        mainView.setBottomEdge(bottomEdge)
     }
 
     Component.onDestruction: {
-        _realPage.destroy()
+        mainView.unsetBottomEdge(bottomEdge)
+        if (_realPage) {
+            _realPage.destroy()
+        }
     }
 
     onCollapseCompleted: {
-        _realPage.destroy()
+        if (_realPage) {
+            _realPage.destroy()
+        }
         _realPage = messagesComponent.createObject(null)
     }
 

=== modified file 'src/qml/SettingsPage.qml'
--- src/qml/SettingsPage.qml	2016-03-22 13:52:47 +0000
+++ src/qml/SettingsPage.qml	2016-07-12 08:56:26 +0000
@@ -110,6 +110,11 @@
     Loader {
         id: messagesBottomEdgeLoader
         active: mainView.dualPanel
+        asynchronous: true
+        /* FIXME: would be even more efficient to use setSource() to
+           delay the compilation step but a bug in Qt prevents us.
+           Ref.: https://bugreports.qt.io/browse/QTBUG-54657
+        */
         sourceComponent: MessagingBottomEdge {
             id: messagesBottomEdge
             parent: settingsPage

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2016-05-04 19:36:27 +0000
+++ src/qml/messaging-app.qml	2016-07-12 08:56:26 +0000
@@ -50,6 +50,44 @@
 
     activeFocusOnPress: false
 
+    /* Multiple MessagingBottomEdge instances can be created simultaneously
+       and ask to become the unique 'bottomEdge'.
+       Queue the requests until only one MessagingBottomEdge instance is left.
+    */
+    property var bottomEdgeQueue: []
+    function setBottomEdge(newBottomEdge) {
+        /* If the queue is empty and no other bottom edge is set then
+           set 'bottomEdge' to newBottomEdge. Otherwise insert newBottomEdge
+           in the queue
+        */
+        if (!bottomEdge && bottomEdgeQueue.length == 0) {
+            bottomEdge = newBottomEdge;
+        } else {
+            if (bottomEdge) {
+                bottomEdgeQueue.unshift(bottomEdge)
+                bottomEdge = null
+            }
+            bottomEdgeQueue.push(newBottomEdge)
+        }
+    }
+
+    function unsetBottomEdge(oldBottomEdge) {
+        /* Remove all references to oldBottomEdge (from the queue and from 'bottomEdge')
+           If only one bottom edge remains in the queue then set 'bottomEdge' to it
+        */
+        if (bottomEdge == oldBottomEdge) {
+            bottomEdge = null;
+        } else {
+            var index = bottomEdgeQueue.indexOf(oldBottomEdge);
+            if (index != -1) {
+                bottomEdgeQueue.splice(index, 1);
+                if (bottomEdgeQueue.length == 1) {
+                    bottomEdge = bottomEdgeQueue.pop();
+                }
+            }
+        }
+    }
+
     function defaultPhoneAccount() {
         // we only use the default account property if we have more
         // than one account, otherwise we use always the first one
@@ -131,8 +169,22 @@
         threadModel.removeThreads(threads);
     }
 
+    property var pendingCommitProperties
+    function bottomEdgeCommit() {
+        if (bottomEdge) {
+            mainView.onBottomEdgeChanged.disconnect(bottomEdgeCommit);
+            bottomEdge.commitWithProperties(pendingCommitProperties);
+            pendingCommitProperties = null;
+        }
+    }
+
     function showBottomEdgePage(properties) {
-        bottomEdge.commitWithProperties(properties)
+        pendingCommitProperties = properties;
+        if (bottomEdge) {
+            bottomEdgeCommit();
+        } else {
+            mainView.onBottomEdgeChanged.connect(bottomEdgeCommit);
+        }
     }
 
     Connections {
@@ -230,11 +282,14 @@
         return ContentType.Unknown
     }
 
-    function emptyStack() {
+    function emptyStack(showEmpty) {
+        if (typeof showEmpty === 'undefined') { showEmpty = true; }
         mainView.emptyStackRequested()
         mainStack.removePage(mainPage)
         layout.deleteInstances()
-        showEmptyState()
+        if (showEmpty) {
+            showEmptyState()
+        }
         mainPage.displayedThreadIndex = -1
     }
 
@@ -290,7 +345,7 @@
             properties["accountId"] = accountId
         }
 
-        emptyStack()
+        emptyStack(false)
         // FIXME: AdaptivePageLayout takes a really long time to create pages,
         // so we create manually and push that
         mainStack.addComponentToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
@@ -330,6 +385,11 @@
             Loader {
                 id: messagesBottomEdgeLoader
                 active: mainView.dualPanel
+                asynchronous: true
+                /* FIXME: would be even more efficient to use setSource() to
+                   delay the compilation step but a bug in Qt prevents us.
+                   Ref.: https://bugreports.qt.io/browse/QTBUG-54657
+                */
                 sourceComponent: MessagingBottomEdge {
                     id: messagesBottomEdge
                     parent: messages
@@ -378,6 +438,11 @@
 
             Loader {
                 id: bottomEdgeLoader
+                asynchronous: true
+                /* FIXME: would be even more efficient to use setSource() to
+                   delay the compilation step but a bug in Qt prevents us.
+                   Ref.: https://bugreports.qt.io/browse/QTBUG-54657
+                */
                 sourceComponent: MessagingBottomEdge {
                     parent: emptyStatePage
                     hint.text: ""
@@ -394,9 +459,11 @@
             id: mainPage
         }
 
+        property bool completed: false
+
         onColumnsChanged: {
             // we only have things to do here in case no thread is selected
-            if (layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) {
+            if (layout.completed && layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) {
                 layout.removePage(mainPage)
                 emptyStack()
             }
@@ -405,6 +472,7 @@
             if (layout.columns == 2 && !application.findMessagingChild("emptyStatePage")) {
                 emptyStack()
             }
+            layout.completed = true;
         }
     }
 }

=== modified file 'tests/qml/tst_DualSim.qml'
--- tests/qml/tst_DualSim.qml	2016-05-05 19:57:41 +0000
+++ tests/qml/tst_DualSim.qml	2016-07-12 08:56:26 +0000
@@ -151,6 +151,8 @@
 
             mainViewLoader.item.startNewMessage()
             waitForRendering(mainViewLoader.item)
+            tryCompare(mainViewLoader.item, 'pendingCommitProperties', null)
+            waitForRendering(mainViewLoader.item.bottomEdge)
 
             var messagesView = findChild(mainViewLoader, "messagesPage")
             var headerSections = findChild(messagesView, "headerSections")
@@ -213,6 +215,8 @@
 
             mainViewLoader.item.startNewMessage()
             waitForRendering(mainViewLoader.item)
+            tryCompare(mainViewLoader.item, 'pendingCommitProperties', null)
+            waitForRendering(mainViewLoader.item.bottomEdge)
 
             var messagesView = findChild(mainViewLoader, "messagesPage")
             var textArea = findChild(messagesView, "messageTextArea")

=== modified file 'tests/qml/tst_SingleSim.qml'
--- tests/qml/tst_SingleSim.qml	2016-05-05 19:57:41 +0000
+++ tests/qml/tst_SingleSim.qml	2016-07-12 08:56:26 +0000
@@ -138,6 +138,8 @@
 
             mainViewLoader.item.startNewMessage()
             waitForRendering(mainViewLoader.item)
+            tryCompare(mainViewLoader.item, 'pendingCommitProperties', null)
+            waitForRendering(mainViewLoader.item.bottomEdge)
 
             var messagesView = findChild(mainViewLoader, "messagesPage")
             var textArea = findChild(messagesView, "messageTextArea")