Merge lp:~mardy/webbrowser-app/plus-1644585 into lp:webbrowser-app

[Alberto Mardegan]

Add overrides for Google+

Add overrides for Google+

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1560
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/729/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2084/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2087
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1917
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1917/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1917/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1917
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1917/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1917/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1917
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1917/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1917
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1917/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1917
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1917/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1917/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1917
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1917/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Is the override for desktop really needed? I’m seeing the issue only on mobile myself.

review: Needs Information

[Alberto Mardegan (mardy)]

As far as I could see, the issue happens on mobile only. I thought of playing safe and add it to the desktop too, but let me know if I should remove it.

[Olivier Tilloy (osomon)]

Thanks Alberto. I am actually seeing an issue on desktop too. When logging in to plus.google.com with my @canonical.com account, I’m consistently getting a 404 (this has been confirmed by Pat too). So it looks like a desktop override is going to be needed, although not the one you added (which has an "android" token in it).

[Olivier Tilloy (osomon)]

This was fixed in a different branch (bug #1656310).

review: Disapprove

Unmerged revisions

1560. By Alberto Mardegan on 2016-11-30

Add override for google+

=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js.in'
--- src/Ubuntu/Web/ua-overrides-desktop.js.in	2016-10-14 14:37:23 +0000
+++ src/Ubuntu/Web/ua-overrides-desktop.js.in	2016-11-30 08:46:29 +0000
@@ -31,6 +31,9 @@
       ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
       ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
 
+      // Google plus (https://launchpad.net/bugs/1644585)
+      ["^https?:\/\/plus\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
+
       // Google recaptcha (https://launchpad.net/bugs/1599146)
       ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
 ];

=== modified file 'src/Ubuntu/Web/ua-overrides-mobile.js.in'
--- src/Ubuntu/Web/ua-overrides-mobile.js.in	2016-10-14 14:37:23 +0000
+++ src/Ubuntu/Web/ua-overrides-mobile.js.in	2016-11-30 08:46:29 +0000
@@ -33,6 +33,9 @@
     ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
     ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
 
+    // Google plus (https://launchpad.net/bugs/1644585)
+    ["^https?:\/\/plus\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
+
     // Google recaptcha (https://launchpad.net/bugs/1599146)
     ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
 ];