From a3622a3698fe0578b87c753f735c017ebd945e7b Mon Sep 17 00:00:00 2001 From: Hristo Terezov Date: Tue, 21 Jan 2025 16:43:11 -0600 Subject: [PATCH] ref(SS): remove legacy SS for electron. --- globals.d.ts | 1 - modules/API/external/external_api.js | 4 +++ react/features/desktop-picker/functions.ts | 34 ---------------------- react/features/desktop-picker/types.ts | 5 ---- 4 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 react/features/desktop-picker/types.ts diff --git a/globals.d.ts b/globals.d.ts index ba59a3fbbd..aec042b5c9 100644 --- a/globals.d.ts +++ b/globals.d.ts @@ -18,7 +18,6 @@ declare global { JITSI_MEET_LITE_SDK?: boolean; interfaceConfig?: any; JitsiMeetJS?: any; - JitsiMeetElectron?: any; PressureObserver?: any; PressureRecord?: any; ReactNativeWebView?: any; diff --git a/modules/API/external/external_api.js b/modules/API/external/external_api.js index d0b48c38e1..9d2f64e9d9 100644 --- a/modules/API/external/external_api.js +++ b/modules/API/external/external_api.js @@ -1241,6 +1241,10 @@ export default class JitsiMeetExternalAPI extends EventEmitter { * Returns the state of availability electron share screen via external api. * * @returns {Promise} + * + * TODO: should be removed after we make sure that all Electron clients use only versions + * after with the legacy SS suport was removed from the electron SDK. If we remove it now the SS for Electron + * clients with older versions wont work. */ _isNewElectronScreensharingSupported() { return this._transport.sendRequest({ diff --git a/react/features/desktop-picker/functions.ts b/react/features/desktop-picker/functions.ts index 6a1da91ae5..71094d96fd 100644 --- a/react/features/desktop-picker/functions.ts +++ b/react/features/desktop-picker/functions.ts @@ -1,6 +1,4 @@ import logger from './logger'; -import { ElectronWindowType } from './types'; - /** * Begins a request to get available DesktopCapturerSources. @@ -13,23 +11,6 @@ import { ElectronWindowType } from './types'; * @returns {Function} */ export function obtainDesktopSources(options: { thumbnailSize?: Object; types: string[]; }) { - const { JitsiMeetElectron } = window as ElectronWindowType; - - // TODO: delete this after 2 releases - if (JitsiMeetElectron?.obtainDesktopStreams) { - return new Promise((resolve, reject) => { - JitsiMeetElectron.obtainDesktopStreams( - (sources: Array<{ id: string; }>) => resolve(_separateSourcesByType(sources)), - (error: Error) => { - logger.error( - `Error while obtaining desktop sources: ${error}`); - reject(error); - }, - options - ); - }); - } - return APP.API.requestDesktopSources(options).then( ({ sources, error }: { error: Error; sources: Array<{ id: string; }>; }) => { if (sources) { @@ -43,21 +24,6 @@ export function obtainDesktopSources(options: { thumbnailSize?: Object; types: s }); } -/** - * Check usage of old jitsi meet electron version. - * - * @returns {boolean} True if we use old jitsi meet electron, otherwise false. - */ -export function oldJitsiMeetElectronUsage() { - const { JitsiMeetElectron } = window as ElectronWindowType; - - if (JitsiMeetElectron?.obtainDesktopStreams) { - return true; - } - - return false; -} - /** * Converts an array of DesktopCapturerSources to an object with types for keys * and values being an array with sources of the key's type. diff --git a/react/features/desktop-picker/types.ts b/react/features/desktop-picker/types.ts deleted file mode 100644 index d7e913f2aa..0000000000 --- a/react/features/desktop-picker/types.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type ElectronWindowType = { - JitsiMeetElectron?: { - obtainDesktopStreams: Function; - } ; -} & typeof window;