Merge lp:~abreu-alexandre/webbrowser-app/add-safari-to-default-ua into lp:webbrowser-app

[Alexandre Abreu]

Add 'Safari/<version>' to the default UA string.

This is mostly useful for google webapps on the desktop. Using Oxide, quite a few of them (somewhat violently) warn the user that the current browser is not supported before allowing one to be redirected to the main website.

After some experimentation, simply adding a mention of Safari to the UA string removes the issues.

I tested the default webapps on Touch and I didn't notice anything specific

Add 'Safari/<version>' to the default UA string.

This is mostly useful for google webapps on the desktop. Using Oxide, quite a few of them (somewhat violently) warn the user that the current browser is not supported before allowing one to be redirected to the main website.

After some experimentation, simply adding a mention of Safari to the US string removes the issues.

I tested the default webapps on Touch and I didn't notice anything specific that indicates a regression.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:482
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/696/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4537
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4096/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/198
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/198
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4649
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4649/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4142
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4142/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6340/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5647

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/add-safari-to-default-ua]

483. By Alexandre Abreu on 2014-04-07

updates

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/701/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4675/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4158/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/add-safari-to-default-ua]

484. By Alexandre Abreu on 2014-04-07

update docs

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/703/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4561/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/205/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/205/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/205/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4679/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4162/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/add-safari-to-default-ua]

485. By Alexandre Abreu on 2014-04-07

Oxide 1.0

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/705/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4584
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4105/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/207
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/207/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/207
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4702
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4702/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4180
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4180/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6341/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5710

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

This looks good to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/708/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4604
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/210
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/210/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/210
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4728
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4728/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4198
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6344
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5736

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Superseded by https://code.launchpad.net/~osomon/webbrowser-app/overrides-formfactor/+merge/214805.

review: Disapprove

Unmerged revisions

=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml'
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml	2014-03-27 12:01:14 +0000
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml	2014-04-07 21:19:50 +0000
@@ -19,7 +19,7 @@
 pragma Singleton
 
 import QtQuick 2.0
-import com.canonical.Oxide 0.1
+import com.canonical.Oxide 1.0
 
 Item {
     property string customUA: userAgent.defaultUA

=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml'
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-03-27 11:51:08 +0000
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-04-07 21:19:50 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import com.canonical.Oxide 0.1
+import com.canonical.Oxide 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import "."

=== modified file 'src/Ubuntu/Components/Extras/Browser/UserAgent02.qml'
--- src/Ubuntu/Components/Extras/Browser/UserAgent02.qml	2014-03-24 12:32:52 +0000
+++ src/Ubuntu/Components/Extras/Browser/UserAgent02.qml	2014-04-07 21:19:50 +0000
@@ -33,12 +33,15 @@
     // %3: optional hardware ID token (must start with a semi-colon if present)
     // %4: WebKit version, e.g. "537.36"
     // %5: Chromium version, e.g. "35.0.1870.2"
-    // %6: optional token to provide additional free-form information (must start with a whitespace), e.g. "Mobile"
+    // %6: Optional token to provide additional free-form information (must end with a whitespace), e.g. "Mobile "
+    // %7: Safari version, e.g. "537.36"
+    // %8: Optional token, in case some extra bits are needed to make things work (e.g. an extra formfactor info etc.)
+    // 
     // note #1: "Mozilla/5.0" is misinformation, but it is a legacy token that
     //   virtually every single UA out there has, it seems unwise to remove it
     // note #2: "AppleWebKit", as opposed to plain "WebKit", does make a
     //   difference in the content served by certain sites (e.g. gmail.com)
-    readonly property string _template: "Mozilla/5.0 (Linux; Ubuntu %1%2%3) AppleWebKit/%4 Chromium/%5%6"
+    readonly property string _template: "Mozilla/5.0 (Linux; Ubuntu %1%2%3) AppleWebKit/%4 Chromium/%5 %6Safari/%7%8"
 
     // FIXME: compute at build time (using lsb_release)
     readonly property string _ubuntuVersion: "14.04"
@@ -56,7 +59,9 @@
     //       every time we rebase on a newer chromium.
     readonly property string _chromiumVersion: "35.0.1870.2"
 
-    readonly property string _more: (formFactor === "mobile") ? " Mobile" : ""
-
-    property string defaultUA: _template.arg(_ubuntuVersion).arg(_attributes).arg(_hardwareID).arg(_webkitVersion).arg(_chromiumVersion).arg(_more)
+    readonly property string _formFactor: (formFactor === "mobile") ? "Mobile " : ""
+
+    readonly property string _more: ""
+
+    property string defaultUA: _template.arg(_ubuntuVersion).arg(_attributes).arg(_hardwareID).arg(_webkitVersion).arg(_chromiumVersion).arg(_formFactor).arg(_webkitVersion).arg(_more)
 }