Merge pull request #7661 from KDSBrowne/issue-7346

Add Chrome on iOS to legacy detection

bigbluebutton-html5/imports/ui/components/legacy/component.jsx

@@ -44,6 +44,10 @@ export default class Legacy extends Component {
   render() {
     const { messages, normalizedLocale, viewState } = this.state;
     const isSupportedBrowser = supportedBrowsers.includes(browser().name);
+    const isChromeIos = browser().name === 'crios';
+
+    let messageId = isSupportedBrowser ? 'app.legacy.upgradeBrowser' : 'app.legacy.unsupportedBrowser';
+    if (isChromeIos) messageId = 'app.legacy.criosBrowser';
 
     switch (viewState) {
       case READY:
@@ -51,7 +55,7 @@ export default class Legacy extends Component {
           <IntlProvider locale={normalizedLocale} messages={messages}>
             <p className="browserWarning">
               <FormattedMessage
-                id={isSupportedBrowser ? 'app.legacy.upgradeBrowser' : 'app.legacy.unsupportedBrowser'}
+                id={messageId}
                 description="Warning when someone joins with a browser that isnt supported"
                 values={{
                   0: <a href="https://www.google.com/chrome/">Chrome</a>,
@@ -64,11 +68,22 @@ export default class Legacy extends Component {
       case FALLBACK:
         return (
           <p className="browserWarning">
-            <span>It looks like you&#39;re using a browser that is not fully supported. Please use either </span>
-            <a href="https://www.google.com/chrome/">Chrome</a>
-            <span> or </span>
-            <a href="https://getfirefox.com">Firefox</a>
-            <span> for full support.</span>
+            {isChromeIos ? (
+              <span>Please use Safari on iOS for full support.</span>
+            ) : (
+              <span>
+                <span>
+                  It looks like you&#39;re using a browser that
+                  is not fully supported. Please use either
+                  {' '}
+                </span>
+                <a href="https://www.google.com/chrome/">Chrome</a>
+                <span> or </span>
+                <a href="https://getfirefox.com">Firefox</a>
+                <span> for full support.</span>
+              </span>
+            )
+            }
           </p>
         );
       case FETCHING:

bigbluebutton-html5/private/config/settings.yml

@@ -350,6 +350,8 @@ private:
   minBrowserVersions:
     - browser: chrome
       version: 59
+    - browser: chromeMobileIOS
+      version: Infinity
     - browser: firefox
       version: 52
     - browser: firefoxMobile
@@ -358,11 +360,11 @@ private:
       version: 17
     - browser: ie
       version: Infinity
+    - browser: safari
+      version: [11, 1]
     - browser: mobileSafari
       version: [11, 1]
     - browser: opera
       version: 46
-    - browser: safari
-      version: [11, 1]
     - browser: electron
       version: [0, 36]

bigbluebutton-html5/private/locales/en.json

@@ -644,5 +644,6 @@
     "app.actionsBar.actionsDropdown.stopShareExternalVideo": "Stop sharing YouTube video",
     "app.iOSWarning.label": "Please upgrade to iOS 12.2 or higher",
     "app.legacy.unsupportedBrowser": "It looks like you're using a browser that is not supported. Please use either {0} or {1} for full support.",
-    "app.legacy.upgradeBrowser": "It looks like you're using an older version of a supported browser. Please upgrade your browser for full support."
+    "app.legacy.upgradeBrowser": "It looks like you're using an older version of a supported browser. Please upgrade your browser for full support.",
+    "app.legacy.criosBrowser": "On iOS please use Safari for full support."
 }