Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-24 11:55:50 +01:00
Code Issues Projects Releases Wiki Activity

update events

Browse Source
This commit is contained in:
Kyle Spearrin 2018-02-13 15:00:38 -05:00
parent c22369fff4
commit c1ad495753
3 changed files with 96 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/locales/en/messages.json
View File

@ -770,7 +770,10 @@
}
}
},
"updateAvailableDesc": {
"restartToUpdate": {
"message": "Restart To Update"
},
"restartToUpdateDesc": {
"message": "Version $VERSION_NUM$ is ready to install. You must restart Bitwarden to complete the installation. Do you want to restart and update now?",
"placeholders": {
"version_num": {
@ -782,10 +785,19 @@
"updateAvailable": {
"message": "Update Available"
},
"updateAvailableDesc": {
"message": "An update was found. Do you want to download it now?"
},
"update": {
"message": "Update"
},
"later": {
"message": "Later"
},
"noUpdatesAvailable": {
"message": "No updates are currently available. You are using the latest version."
},
"updateError": {
"message": "Update Error"
}
}

16
src/main/menu.main.ts
View File

@ -5,6 +5,7 @@ import {
dialog,
ipcMain,
Menu,
MenuItem,
MenuItemConstructorOptions,
shell,
} from 'electron';
@ -20,6 +21,11 @@ export class MenuMain {
private i18nService: I18nService, private messagingService: MessagingService) { }
init() {
this.updaterMain.updateMenuItem = {
label: this.i18nService.t('checkForUpdates'),
click: () => this.updaterMain.checkForUpdate(true),
};
const template: MenuItemConstructorOptions[] = [
{
label: this.i18nService.t('file'),
@ -308,10 +314,7 @@ export class MenuMain {
if (process.platform === 'darwin') {
const firstMenuPart: MenuItemConstructorOptions[] = [
{ role: 'about' },
{
label: this.i18nService.t('checkForUpdates'),
click: () => this.updaterMain.checkForUpdate(),
},
this.updaterMain.updateMenuItem,
];
template.unshift({
@ -345,10 +348,7 @@ export class MenuMain {
template[template.length - 1].submenu =
(template[template.length - 1].submenu as MenuItemConstructorOptions[]).concat([
{ type: 'separator' },
{
label: this.i18nService.t('checkForUpdates'),
click: () => this.updaterMain.checkForUpdate(),
},
this.updaterMain.updateMenuItem,
{
label: this.i18nService.t('about'),
click: () => {

82
src/main/updater.main.ts
View File

@ -1,4 +1,7 @@
import { dialog } from 'electron';
import {
dialog,
MenuItemConstructorOptions,
} from 'electron';
import { autoUpdater } from 'electron-updater';
import { WindowMain } from './window.main';
@ -9,30 +12,95 @@ const UpdaterCheckInitalDelay = 5 * 1000; // 5 seconds
const UpdaterCheckInterval = 12 * 60 * 60 * 1000; // 12 hours
export class UpdaterMain {
updateMenuItem: MenuItemConstructorOptions;
private doingUpdateCheck = false;
private doingUpdateCheckWithFeedback = false;
constructor(private windowMain: WindowMain, private i18nService: I18nService) { }
async init() {
global.setTimeout(async () => await this.checkForUpdate(), UpdaterCheckInitalDelay);
global.setInterval(async () => await this.checkForUpdate(), UpdaterCheckInterval);
autoUpdater.on('error', (error) => {
if (this.doingUpdateCheckWithFeedback) {
dialog.showErrorBox(this.i18nService.t('updateError'),
error == null ? "unknown" : (error.stack || error).toString());
}
this.reset();
});
autoUpdater.on('update-downloaded', (info) => {
this.updateMenuItem.label = this.i18nService.t('restartToUpdate');
const result = dialog.showMessageBox(this.windowMain.win, {
type: 'info',
title: this.i18nService.t('updateAvailable'),
message: this.i18nService.t('updateAvailable'),
detail: this.i18nService.t('updateAvailableDesc', info.version),
buttons: [this.i18nService.t('update'), this.i18nService.t('later')],
title: this.i18nService.t('restartToUpdate'),
message: this.i18nService.t('restartToUpdate'),
detail: this.i18nService.t('restartToUpdateDesc', info.version),
buttons: [this.i18nService.t('restart'), this.i18nService.t('later')],
cancelId: 1,
defaultId: 0,
noLink: true,
});
if (result === 0) {
autoUpdater.quitAndInstall();
}
});
autoUpdater.on('update-available', () => {
if (this.doingUpdateCheckWithFeedback) {
const result = dialog.showMessageBox(this.windowMain.win, {
type: 'info',
title: this.i18nService.t('updateAvailable'),
message: this.i18nService.t('updateAvailable'),
detail: this.i18nService.t('updateAvailableDesc'),
buttons: [this.i18nService.t('yes'), this.i18nService.t('no')],
cancelId: 1,
defaultId: 0,
noLink: true,
});
if (result === 0) {
autoUpdater.downloadUpdate();
} else {
this.reset();
}
}
});
autoUpdater.on('update-not-available', () => {
if (this.doingUpdateCheckWithFeedback) {
dialog.showMessageBox(this.windowMain.win, {
message: this.i18nService.t('noUpdatesAvailable'),
});
}
this.reset();
});
}
async checkForUpdate() {
return await autoUpdater.checkForUpdatesAndNotify();
async checkForUpdate(withFeedback: boolean = false) {
if (this.doingUpdateCheck) {
return;
}
this.updateMenuItem.enabled = false;
this.doingUpdateCheck = true;
this.doingUpdateCheckWithFeedback = withFeedback;
if (withFeedback) {
await autoUpdater.checkForUpdates();
} else {
await autoUpdater.checkForUpdatesAndNotify();
}
}
private reset() {
this.updateMenuItem.enabled = true;
this.doingUpdateCheck = false;
}
}