webbrowser-app

Merge lp:~bfiller/webbrowser-app/fix-1227941 into lp:webbrowser-app

  1. fix-1227941
  2. Merge into trunk
Proposed by Bill Filler
Status: Merged
Approved by: Bill Filler
Approved revision: 346
Merged at revision: 349
Proposed branch: lp:~bfiller/webbrowser-app/fix-1227941
Merge into: lp:webbrowser-app
Prerequisite: lp:~osomon/webbrowser-app/ua-override-domains
Diff against target: 17 lines (+2/-0)
1 file modified
src/Ubuntu/Components/Extras/Browser/ua-overrides.js (+2/-0)
To merge this branch: bzr merge lp:~bfiller/webbrowser-app/fix-1227941
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Bill Filler (community) Approve
Olivier Tilloy Approve
Review via email: mp+187643@code.launchpad.net

Commit message

add user-agent override for mail.google.com

Description of the change

add an user-agent override for mail.google.com such that gmail renders correctly like it does on android and iphone. Note, we only want to apply this override specifically for mail.google.com so this other MR is a prerequiste:
https://code.launchpad.net/~osomon/webbrowser-app/ua-override-domains/+merge/187561

also note that we only want this override for mobile, not desktop, and that is the reason for the mobile substituion rather than a complete string override. Maybe there is an easier way using regexp but I didn't know how to do it.

Basically the default string is this:
Mozilla/5.0 (Ubuntu; Mobile) WebKit/537.21

And this is required for mail.google.com:
"Mozilla/5.0 (Ubuntu; Linux; Android 4.2.2) AppleWebKit/537.21 Mobile Safari/537.21"

Hence my replacement of "Mobile) WebKit/537.21" with "Linux; Android 4.2.2) AppleWebKit/537.21 Mobile Safari/537.21"

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

PASSED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/404/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4026
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1636
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/287
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4119
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1638
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1638/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1386

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

review: Approve (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

It appears there’s a formatting issue, the override definition is on two lines, can you make it a one-liner?

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

I played a bit with the UA string you’re proposing, to try and reduce it to a simpler form, and here is what I came up with:

    "mail.google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],

Tested on Galaxy Nexus, I’m getting the same content as Chrome on Android.

Revision history for this message
Bill Filler (bfiller) wrote :

updated per Olivier's suggestion, works well. Also added an override for nytimes.com to server up mobile site.

Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good, and I verified that after clearing the browser’s cache, the nytimes.com override gets us the mobile version.

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

FAILED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/406/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4044
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1661
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/289
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/289
    None: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/356/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4144
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1663
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1663/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1404

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

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/281/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4067
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/225
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/225/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/225
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4170
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1689
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1413
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1425

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

try again

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/285/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4086
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/229
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/229
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4196
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4196/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1715
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1446

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

try again

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Ubuntu/Components/Extras/Browser/ua-overrides.js'
--- src/Ubuntu/Components/Extras/Browser/ua-overrides.js 2013-08-29 10:49:43 +0000
+++ src/Ubuntu/Components/Extras/Browser/ua-overrides.js 2013-09-26 13:25:07 +0000
@@ -37,6 +37,7 @@
37// Android as a reference.37// Android as a reference.
3838
39var overrides = {39var overrides = {
40 "mail.google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
40 "google.com": ["Mobile", "Android; Mobile"],41 "google.com": ["Mobile", "Android; Mobile"],
41 "youtube.com": ["Mobile", "Android; Mobile"],42 "youtube.com": ["Mobile", "Android; Mobile"],
42 "yahoo.com": ["Mobile", "Android; Mobile"],43 "yahoo.com": ["Mobile", "Android; Mobile"],
@@ -94,4 +95,5 @@
94 "amazon.co.uk": ["Mobile", "Android; Mobile"],95 "amazon.co.uk": ["Mobile", "Android; Mobile"],
95 "ebay.co.uk": ["Mobile", "Android; Mobile"],96 "ebay.co.uk": ["Mobile", "Android; Mobile"],
96 "facebook.com": [/WebKit\/[.0-9]*/, "Apple$& Firefox/18"],97 "facebook.com": [/WebKit\/[.0-9]*/, "Apple$& Firefox/18"],
98 "nytimes.com": ["Mobile", "Android; Mobile Safari"],
97};99};

Subscribers

People subscribed via source and target branches

to status/vote changes: