webbrowser-app

Merge lp:~mardy/webbrowser-app/lp1441873 into lp:webbrowser-app

lp1441873
Merge into trunk

Proposed by Alberto Mardegan on 2015-05-13

Status:

Merged

Approved by:

David Barth on 2015-07-02

Approved revision:

991

Merged at revision:

1074

Proposed branch:

lp:~mardy/webbrowser-app/lp1441873

Merge into:

lp:webbrowser-app

Prerequisite:

lp:~mardy/webbrowser-app/refactoring

Diff against target:

110 lines (+70/-0)

3 files modified

src/app/webcontainer/AccountErrorScreen.qml (+54/-0)
src/app/webcontainer/AccountsLogic.qml (+2/-0)
src/app/webcontainer/AccountsPage.qml (+14/-0)

To merge this branch:

bzr merge lp:~mardy/webbrowser-app/lp1441873

Critical

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-06-23
Ubuntu Phablet Team		2015-05-13	Pending
Review via email: mp+258991@code.launchpad.net

Commit message

Show an error screen if the trust session could not be opened.

Description of the change

Show an error screen if the trust session could not be opened.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-13:

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

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-12

986. By Alberto Mardegan on 2015-06-12: merge refactoring
[ CI Train Bot ]
* Resync trunk.
[ Leo Arias ]
* Fix the base class used when launching the app in autopilot tests.
[ Leonardo Arias Fonseca ]
* Fix the base class used when launching the app in autopilot tests.
[ Olivier Tilloy ]
* Also set XDG_CONFIG_HOME (needed for tests not to override user-
  defined settings).
* Update translation template.
* Use the new Oxide APIs to better control visibility of the chrome.
  This bumps the runtime dependency on liboxideqt-qmlplugin to 1.7.
  (LP: #1441064, #1453908)
[ Riccardo Padovani ]
* Add support for data: URIs in the address bar, and remove length
  limitation for TLDs. (LP: #1377953, #1441281, #1450154)
* Add support for data: URIs in the address bar, and remove length
  limitation for TLDs. (LP: #1377953, #1441281, #1450154)
[ Ugo Riboni ]
* Add suggestions from search engines in the suggestions list. (LP:
  #1351151)
987. By Alberto Mardegan on 2015-06-12: merge refactoring

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-12:

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

review: Approve (continuous-integration)

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-17

988. By Alberto Mardegan on 2015-06-17: Store the initialized accounts as a JSON array

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-17:

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

review: Approve (continuous-integration)

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-18

989. By Alberto Mardegan on 2015-06-18: Properly propagate the session cookie mode.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-18:

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

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-23

990. By Alberto Mardegan on 2015-06-23: Properly initialize variable

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-23:

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

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/lp1441873 updated on 2015-06-23

991. By Alberto Mardegan on 2015-06-23: Update error message

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-23:

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alberto Mardegan

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

 === added file 'src/app/webcontainer/AccountErrorScreen.qml'
 --- src/app/webcontainer/AccountErrorScreen.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webcontainer/AccountErrorScreen.qml	2015-06-23 12:37:15 +0000
@@ -0,0 +1,54 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++
++Rectangle {
++    id: root
++
++    property alias message: messageLabel.text
++    signal closed()
++
++    anchors.fill: parent
++
++    Column {
++        anchors.fill: parent
++        anchors.margins: units.gu(4)
++
++        spacing: units.gu(3)
++
++        Label {
++            width: parent.width
++            fontSize: "x-large"
++            text: i18n.tr("Account error")
++        }
++
++        Label {
++            id: messageLabel
++            width: parent.width
++            wrapMode: Text.Wrap
++        }
++
++        Button {
++            anchors.horizontalCenter: parent.horizontalCenter
++            text: i18n.tr("Close")
++            onClicked: root.closed()
++        }
++    }
++}
 === modified file 'src/app/webcontainer/AccountsLogic.qml'
 --- src/app/webcontainer/AccountsLogic.qml	2015-06-23 12:37:14 +0000
 +++ src/app/webcontainer/AccountsLogic.qml	2015-06-23 12:37:15 +0000
@@ -59,6 +59,8 @@
          onFinished: {
              if ("accountId" in reply) {
                  root.checkAccounts()
++            } else if ("errorName" in reply) {
++                root.errorScreenRequested(i18n.tr("Account window could not be opened. You can only create one account at a time; please try again after closing all other account windows."))
              } else {
                  root.quitRequested()
+             }
 === modified file 'src/app/webcontainer/AccountsPage.qml'
 --- src/app/webcontainer/AccountsPage.qml	2015-06-23 12:37:14 +0000
 +++ src/app/webcontainer/AccountsPage.qml	2015-06-23 12:37:15 +0000
@@ -46,6 +46,7 @@
          onAccountSelected: root.__emitAccountSelected(credentialsId, willMoveCookies)
          onContextReady: root.contextReady()
          onQuitRequested: root.quitRequested()
++        onErrorScreenRequested: showErrorScreen(message)
+     }
      AccountsSplashScreen {
@@ -61,6 +62,14 @@
          onSkip: accountsLogic.proceedWithNoAccount()
+     }
++    // Only temporarily used for bug https://bugs.launchpad.net/bugs/1441873
++    AccountErrorScreen {
++        id: errorScreen
++
++        visible: false
++        onClosed: root.quitRequested()
++    }
++
      Loader {
          id: accountChooserLoader
          anchors.fill: parent
@@ -104,6 +113,11 @@
          __setupProviderData()
+     }
++    function showErrorScreen(message) {
++        errorScreen.message = message
++        errorScreen.visible = true
++    }
++
      function showSplashScreen() {
          splashScreen.visible = true
+     }