diff --git a/lang/main.json b/lang/main.json index 8f79221fb..9820fcc73 100644 --- a/lang/main.json +++ b/lang/main.json @@ -180,7 +180,8 @@ "joinInApp": "Join this meeting using the app", "launchWebButton": "Launch in web", "title": "Launching your meeting in {{app}}...", - "tryAgainButton": "Try again in desktop" + "tryAgainButton": "Try again in desktop", + "unsupportedBrowser": "It looks like you're using a browser we don't support." }, "defaultLink": "e.g. {{url}}", "defaultNickname": "ex. Jane Pink", diff --git a/react/features/base/environment/environment.js b/react/features/base/environment/environment.js index c62484ffe..3b6a808ef 100644 --- a/react/features/base/environment/environment.js +++ b/react/features/base/environment/environment.js @@ -94,11 +94,7 @@ export function isSupportedBrowser() { return false; } - // We are intentionally allow mobile browsers because: - // - the WelcomePage is mobile ready; - // - if the URL points to a conference then deep-linking will take - // care of it. - return isMobileBrowser() || JitsiMeetJS.isWebRtcSupported(); + return isMobileBrowser() ? isSupportedMobileBrowser() : JitsiMeetJS.isWebRtcSupported(); } /** @@ -108,9 +104,8 @@ export function isSupportedBrowser() { * @returns {boolean} */ export function isSupportedMobileBrowser() { - return (Platform.OS === 'android' && browser.isChromiumBased()) - || (Platform.OS === 'android' && browser.isFirefox()) - || (Platform.OS === 'ios' && browser.isWebKitBased()); + return (Platform.OS === 'android' && browser.isSupportedAndroidBrowser()) + || (Platform.OS === 'ios' && browser.isSupportedIOSBrowser()); } /** diff --git a/react/features/deep-linking/components/DeepLinkingMobilePage.web.js b/react/features/deep-linking/components/DeepLinkingMobilePage.web.js index fb17f4f20..daac4b67d 100644 --- a/react/features/deep-linking/components/DeepLinkingMobilePage.web.js +++ b/react/features/deep-linking/components/DeepLinkingMobilePage.web.js @@ -163,13 +163,19 @@ class DeepLinkingMobilePage extends Component { { isSupportedMobileBrowser() - && - - + ? ( + + + + ) : ( + + { t(`${_TNS}.unsupportedBrowser`) } + + ) } { renderPromotionalFooter() }