fix: don't show a result dialog after a background update check

standardnotes · May 28, 2020 · 7ccba9a · 7ccba9a
1 parent f5893a6
commit 7ccba9a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/app/application.ts b/app/application.ts
@@ -103,7 +103,6 @@ function registerAppEventListeners(args: {
     const windowState = state.windowState;
     if (!windowState) return;
     windowState.window.show();
-    windowState.updateManager.checkForUpdate();
   });
 
   app.on('ready', () => {

diff --git a/app/javascripts/main/menus.ts b/app/javascripts/main/menus.ts
@@ -566,7 +566,7 @@ function updateMenu(updateManager: UpdateManager) {
     submenu.push({
       label: str().checkForUpdate,
       click() {
-        updateManager.checkForUpdate();
+        updateManager.checkForUpdate(true);
       },
     });
   }

diff --git a/app/javascripts/main/updateManager.ts b/app/javascripts/main/updateManager.ts
@@ -37,7 +37,7 @@ export interface UpdateManager {
   readonly checkingForUpdate: boolean;
   onStateUpdate?: () => void;
   openChangelog(): void;
-  checkForUpdate(): void;
+  checkForUpdate(userTriggered: boolean): void;
   toggleAutoupdateStatus(): void;
   showAutoUpdateInstallationDialog(): void;
   updateNeeded(): boolean;
@@ -97,8 +97,8 @@ export function createUpdateManager(
     showAutoUpdateInstallationDialog() {
       showUpdateInstallationDialog(window, state);
     },
-    checkForUpdate() {
-      checkForUpdate(store, state, true);
+    checkForUpdate(userTriggered: boolean) {
+      checkForUpdate(store, state, userTriggered);
     },
     toggleAutoupdateStatus() {
       toggleAutoupdateStatus(store, state);

diff --git a/app/javascripts/main/window.ts b/app/javascripts/main/window.ts
@@ -58,6 +58,7 @@ export async function createWindowState({
     window,
     archiveManager: services.archiveManager,
     trayManager: services.trayManager,
+    updateManager: services.updateManager,
     onClosed: teardown,
   });
 
@@ -178,20 +179,26 @@ function registerWindowEventListeners({
   window,
   archiveManager,
   trayManager,
+  updateManager,
   onClosed,
 }: {
   shell: Shell;
   appState: Pick<AppState, 'willQuitApp' | 'startUrl'>;
   window: Electron.BrowserWindow;
   archiveManager: ArchiveManager;
   trayManager: TrayManager;
+  updateManager: UpdateManager;
   onClosed: () => void;
 }) {
   const shouldOpenUrl = (url: string) =>
     url.startsWith('http') || url.startsWith('mailto');
 
   window.on('closed', onClosed);
 
+  window.on('show', () => {
+    updateManager.checkForUpdate(false);
+  });
+
   window.on('focus', () => {
     window.webContents.send(IpcMessages.WindowFocused, null);
   });