From 9bca61f231bc12715d8dcfda005d399de6dba6ef Mon Sep 17 00:00:00 2001
From: Salah Benmoussati <51402489+sbenmoussati@users.noreply.github.com>
Date: Fri, 31 Jan 2025 11:42:59 +0100
Subject: [PATCH] Revert "Use setDisplayMediaRequestHandler instead (#2266)"

This reverts commit 1b83b36f55efd4652fb583e6eff69080c7fcbfbf.
---
 src/app/chrome-flags.ts                  |  5 ++---
 src/app/display-media-request-handler.ts | 20 --------------------
 src/app/main.ts                          |  2 --
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 src/app/display-media-request-handler.ts

diff --git a/src/app/chrome-flags.ts b/src/app/chrome-flags.ts
index d4610915..2a676e06 100644
--- a/src/app/chrome-flags.ts
+++ b/src/app/chrome-flags.ts
@@ -115,15 +115,14 @@ export const setChromeFlags = () => {
 export const setSessionProperties = () => {
   logger.info(`chrome-flags: Settings session properties`);
   const { customFlags } = config.getConfigFields(['customFlags']) as IConfig;
-  const { defaultSession } = session;
 
   if (
-    defaultSession &&
+    session.defaultSession &&
     customFlags &&
     customFlags.authServerWhitelist &&
     customFlags.authServerWhitelist !== ''
   ) {
-    defaultSession.allowNTLMCredentialsForDomains(
+    session.defaultSession.allowNTLMCredentialsForDomains(
       customFlags.authServerWhitelist,
     );
   }
diff --git a/src/app/display-media-request-handler.ts b/src/app/display-media-request-handler.ts
deleted file mode 100644
index 70231ea9..00000000
--- a/src/app/display-media-request-handler.ts
+++ /dev/null
@@ -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 },
-  );
-};
diff --git a/src/app/main.ts b/src/app/main.ts
index 5d884cbb..8726b524 100644
--- a/src/app/main.ts
+++ b/src/app/main.ts
@@ -8,7 +8,6 @@ import { cleanUpAppCache, createAppCacheFile } from './app-cache-handler';
 import { setChromeFlags, setSessionProperties } from './chrome-flags';
 import { config } from './config-handler';
 import './dialog-handler';
-import { setDisplayMediaRequestHandler } from './display-media-request-handler';
 import './main-api-handler';
 import { handlePerformanceSettings } from './perf-handler';
 import { protocolHandler } from './protocol-handler';
@@ -109,7 +108,6 @@ const startApplication = async () => {
   // Picks global config values and updates them in the user config
   await config.updateUserConfigOnStart();
   setSessionProperties();
-  setDisplayMediaRequestHandler();
   await autoUpdate.init();
   await windowHandler.createApplication();
   logger.info(`main: created application`);