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

Challenge: Save conversationIds and start queues

Browse source
This commit is contained in:
Scott Nonnenberg 2022-03-21 14:19:37 -07:00 • committed by GitHub
parent c369e44d8e
commit bddd55d574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 316 additions and 476 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/main.ts
View file

@ -1225,7 +1225,7 @@ async function showDebugLogWindow() {
let permissionsPopupWindow: BrowserWindow | undefined;
function showPermissionsPopupWindow(forCalling: boolean, forCamera: boolean) {
// eslint-disable-next-line no-async-promise-executor
return new Promise<void>(async (resolve, reject) => {
return new Promise<void>(async (resolveFn, reject) => {
if (permissionsPopupWindow) {
permissionsPopupWindow.show();
reject(new Error('Permission window already showing'));
@ -1276,7 +1276,7 @@ function showPermissionsPopupWindow(forCalling: boolean, forCamera: boolean) {
removeDarkOverlay();
permissionsPopupWindow = undefined;
resolve();
resolveFn();
});
permissionsPopupWindow.once('ready-to-show', () => {
@ -1501,7 +1501,9 @@ app.on('ready', async () => {
// If the sql initialization takes more than three seconds to complete, we
// want to notify the user that things are happening
const timeout = new Promise(resolve => setTimeout(resolve, 3000, 'timeout'));
const timeout = new Promise(resolveFn =>
setTimeout(resolveFn, 3000, 'timeout')
);
// eslint-disable-next-line more/no-then
Promise.race([sqlInitPromise, timeout]).then(maybeTimeout => {
if (maybeTimeout !== 'timeout') {
@ -1691,11 +1693,11 @@ async function requestShutdown() {
}
getLogger().info('requestShutdown: Requesting close of mainWindow...');
const request = new Promise<void>((resolve, reject) => {
const request = new Promise<void>((resolveFn, reject) => {
let timeout: NodeJS.Timeout | undefined;
if (!mainWindow) {
resolve();
resolveFn();
return;
}
@ -1707,7 +1709,7 @@ async function requestShutdown() {
}
clearTimeoutIfNecessary(timeout);
resolve();
resolveFn();
});
mainWindow.webContents.send('get-ready-for-shutdown');
@ -1720,7 +1722,7 @@ async function requestShutdown() {
getLogger().error(
'requestShutdown: Response never received; forcing shutdown.'
);
resolve();
resolveFn();
}, 2 * 60 * 1000);
});
@ -1792,6 +1794,7 @@ app.on(
app.setAsDefaultProtocolClient('sgnl');
app.setAsDefaultProtocolClient('signalcaptcha');
app.on('will-finish-launching', () => {
// open-url must be set from within will-finish-launching for macOS
// https://stackoverflow.com/a/43949291