From b5d7371eedface0a83055b26e9b7f4695a1fa8a6 Mon Sep 17 00:00:00 2001 From: Juan Navarro Date: Wed, 27 Jul 2022 16:46:38 +0200 Subject: [PATCH] openvidu-browser: Reformat function checkSystemRequirements() It was difficult to read and modify, and the "if/else" return logic could be simplified. Also the comments were outdated. Remove them and let the code speak by itself. --- openvidu-browser/src/OpenVidu/OpenVidu.ts | 45 +++++++++++++---------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/openvidu-browser/src/OpenVidu/OpenVidu.ts b/openvidu-browser/src/OpenVidu/OpenVidu.ts index 0d1cdaa50..91cc38e3f 100644 --- a/openvidu-browser/src/OpenVidu/OpenVidu.ts +++ b/openvidu-browser/src/OpenVidu/OpenVidu.ts @@ -304,29 +304,34 @@ export class OpenVidu { * Checks if the browser supports OpenVidu * @returns 1 if the browser supports OpenVidu, 0 otherwise */ - checkSystemRequirements(): number { - + checkSystemRequirements(): boolean { + // Specific iOS platform support (iPhone, iPad) if (platform.isIPhoneOrIPad()) { - if (platform.isIOSWithSafari() || platform.isIonicIos() || - platform.isChromeMobileBrowser() || platform.isEdgeMobileBrowser() || platform.isOperaMobileBrowser() || platform.isFirefoxMobileBrowser()) { - return 1; - } - return 0; + return ( + platform.isIOSWithSafari() || + platform.isChromeMobileBrowser() || + platform.isFirefoxMobileBrowser() || + platform.isOperaMobileBrowser() || + platform.isEdgeMobileBrowser() || + platform.isIonicIos() // Ionic apps for iOS + ); } - // Accept: Chrome (desktop and Android), Firefox (desktop and Android), Opera (desktop and Android), - // Safari (OSX and iOS), Edge Chromium (>= 80), Ionic (Android and iOS), Samsung Internet Browser (Android) - if (platform.isChromeBrowser() || platform.isChromeMobileBrowser() || - platform.isFirefoxBrowser() || platform.isFirefoxMobileBrowser() || platform.isOperaBrowser() || - platform.isOperaMobileBrowser() || platform.isEdgeBrowser() || platform.isEdgeMobileBrowser() || - platform.isSafariBrowser() || platform.isAndroidBrowser() || platform.isElectron() || platform.isSamsungBrowser() - ) { - return 1; - } - // Reject iPhones and iPads if not Safari ('Safari' also covers Ionic for iOS) - // Reject others browsers not mentioned above - return 0; - + // General platform support for web clients (Desktop, Mobile) + return ( + platform.isChromeBrowser() || + platform.isChromeMobileBrowser() || + platform.isFirefoxBrowser() || + platform.isFirefoxMobileBrowser() || + platform.isOperaBrowser() || + platform.isOperaMobileBrowser() || + platform.isEdgeBrowser() || + platform.isEdgeMobileBrowser() || + platform.isSamsungBrowser() || + platform.isSafariBrowser() || + platform.isAndroidBrowser() || // Android WebView & Ionic apps for Android + platform.isElectron() + ); } /**