From 3e86bbb1ec5c5c4d5319fe008f1274648efafe5b Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:42:10 -0700 Subject: [PATCH] Enable useSystemPicker in non-production --- app/updateDefaultSession.ts | 5 +++-- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/updateDefaultSession.ts b/app/updateDefaultSession.ts index d8a095d3f823..3466e7dd91a4 100644 --- a/app/updateDefaultSession.ts +++ b/app/updateDefaultSession.ts @@ -2,13 +2,14 @@ // SPDX-License-Identifier: AGPL-3.0-only import type { Session, DesktopCapturerSource, IpcMainEvent } from 'electron'; -import { desktopCapturer, ipcMain } from 'electron'; +import { app, desktopCapturer, ipcMain } from 'electron'; import { v4 as generateUuid } from 'uuid'; import OS from '../ts/util/os/osMain'; import type { LoggerType } from '../ts/types/Logging'; import { strictAssert } from '../ts/util/assert'; import { type IpcResponseType } from '../ts/util/desktopCapturer'; +import { isProduction } from '../ts/util/version'; const SPELL_CHECKER_DICTIONARY_DOWNLOAD_URL = `https://updates.signal.org/desktop/hunspell_dictionaries/${process.versions.electron}/`; @@ -67,6 +68,6 @@ export function updateDefaultSession( getLogger().error('Failed to get desktopCapturer sources', error); } }, - { useSystemPicker: false } + { useSystemPicker: !isProduction(app.getVersion()) } ); } diff --git a/package-lock.json b/package-lock.json index 55ce792f2921..8969a56ba33e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -204,7 +204,7 @@ "csv-parse": "5.5.2", "danger": "11.3.1", "debug": "4.3.3", - "electron": "32.1.0", + "electron": "32.1.2", "electron-builder": "24.13.3", "electron-mocha": "12.2.0", "endanger": "7.0.4", @@ -18004,9 +18004,9 @@ } }, "node_modules/electron": { - "version": "32.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-32.1.0.tgz", - "integrity": "sha512-4etE3K6vPUkHihf7nvawngbB5+jLuUJgZh31f9ki1Gfveo0qwNDkLv/doabw+4zFFWKUXI+uFUpyOpL5+RwS+Q==", + "version": "32.1.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.1.2.tgz", + "integrity": "sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index 2a4cd8d1a556..7555fa9dae29 100644 --- a/package.json +++ b/package.json @@ -288,7 +288,7 @@ "csv-parse": "5.5.2", "danger": "11.3.1", "debug": "4.3.3", - "electron": "32.1.0", + "electron": "32.1.2", "electron-builder": "24.13.3", "electron-mocha": "12.2.0", "endanger": "7.0.4",