mirror of
https://github.com/finos/SymphonyElectron.git
synced 2025-02-25 18:55:29 -06:00
Revert "Use setDisplayMediaRequestHandler instead (#2266)"
This reverts commit 1b83b36f55
.
This commit is contained in:
parent
99598737df
commit
9bca61f231
@ -115,15 +115,14 @@ export const setChromeFlags = () => {
|
|||||||
export const setSessionProperties = () => {
|
export const setSessionProperties = () => {
|
||||||
logger.info(`chrome-flags: Settings session properties`);
|
logger.info(`chrome-flags: Settings session properties`);
|
||||||
const { customFlags } = config.getConfigFields(['customFlags']) as IConfig;
|
const { customFlags } = config.getConfigFields(['customFlags']) as IConfig;
|
||||||
const { defaultSession } = session;
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
defaultSession &&
|
session.defaultSession &&
|
||||||
customFlags &&
|
customFlags &&
|
||||||
customFlags.authServerWhitelist &&
|
customFlags.authServerWhitelist &&
|
||||||
customFlags.authServerWhitelist !== ''
|
customFlags.authServerWhitelist !== ''
|
||||||
) {
|
) {
|
||||||
defaultSession.allowNTLMCredentialsForDomains(
|
session.defaultSession.allowNTLMCredentialsForDomains(
|
||||||
customFlags.authServerWhitelist,
|
customFlags.authServerWhitelist,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
import { session } from 'electron';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This is currently supported only on macOS 15+.
|
|
||||||
* setDisplayMediaRequestHandler injects into navigator.mediaDevices.getDisplayMedia().
|
|
||||||
* With the macOS-only option { useSystemPicker: true },
|
|
||||||
* everyting is handled natively by the OS.
|
|
||||||
*
|
|
||||||
* For all other OSes and versions, the regular screen share flow will be used.
|
|
||||||
*/
|
|
||||||
export const setDisplayMediaRequestHandler = () => {
|
|
||||||
const { defaultSession } = session;
|
|
||||||
|
|
||||||
defaultSession.setDisplayMediaRequestHandler(
|
|
||||||
async (_request, _callback) => {
|
|
||||||
// TODO - Add support for Windows.
|
|
||||||
},
|
|
||||||
{ useSystemPicker: true },
|
|
||||||
);
|
|
||||||
};
|
|
@ -8,7 +8,6 @@ import { cleanUpAppCache, createAppCacheFile } from './app-cache-handler';
|
|||||||
import { setChromeFlags, setSessionProperties } from './chrome-flags';
|
import { setChromeFlags, setSessionProperties } from './chrome-flags';
|
||||||
import { config } from './config-handler';
|
import { config } from './config-handler';
|
||||||
import './dialog-handler';
|
import './dialog-handler';
|
||||||
import { setDisplayMediaRequestHandler } from './display-media-request-handler';
|
|
||||||
import './main-api-handler';
|
import './main-api-handler';
|
||||||
import { handlePerformanceSettings } from './perf-handler';
|
import { handlePerformanceSettings } from './perf-handler';
|
||||||
import { protocolHandler } from './protocol-handler';
|
import { protocolHandler } from './protocol-handler';
|
||||||
@ -109,7 +108,6 @@ const startApplication = async () => {
|
|||||||
// Picks global config values and updates them in the user config
|
// Picks global config values and updates them in the user config
|
||||||
await config.updateUserConfigOnStart();
|
await config.updateUserConfigOnStart();
|
||||||
setSessionProperties();
|
setSessionProperties();
|
||||||
setDisplayMediaRequestHandler();
|
|
||||||
await autoUpdate.init();
|
await autoUpdate.init();
|
||||||
await windowHandler.createApplication();
|
await windowHandler.createApplication();
|
||||||
logger.info(`main: created application`);
|
logger.info(`main: created application`);
|
||||||
|
Loading…
Reference in New Issue
Block a user