aboutsummaryrefslogtreecommitdiffstats
path: root/src/electron/macOSPermissions.ts
diff options
context:
space:
mode:
authorLibravatar Vijay Aravamudhan <vraravam@users.noreply.github.com>2022-04-22 15:04:21 -0500
committerLibravatar GitHub <noreply@github.com>2022-04-22 20:04:21 +0000
commit759d93dc198a3cc8c5265245c0144efa5435682b (patch)
tree53e963a085d3d12af5a2efa2f1ab6f3e5574edc7 /src/electron/macOSPermissions.ts
parentAdded build scripts for linux, macos and windows to help new contributors get... (diff)
downloadferdium-app-759d93dc198a3cc8c5265245c0144efa5435682b.tar.gz
ferdium-app-759d93dc198a3cc8c5265245c0144efa5435682b.tar.zst
ferdium-app-759d93dc198a3cc8c5265245c0144efa5435682b.zip
Turn off usage of 'debug' npm package using with electron-16 (fixes #17)
Diffstat (limited to 'src/electron/macOSPermissions.ts')
-rw-r--r--src/electron/macOSPermissions.ts19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/electron/macOSPermissions.ts b/src/electron/macOSPermissions.ts
index 7e4bb3c4d..07caaaada 100644
--- a/src/electron/macOSPermissions.ts
+++ b/src/electron/macOSPermissions.ts
@@ -6,11 +6,12 @@ import { dirname } from 'path';
6import { askForScreenCaptureAccess } from 'node-mac-permissions'; 6import { askForScreenCaptureAccess } from 'node-mac-permissions';
7import { userDataPath } from '../environment-remote'; 7import { userDataPath } from '../environment-remote';
8 8
9const debug = require('debug')('Ferdium:macOSPermissions'); 9// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed
10// const debug = require('debug')('Ferdium:macOSPermissions');
10 11
11const isExplicitScreenCapturePermissionReqd = 12const isExplicitScreenCapturePermissionReqd =
12 macosVersion.isGreaterThanOrEqualTo('10.15'); 13 macosVersion.isGreaterThanOrEqualTo('10.15');
13debug( 14console.log(
14 `Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`, 15 `Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`,
15); 16);
16 17
@@ -21,7 +22,7 @@ function hasPromptedForScreenCapturePermission(): string | boolean {
21 return false; 22 return false;
22 } 23 }
23 24
24 debug('Checking if status file exists'); 25 console.log('Checking if status file exists');
25 return filePath && pathExistsSync(filePath); 26 return filePath && pathExistsSync(filePath);
26} 27}
27 28
@@ -31,7 +32,7 @@ function hasScreenCapturePermissionAlreadyBeenGranted(): boolean {
31 } 32 }
32 33
33 const screenCaptureStatus = systemPreferences.getMediaAccessStatus('screen'); 34 const screenCaptureStatus = systemPreferences.getMediaAccessStatus('screen');
34 debug(`screen-capture permissions status: ${screenCaptureStatus}`); 35 console.log(`screen-capture permissions status: ${screenCaptureStatus}`);
35 return screenCaptureStatus === 'granted'; 36 return screenCaptureStatus === 'granted';
36} 37}
37 38
@@ -49,18 +50,18 @@ function createStatusFile() {
49} 50}
50 51
51export const askFormacOSPermissions = async (mainWindow: BrowserWindow) => { 52export const askFormacOSPermissions = async (mainWindow: BrowserWindow) => {
52 debug('Checking camera & microphone permissions'); 53 console.log('Checking camera & microphone permissions');
53 systemPreferences.askForMediaAccess('camera'); 54 systemPreferences.askForMediaAccess('camera');
54 systemPreferences.askForMediaAccess('microphone'); 55 systemPreferences.askForMediaAccess('microphone');
55 56
56 if (hasScreenCapturePermissionAlreadyBeenGranted()) { 57 if (hasScreenCapturePermissionAlreadyBeenGranted()) {
57 debug('Already obtained screen-capture permissions - writing status file'); 58 console.log('Already obtained screen-capture permissions - writing status file');
58 createStatusFile(); 59 createStatusFile();
59 return; 60 return;
60 } 61 }
61 62
62 if (!hasPromptedForScreenCapturePermission()) { 63 if (!hasPromptedForScreenCapturePermission()) {
63 debug('Checking screen capture permissions'); 64 console.log('Checking screen capture permissions');
64 65
65 const { response } = await dialog.showMessageBox(mainWindow, { 66 const { response } = await dialog.showMessageBox(mainWindow, {
66 type: 'info', 67 type: 'info',
@@ -73,11 +74,11 @@ export const askFormacOSPermissions = async (mainWindow: BrowserWindow) => {
73 }); 74 });
74 75
75 if (response === 0) { 76 if (response === 0) {
76 debug('Asking for access'); 77 console.log('Asking for access');
77 askForScreenCaptureAccess(); 78 askForScreenCaptureAccess();
78 createStatusFile(); 79 createStatusFile();
79 } else if (response === 1) { 80 } else if (response === 1) {
80 debug("Don't ask again"); 81 console.log("Don't ask again");
81 createStatusFile(); 82 createStatusFile();
82 } 83 }
83 } 84 }