webbrowser-app

Merge lp://qastaging/~mardy/webbrowser-app/multi-account-no-ui into lp://qastaging/webbrowser-app

  1. multi-account-no-ui
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Needs review
Proposed branch: lp://qastaging/~mardy/webbrowser-app/multi-account-no-ui
Merge into: lp://qastaging/webbrowser-app
Diff against target: 1344 lines (+809/-244)
16 files modified
src/app/webcontainer/AccountChooserDialog.qml (+129/-0)
src/app/webcontainer/AccountItem.qml (+4/-6)
src/app/webcontainer/AccountsLoginPage.qml (+54/-137)
src/app/webcontainer/AccountsModel.qml (+0/-51)
src/app/webcontainer/AccountsPage.qml (+173/-10)
src/app/webcontainer/CMakeLists.txt (+1/-1)
src/app/webcontainer/LoggingInSheet.qml (+39/-0)
src/app/webcontainer/LogoutDetector.qml (+78/-0)
src/app/webcontainer/LogoutErrorSheet.qml (+64/-0)
src/app/webcontainer/SplashScreen.qml (+105/-0)
src/app/webcontainer/WebApp.qml (+2/-0)
src/app/webcontainer/cookie-store.cpp (+1/-0)
src/app/webcontainer/logout-detector.js (+41/-0)
src/app/webcontainer/webapp-container.cpp (+24/-0)
src/app/webcontainer/webapp-container.h (+3/-0)
src/app/webcontainer/webapp-container.qml (+91/-39)
To merge this branch: bzr merge lp://qastaging/~mardy/webbrowser-app/multi-account-no-ui
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+255946@code.qastaging.launchpad.net

Commit message

Detection of logout events

Description of the change

Detection of logout events

This can be tested with Twitter: its .desktop file needs to be modified so that the Exec line becomes (remove any newlines!):

Exec=webapp-container --enable-back-forward --store-session-cookies
--name=Twitter --icon=./twitter.png --accountProvider='twitter' --logoutSelectors='input[type="password"]' --logoutUrlPattern=https://mobile.twitter.com/api/destroy --webappUrlPatterns=https?://mobile.twitter.com/* https://mobile.twitter.com/session/new %u

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

FAILED: Continuous integration, rev:973
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1632/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/390
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/390/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/390
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1928
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2193
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19567

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1632/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://qastaging/~mardy/webbrowser-app/multi-account-no-ui updated
974. By Alberto Mardegan

Remove multi-account leftovers

975. By Alberto Mardegan

From trunk

[ Alexandre Abreu ]
* remove qtwebkit deps (LP: #1362640) (LP: #1362640)
[ CI Train Bot ]
* New rebuild forced.
[ Justin McPherson ]
* Command line options for media-hub use through Oxide.
[ Olivier Tilloy ]
* Update translation template.

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

FAILED: Continuous integration, rev:975
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1642/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2236/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/400
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/400/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/400
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1963/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2234
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2234/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19639

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1642/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://qastaging/~mardy/webbrowser-app/multi-account-no-ui updated
976. By Alberto Mardegan

Add missing import

977. By Alberto Mardegan

Remove count of login attempts

We cannot count it reliably anyway.

978. By Alberto Mardegan

Reset the webview on logout detected

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

FAILED: Continuous integration, rev:976
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1643/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2244/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/401
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/401
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/401/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/401
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1970/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2242
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19649

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1643/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:978
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1647/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/404
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/404
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/404/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/404
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2255
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19663

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1647/rebuild

review: Approve (continuous-integration)
Reply
lp://qastaging/~mardy/webbrowser-app/multi-account-no-ui updated
979. By Alberto Mardegan

UI changes

980. By Alberto Mardegan

Fixes

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

FAILED: Continuous integration, rev:979
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1654/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/411
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/411
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1999
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2274
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2274/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19697

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1654/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://qastaging/~mardy/webbrowser-app/multi-account-no-ui updated
981. By Alberto Mardegan

UI updates

982. By Alberto Mardegan

alignment

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

PASSED: Continuous integration, rev:981
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1656/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/413
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/413/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2003
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2280
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19704

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1656/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:982
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1661/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2291
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/418
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/418
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2289
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19713

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1661/rebuild

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

FAILED: Continuous integration, rev:982
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/492/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/494/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/494/console

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

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

982. By Alberto Mardegan

alignment

981. By Alberto Mardegan

UI updates

980. By Alberto Mardegan

Fixes

979. By Alberto Mardegan

UI changes

978. By Alberto Mardegan

Reset the webview on logout detected

977. By Alberto Mardegan

Remove count of login attempts

We cannot count it reliably anyway.

976. By Alberto Mardegan

Add missing import

975. By Alberto Mardegan

From trunk

[ Alexandre Abreu ]
* remove qtwebkit deps (LP: #1362640) (LP: #1362640)
[ CI Train Bot ]
* New rebuild forced.
[ Justin McPherson ]
* Command line options for media-hub use through Oxide.
[ Olivier Tilloy ]
* Update translation template.

974. By Alberto Mardegan

Remove multi-account leftovers

973. By Alberto Mardegan

Automatic re-login

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

to status/vote changes: