Skip to content

Fix desktop updates #59160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 4 commits into from
Mar 27, 2025
Merged

Fix desktop updates #59160

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9ea16c
clear extra log
rezkiy37 Mar 26, 2025
f7d28cc
integrate verifyAndInstallLatestVersion
rezkiy37 Mar 26, 2025
6ccecde
Revert "clear extra log"
rezkiy37 Mar 26, 2025
18bc2da
Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…
rezkiy37 Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 35 additions & 22 deletions desktop/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,33 @@ const quitAndInstallWithUpdate = () => {
autoUpdater.quitAndInstall();
};

const verifyAndInstallLatestVersion = (): void => {
console.log('[dev] verifyAndInstallLatestVersion');

autoUpdater
.checkForUpdates()
.then((result) => {
console.log('[dev] verifyAndInstallLatestVersion: result', result);
console.log('[dev] verifyAndInstallLatestVersion: downloadedVersion', downloadedVersion);

if (result?.updateInfo.version === downloadedVersion) {
console.log('[dev] verifyAndInstallLatestVersion: if - versions match, installing');
return quitAndInstallWithUpdate();
}

console.log('[dev] verifyAndInstallLatestVersion: else - downloading new update');

return autoUpdater.downloadUpdate().then(() => {
console.log('[dev] verifyAndInstallLatestVersion: download complete, installing');
return quitAndInstallWithUpdate();
});
})
.catch((error) => {
console.log('[dev] verifyAndInstallLatestVersion: error', error);
log.error('Error during update check or download:', error);
});
};

/** Menu Item callback to trigger an update check */
const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BaseWindow) => {
if (menuItem) {
Expand Down Expand Up @@ -244,33 +271,14 @@ const electronUpdater = (browserWindow: BrowserWindow): PlatformSpecificUpdater
browserWindow.webContents.send(ELECTRON_EVENTS.UPDATE_DOWNLOADED, info.version);
} else {
console.log('[dev] else');

autoUpdater
.checkForUpdates()
.then((result) => {
console.log('[dev] result', result);
if (result?.updateInfo.version === downloadedVersion) {
console.log('[dev] if - versions match, installing');
quitAndInstallWithUpdate();
} else {
console.log('[dev] else - downloading new update');
return autoUpdater.downloadUpdate().then(() => {
console.log('[dev] download complete, installing');
quitAndInstallWithUpdate();
});
}
})
.catch((error) => {
console.log('[dev] error', error);
log.error('Error during update check or download:', error);
});
verifyAndInstallLatestVersion();
}
});

console.log('[dev] ipcMain.on(ELECTRON_EVENTS.START_UPDATE, quitAndInstallWithUpdate)');
ipcMain.on(ELECTRON_EVENTS.START_UPDATE, () => {
console.log('[dev] ELECTRON_EVENTS.START_UPDATE');
quitAndInstallWithUpdate();
verifyAndInstallLatestVersion();
});
autoUpdater.checkForUpdates().then((result) => {
console.log('[dev] update result 1: ', result);
Expand Down Expand Up @@ -418,7 +426,12 @@ const mainWindow = (): Promise<void> => {
label: translate(preferredLocale, `desktopApplicationMenu.mainMenu`),
submenu: [
{id: 'about', role: 'about'},
{id: 'update', label: translate(preferredLocale, `desktopApplicationMenu.update`), click: quitAndInstallWithUpdate, visible: false},
{
id: 'update',
label: translate(preferredLocale, `desktopApplicationMenu.update`),
click: verifyAndInstallLatestVersion,
visible: false,
},
{id: 'checkForUpdates', label: translate(preferredLocale, `desktopApplicationMenu.checkForUpdates`), click: manuallyCheckForUpdates},
{
id: 'viewShortcuts',
Expand Down