Handle missing screen sharing permission gracefully

yannhodiesne · Nov 6, 2021 · 3aa3124 · 3aa3124
1 parent f2e81f7
commit 3aa3124
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/build/entitlements.mac.inherit.plist b/build/entitlements.mac.inherit.plist
@@ -12,5 +12,7 @@
     <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
   </dict>
 </plist>
diff --git a/index.js b/index.js
@@ -195,13 +195,10 @@ app.on('activate', () => {
   the signal to exit and wants to start closing windows */
 app.on('before-quit', () => (willQuitApp = true));
 
-ipcMain.handle('checkScreenPermission', async () => {
+ipcMain.on('checkScreenPermission', async () => {
 	if (!hasScreenCapturePermission()) {
 		await openSystemPreferences();
-		return false;
 	}
-
-	return true;
 });
 
 ipcMain.on('updateBadgeCount', (e, args) => {

diff --git a/package.json b/package.json
@@ -53,8 +53,7 @@
       "discord-badge-count.js",
       "discord-context-menu.js",
       "discord-platform-osx.js",
-      "discord-downloadapps-icon.js",
-      "windows"
+      "discord-downloadapps-icon.js"
     ],
     "mac": {
       "category": "public.app-category.social-networking",

diff --git a/preload-get-display-media-polyfill.js b/preload-get-display-media-polyfill.js
@@ -25,7 +25,8 @@ const openScreenSelection = async (resolve, reject) => {
 			titleBarStyle: 'hiddenInset',
 			webPreferences: {
 				nodeIntegration: true,
-				contextIsolation: false
+				contextIsolation: false,
+				enableBlinkFeatures: 'CSSColorSchemeUARendering',
 			},
 		});
 
@@ -49,18 +50,16 @@ const openScreenSelection = async (resolve, reject) => {
 	}
 };
 
-window.navigator.mediaDevices.getDisplayMedia = () => {
-	return new Promise((resolve, reject) => {
-		ipcRenderer.invoke('checkScreenPermission').then((hasPermission) => {
-			if (hasPermission) {
+if (window.navigator.mediaDevices) {
+	window.navigator.mediaDevices.getDisplayMedia = () => {
+		return new Promise((resolve, reject) => {
+			ipcRenderer.send('checkScreenPermission', {});
+
+			if (remote.systemPreferences.getMediaAccessStatus('screen') === 'granted') {
 				openScreenSelection(resolve, reject);
 			} else {
 				reject(new Error('Discord does not have the permission to share the screen'));
 			}
-		}).catch((err) => {
-			console.error('Screen sharing permission check failed with ', err);
-
-			reject(new Error('An error occured when trying to check screen sharing permissions'));
 		});
-	});
-};
+	};
+}
diff --git a/windows/getDisplayMedia/getDisplayMedia.html b/windows/getDisplayMedia/getDisplayMedia.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <meta charset="utf-8" />
+        <meta name="color-scheme" content="light dark">
         <title>Select a screen or a window</title>
         <link rel="stylesheet" href="getDisplayMedia.css">
     </head>