Merge lp:~osomon/webbrowser-app/meet-jit-si-ua-overrides into lp:webbrowser-app

[Olivier Tilloy]

Add user agent overrides for meet.jit.si.

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

FAILED: Continuous integration, rev:1556
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/718/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1915/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1916
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1755
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1755
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1755
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1755/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1755/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1755/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1755
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1755
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1755/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1755/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1755
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1755/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, this now allows me to start a video call on meet.jit.si using both mobile and desktop ua-overrides.

review: Approve

=== 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-10-27 17:20:36 +0000
@@ -33,4 +33,7 @@
 
       // 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"],
+
+      // meet.jit.si (https://launchpad.net/bugs/1635971)
+      ["^https:\/\/meet\.jit\.si\/", "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-10-27 17:20:36 +0000
@@ -35,4 +35,7 @@
 
     // 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"],
+
+    // meet.jit.si (https://launchpad.net/bugs/1635971)
+    ["^https:\/\/meet\.jit\.si\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
 ];