CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-31 13:39:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix manual update checks not working after being dismissed (#388)

Browse Source
This commit is contained in:
Michael Telatynski 2022-07-12 07:23:51 +01:00 committed by GitHub
parent 62046fadcb
commit 4f11398539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/updater.ts
View File

@ -28,18 +28,16 @@ function installUpdate(): void {
function pollForUpdates(): void { function pollForUpdates(): void {
try { try {
// If we've already got a new update downloaded, then stop // If we've already got a new update downloaded, then stop trying to check for new ones, as according to the doc
// trying to check for new ones, as according to the doc
// at https://github.com/electron/electron/blob/main/docs/api/auto-updater.md#autoupdatercheckforupdates // at https://github.com/electron/electron/blob/main/docs/api/auto-updater.md#autoupdatercheckforupdates
// we'll just keep re-downloading the same update. // we'll just keep re-downloading the same update.
// As a hunch, this might also be causing // As a hunch, this might also be causing https://github.com/vector-im/element-web/issues/12433
// https://github.com/vector-im/element-web/issues/12433 // due to the update checks colliding with the pending install somehow
// due to the update checks colliding with the pending install
// somehow
if (!latestUpdateDownloaded) { if (!latestUpdateDownloaded) {
autoUpdater.checkForUpdates(); autoUpdater.checkForUpdates();
} else { } else {
console.log("Skipping update check as download already present"); console.log("Skipping update check as download already present");
global.mainWindow?.webContents.send('update-downloaded', latestUpdateDownloaded);
} }
} catch (e) { } catch (e) {
console.log('Couldn\'t check for update', e); console.log('Couldn\'t check for update', e);
@ -51,7 +49,7 @@ export function start(updateBaseUrl: string): void {
updateBaseUrl = updateBaseUrl + '/'; updateBaseUrl = updateBaseUrl + '/';
} }
try { try {
let url; let url: string;
// For reasons best known to Squirrel, the way it checks for updates // For reasons best known to Squirrel, the way it checks for updates
// is completely different between macOS and windows. On macOS, it // is completely different between macOS and windows. On macOS, it
// hits a URL that either gives it a 200 with some json or // hits a URL that either gives it a 200 with some json or
@ -76,7 +74,7 @@ export function start(updateBaseUrl: string): void {
if (url) { if (url) {
console.log(`Update URL: ${url}`); console.log(`Update URL: ${url}`);
autoUpdater.setFeedURL(url); autoUpdater.setFeedURL({ url });
// We check for updates ourselves rather than using 'updater' because we need to // We check for updates ourselves rather than using 'updater' because we need to
// do it in the main process (and we don't really need to check every 10 minutes: // do it in the main process (and we don't really need to check every 10 minutes:
// every hour should be just fine for a desktop app) // every hour should be just fine for a desktop app)
@ -97,8 +95,7 @@ ipcMain.on('install_update', installUpdate);
ipcMain.on('check_updates', pollForUpdates); ipcMain.on('check_updates', pollForUpdates);
function ipcChannelSendUpdateStatus(status: boolean | string): void { function ipcChannelSendUpdateStatus(status: boolean | string): void {
if (!global.mainWindow) return; global.mainWindow?.webContents.send('check_updates', status);
global.mainWindow.webContents.send('check_updates', status);
} }
interface ICachedUpdate { interface ICachedUpdate {
@ -117,8 +114,7 @@ autoUpdater.on('update-available', function() {
// the only time we will get `update-not-available` if `latestUpdateDownloaded` is already set // the only time we will get `update-not-available` if `latestUpdateDownloaded` is already set
// is if the user used the Manual Update check and there is no update newer than the one we // is if the user used the Manual Update check and there is no update newer than the one we
// have downloaded, so show it to them as the latest again. // have downloaded, so show it to them as the latest again.
if (!global.mainWindow) return; global.mainWindow?.webContents.send('update-downloaded', latestUpdateDownloaded);
global.mainWindow.webContents.send('update-downloaded', latestUpdateDownloaded);
} else { } else {
ipcChannelSendUpdateStatus(false); ipcChannelSendUpdateStatus(false);
} }
@ -127,8 +123,7 @@ autoUpdater.on('update-available', function() {
}); });
autoUpdater.on('update-downloaded', (ev, releaseNotes, releaseName, releaseDate, updateURL) => { autoUpdater.on('update-downloaded', (ev, releaseNotes, releaseName, releaseDate, updateURL) => {
if (!global.mainWindow) return;
// forward to renderer // forward to renderer
latestUpdateDownloaded = { releaseNotes, releaseName, releaseDate, updateURL }; latestUpdateDownloaded = { releaseNotes, releaseName, releaseDate, updateURL };
global.mainWindow.webContents.send('update-downloaded', latestUpdateDownloaded); global.mainWindow?.webContents.send('update-downloaded', latestUpdateDownloaded);
}); });