A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(desktop): stop screen recording prompt on window focus (#3647)
Hampus3011fac6d43c
diff --git a/fluxer_app/src/features/permissions/system/utils/NativePermissions.ts b/fluxer_app/src/features/permissions/system/utils/NativePermissions.tsindex e6645e98a..a5d694ec9 100644--- a/fluxer_app/src/features/permissions/system/utils/NativePermissions.ts+++ b/fluxer_app/src/features/permissions/system/utils/NativePermissions.ts@@ -30,7 +30,10 @@ const normalizeNativePermissionResult = (value: unknown): NativePermissionResult}};-export async function checkNativePermission(kind: PermissionKind): Promise<NativePermissionResult> {+export async function checkNativePermission(+ kind: PermissionKind,+ options: {liveProbe?: boolean} = {},+): Promise<NativePermissionResult> {const electronApi = getElectronAPI();if (!electronApi) {return 'unsupported';@@ -46,7 +49,9 @@ export async function checkNativePermission(kind: PermissionKind): Promise<Nativreturn hasAccess ? 'granted' : 'denied';}if (kind === 'screen' && typeof electronApi.getScreenRecordingPermissionStatus === 'function') {- return normalizeNativePermissionResult(await electronApi.getScreenRecordingPermissionStatus());+ return normalizeNativePermissionResult(+ await electronApi.getScreenRecordingPermissionStatus(options.liveProbe === true),+ );}const status = await electronApi.checkMediaAccess(kind);switch (status) {@@ -86,7 +91,7 @@ export async function requestNativePermission(kind: PermissionKind): Promise<Nat}export async function ensureNativePermission(kind: PermissionKind): Promise<NativePermissionResult> {- const current = await checkNativePermission(kind);+ const current = await checkNativePermission(kind, {liveProbe: kind === 'screen'});if (current === 'granted' || current === 'unsupported') {return current;}diff --git a/fluxer_app/src/features/voice/components/modals/screen_share_picker_modal/useScreenSharePickerDisplayPermission.ts b/fluxer_app/src/features/voice/components/modals/screen_share_picker_modal/useScreenSharePickerDisplayPermission.tsindex 689647f02..ab8bd139b 100644--- a/fluxer_app/src/features/voice/components/modals/screen_share_picker_modal/useScreenSharePickerDisplayPermission.ts+++ b/fluxer_app/src/features/voice/components/modals/screen_share_picker_modal/useScreenSharePickerDisplayPermission.ts@@ -45,7 +45,7 @@ function updateScreenRecordingPermissionStore(permission: NativePermissionResultexport async function readScreenSharePickerScreenRecordingPermission(reason: string): Promise<NativePermissionResult> {try {- const permission = await checkNativePermission('screen');+ const permission = await checkNativePermission('screen', {liveProbe: true});updateScreenRecordingPermissionStore(permission);return permission;} catch (error) {diff --git a/fluxer_app/src/features/voice/hooks/useElectronScreenSharePicker.tsx b/fluxer_app/src/features/voice/hooks/useElectronScreenSharePicker.tsxindex f7b52da73..21baec1cd 100644--- a/fluxer_app/src/features/voice/hooks/useElectronScreenSharePicker.tsx+++ b/fluxer_app/src/features/voice/hooks/useElectronScreenSharePicker.tsx@@ -12,7 +12,7 @@ async function hasScreenRecordingPermission(requestId: string): Promise<boolean>import('@app/features/permissions/system/utils/NativePermissions'),import('@app/features/permissions/system/state/MediaPermission'),]);- const permission = await checkNativePermission('screen');+ const permission = await checkNativePermission('screen', {liveProbe: true});if (permission !== 'denied') {return true;}diff --git a/fluxer_app/src/types/electron.d.ts b/fluxer_app/src/types/electron.d.tsindex fda695239..43c85c827 100644--- a/fluxer_app/src/types/electron.d.ts+++ b/fluxer_app/src/types/electron.d.ts@@ -328,7 +328,7 @@ export interface ElectronAPI {checkInputMonitoringAccess(): Promise<boolean>;getInputMonitoringPermissionStatus?(): Promise<InputMonitoringPermissionStatus>;requestInputMonitoringPermission?(): Promise<InputMonitoringPermissionStatus>;- getScreenRecordingPermissionStatus?(): Promise<InputMonitoringPermissionStatus>;+ getScreenRecordingPermissionStatus?(liveProbe?: boolean): Promise<InputMonitoringPermissionStatus>;requestScreenRecordingPermission?(): Promise<InputMonitoringPermissionStatus>;checkMediaAccess(type: MediaAccessType): Promise<Exclude<MediaAccessStatus, 'unknown'>>;requestMediaAccess(type: MediaAccessType): Promise<boolean>;diff --git a/fluxer_desktop/src/main/MacTcc.ts b/fluxer_desktop/src/main/MacTcc.tsindex d1423435f..09069f47c 100644--- a/fluxer_desktop/src/main/MacTcc.ts+++ b/fluxer_desktop/src/main/MacTcc.ts@@ -138,8 +138,8 @@ export function getTccStatus(surface: TccSurface): TccStatus {return statusOf(surface);}-export async function refreshTccStatus(surface: TccSurface): Promise<TccStatus> {- if (surface === 'screen-recording') await refreshScreenRecordingLiveGrant();+export async function refreshTccStatus(surface: TccSurface, liveProbe = false): Promise<TccStatus> {+ if (surface === 'screen-recording' && liveProbe) await refreshScreenRecordingLiveGrant();return statusOf(surface);}@@ -148,8 +148,8 @@ let registered = false;export function registerMacTccIpcHandlers(options: MacTccIpcOptions = {}): void {if (registered) return;registered = true;- ipcMain.handle('mac-tcc:status', async (_event, surface: TccSurface): Promise<TccStatus> => {- const status = await refreshTccStatus(surface);+ ipcMain.handle('mac-tcc:status', async (_event, surface: TccSurface, liveProbe?: unknown): Promise<TccStatus> => {+ const status = await refreshTccStatus(surface, liveProbe === true);options.onStatus?.(surface, status);return status;});diff --git a/fluxer_desktop/src/preload/index.ts b/fluxer_desktop/src/preload/index.tsindex 27e550d72..b0667933f 100644--- a/fluxer_desktop/src/preload/index.ts+++ b/fluxer_desktop/src/preload/index.ts@@ -547,8 +547,8 @@ const api: ElectronAPI = {ipcRenderer.invoke('mac-tcc:status', 'input-monitoring'),requestInputMonitoringPermission: (): Promise<InputMonitoringPermissionStatus> =>ipcRenderer.invoke('mac-tcc:request', 'input-monitoring'),- getScreenRecordingPermissionStatus: (): Promise<InputMonitoringPermissionStatus> =>- ipcRenderer.invoke('mac-tcc:status', 'screen-recording'),+ getScreenRecordingPermissionStatus: (liveProbe?: boolean): Promise<InputMonitoringPermissionStatus> =>+ ipcRenderer.invoke('mac-tcc:status', 'screen-recording', liveProbe === true),requestScreenRecordingPermission: (): Promise<InputMonitoringPermissionStatus> =>ipcRenderer.invoke('mac-tcc:request', 'screen-recording'),downloadFile: (url: string, defaultPath: string, sha256?: string | null): Promise<DownloadFileResult> =>