webbrowser-app

Merge lp:~osomon/webbrowser-app/non-overridable-cert-errors into lp:webbrowser-app

  1. non-overridable-cert-errors
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 851
Merged at revision: 850
Proposed branch: lp:~osomon/webbrowser-app/non-overridable-cert-errors
Merge into: lp:webbrowser-app
Diff against target: 65 lines (+10/-6)
2 files modified
src/app/InvalidCertificateErrorSheet.qml (+8/-6)
src/app/webbrowser/Browser.qml (+2/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/non-overridable-cert-errors
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+244719@code.launchpad.net

Commit message

Do not offer to go back to safety for non-overridable certificate errors.
The user can always use the chrome’s back/refresh buttons.

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

FAILED: Continuous integration, rev:851
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1339/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/564
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/313/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/97/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/97/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/97/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/562
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/562/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16570
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/319/console

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

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

FAILED: Continuous integration, rev:851
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/576/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/323/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/100/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/100/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/495/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/574
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/574/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16585
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/329/console

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

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

FAILED: Continuous integration, rev:851
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1343/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/580
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/325/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/101/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/101
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/101/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/101/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/499
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/578
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/578/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16589
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/271/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/331
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/331/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1343/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/app/InvalidCertificateErrorSheet.qml'
2--- src/app/InvalidCertificateErrorSheet.qml 2014-09-22 14:00:29 +0000
3+++ src/app/InvalidCertificateErrorSheet.qml 2014-12-15 12:45:34 +0000
4@@ -28,10 +28,7 @@
5
6 Connections {
7 target: certificateError ? certificateError : null
8- onCancelled: {
9- moreInfo.visible = false
10- denied()
11- }
12+ onCancelled: denied()
13 }
14
15 Flickable {
16@@ -152,6 +149,7 @@
17
18 Label {
19 width: parent.width
20+ visible: certificateError ? certificateError.overridable : false
21 text: i18n.tr("You should not proceed, especially if you have never seen this warning before for this site.")
22 wrapMode: Text.Wrap
23 fontSize: "x-small"
24@@ -163,7 +161,6 @@
25 anchors.horizontalCenter: parent.horizontalCenter
26 visible: certificateError ? certificateError.overridable : false
27 onClicked: {
28- moreInfo.visible = false
29 certificateError.allow()
30 allowed()
31 }
32@@ -172,9 +169,9 @@
33 Button {
34 id: backButton
35 anchors.horizontalCenter: parent.horizontalCenter
36+ visible: certificateError ? certificateError.overridable : false
37 text: i18n.tr("Back to safety")
38 onClicked: {
39- moreInfo.visible = false
40 certificateError.deny()
41 denied()
42 }
43@@ -212,4 +209,9 @@
44 }
45 }
46
47+ onVisibleChanged: {
48+ if (!visible) {
49+ moreInfo.visible = false
50+ }
51+ }
52 }
53
54=== modified file 'src/app/webbrowser/Browser.qml'
55--- src/app/webbrowser/Browser.qml 2014-12-12 09:48:34 +0000
56+++ src/app/webbrowser/Browser.qml 2014-12-15 12:45:34 +0000
57@@ -231,6 +231,8 @@
58 query: chrome.text
59 }
60 onSelected: {
61+ // Workaround for https://launchpad.net/bugs/1377198
62+ browser.currentWebview.resetCertificateError()
63 browser.currentWebview.url = url
64 browser.currentWebview.forceActiveFocus()
65 chrome.requestedUrl = url

Subscribers

People subscribed via source and target branches

to status/vote changes: