mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use invoke/handle in settingsChannel

Browse source
This commit is contained in:
Fedor Indutny 2021-11-10 01:56:56 +01:00 • committed by GitHub
parent 37992715cd
commit 631e36dc0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 597 additions and 810 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/main.ts
View file

@ -30,6 +30,7 @@ import packageJson from '../package.json';
import * as GlobalErrors from './global_errors';
import { setup as setupSpellChecker } from './spell_check';
import { redactAll, addSensitivePath } from '../ts/util/privacy';
import { strictAssert } from '../ts/util/assert';
import { consoleLogger } from '../ts/util/consoleLogger';
import './startup_config';
@ -378,7 +379,9 @@ function handleCommonWindowEvents(window: BrowserWindow) {
return;
}
window.webContents.send('callbacks:call:persistZoomFactor', [zoomFactor]);
settingsChannel?.invokeCallbackInMainWindow('persistZoomFactor', [
zoomFactor,
]);
lastZoomFactor = zoomFactor;
};
@ -794,7 +797,11 @@ async function readyForUpdates() {
// Second, start checking for app updates
try {
await updater.start(getMainWindow, getLogger());
strictAssert(
settingsChannel !== undefined,
'SettingsChannel must be initialized'
);
await updater.start(settingsChannel, getLogger(), getMainWindow);
} catch (error) {
getLogger().error(
'Error starting update checks:',
@ -1302,7 +1309,7 @@ const onDatabaseError = async (error: string) => {
ready = false;
if (mainWindow) {
mainWindow.webContents.send('callbacks:call:closeDB', []);
settingsChannel?.invokeCallbackInMainWindow('closeDB', []);
mainWindow.close();
}
mainWindow = undefined;