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

Update Electron to 6.0.1, SQLCipher to 4.2.0

Browse source
This commit is contained in:
Scott Nonnenberg 2019-08-19 10:59:30 -07:00
parent b6da081d05
commit e29eee4583
11 changed files with 785 additions and 931 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ts/updater/common.ts
View file

@ -160,26 +160,15 @@ export async function showUpdateDialog(
cancelId: RESTART_BUTTON,
};
return new Promise(resolve => {
dialog.showMessageBox(mainWindow, options, response => {
if (response === RESTART_BUTTON) {
// It's key to delay any install calls here because they don't seem to work inside this
// callback - but only if the message box has a parent window.
// Fixes this: https://github.com/signalapp/Signal-Desktop/issues/1864
resolve(true);
const { response } = await dialog.showMessageBox(mainWindow, options);
return;
}
resolve(false);
});
});
return response === RESTART_BUTTON;
}
export async function showCannotUpdateDialog(
mainWindow: BrowserWindow,
messages: MessagesType
): Promise<boolean> {
): Promise<any> {
const options = {
type: 'error',
buttons: [messages.ok.message],
@ -187,11 +176,7 @@ export async function showCannotUpdateDialog(
message: messages.cannotUpdateDetail.message,
};
return new Promise(resolve => {
dialog.showMessageBox(mainWindow, options, () => {
resolve();
});
});
await dialog.showMessageBox(mainWindow, options);
}
// Helper functions