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

Move all status/alert dialogs into the Left Pane

Browse source
This commit is contained in:
Josh Perez 2020-02-12 13:30:58 -08:00 • committed by GitHub
parent 101070bf42
commit 18fd44f504
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 1298 additions and 607 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ts/updater/windows.ts
View file

@ -93,25 +93,22 @@ async function checkDownloadAndInstall(
}
logger.info('checkDownloadAndInstall: showing dialog...');
const shouldUpdate = await showUpdateDialog(getMainWindow(), messages);
if (!shouldUpdate) {
return;
}
showUpdateDialog(getMainWindow(), messages, async () => {
try {
await verifyAndInstall(updateFilePath, version, logger);
installing = true;
} catch (error) {
logger.info(
'checkDownloadAndInstall: showing general update failure dialog...'
);
showCannotUpdateDialog(getMainWindow(), messages);
try {
await verifyAndInstall(updateFilePath, version, logger);
installing = true;
} catch (error) {
logger.info(
'checkDownloadAndInstall: showing general update failure dialog...'
);
await showCannotUpdateDialog(getMainWindow(), messages);
throw error;
}
throw error;
}
markShouldQuit();
app.quit();
markShouldQuit();
app.quit();
});
} catch (error) {
logger.error('checkDownloadAndInstall: error', getPrintableError(error));
} finally {