[desktop] make window manager aware of quit-on-update, close #1617

tutao · Jan 23, 2020 · df2ec7b · df2ec7b
1 parent e146ddf
commit df2ec7b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/flow/electron.js b/flow/electron.js
@@ -202,8 +202,9 @@ declare module 'electron' {
 	}
 
 	declare export class App {
-		on(AppEvent, (Event, ...Array<any>) => void): App,
-		once(AppEvent, (Event, ...Array<any>) => void): App,
+		on(AppEvent, (Event, ...Array<any>) => any): App,
+		once(AppEvent, (Event, ...Array<any>) => any): App,
+		emit(AppEvent) : App,
 		requestSingleInstanceLock(): void,
 		quit(): void,
 		exit(code: Number): void,
@@ -598,6 +599,7 @@ export type AppEvent
 	| 'gpu-process-crashed'
 	| 'accessibility-support-changed'
 	| 'session-created'
+	| 'enable-force-quit'
 
 
 // https://github.com/electron/electron/blob/master/docs/api/browser-window.md#instance-events

diff --git a/src/desktop/DesktopWindowManager.js b/src/desktop/DesktopWindowManager.js
@@ -19,11 +19,10 @@ export type WindowBounds = {|
 |}
 
 const windows: ApplicationWindow[] = []
-app.forceQuit = false
-app.once('before-quit', () => {
-	console.log("before-quit")
-	app.forceQuit = true
-})
+let forceQuit = false
+let enableForceQuit = () => forceQuit = true
+app.once('before-quit', enableForceQuit)
+   .once('enable-force-quit', enableForceQuit)
 
 export class WindowManager {
 	_conf: DesktopConfigHandler
@@ -53,7 +52,7 @@ export class WindowManager {
 		windows.unshift(w)
 		w.on('close', ev => {
 			// we don't want to actually close windows where someone is logged in, just hide them
-			if (this._conf.getDesktopConfig('runAsTrayApp') && w.getUserInfo() != null && !app.forceQuit) {
+			if (this._conf.getDesktopConfig('runAsTrayApp') && w.getUserInfo() != null && !forceQuit) {
 				ev.preventDefault()
 				w.hide()
 			}

diff --git a/src/desktop/ElectronUpdater.js b/src/desktop/ElectronUpdater.js
@@ -149,7 +149,7 @@ export class ElectronUpdater {
 		    })
 		    .then((res) => {
 			    if (res === NotificationResult.Click) {
-			    	app.forceQuit = true
+				    app.emit('enable-force-quit')
 				    autoUpdater.quitAndInstall(false, true)
 			    }
 		    })

diff --git a/test/client/desktop/ElectronUpdaterTest.js b/test/client/desktop/ElectronUpdaterTest.js
@@ -26,7 +26,8 @@ o.spec("ElectronUpdater Test", function (done, timeout) {
 	const electron = {
 		app: {
 			getPath: (path: string) => `/mock-${path}/`,
-			getVersion: (): string => "3.45.0"
+			getVersion: (): string => "3.45.0",
+			emit: ()=>{}
 		}
 	}
 
@@ -133,6 +134,7 @@ o.spec("ElectronUpdater Test", function (done, timeout) {
 		//mock node modules
 		const forgeMock = n.mock('node-forge', nodeForge).set()
 		const autoUpdaterMock = n.mock('electron-updater', {autoUpdater}).set().autoUpdater
+		const electronMock = n.mock('electron', electron).set()
 
 		//mock our modules
 		n.mock('./DesktopTray', desktopTray).set()
@@ -177,6 +179,8 @@ o.spec("ElectronUpdater Test", function (done, timeout) {
 				icon: 'this is an icon'
 			})
 
+			o(electronMock.app.emit.callCount).equals(1)
+			o(electronMock.app.emit.args[0]).equals('enable-force-quit')
 			o(autoUpdaterMock.quitAndInstall.callCount).equals(1)
 			o(autoUpdaterMock.quitAndInstall.args[0]).equals(false)
 			o(autoUpdaterMock.quitAndInstall.args[1]).equals(true)
@@ -292,11 +296,13 @@ o.spec("ElectronUpdater Test", function (done, timeout) {
 				icon: 'this is an icon'
 			})
 
+			o(electronMock.app.emit.callCount).equals(1)
+			o(electronMock.app.emit.args[0]).equals('enable-force-quit')
 			o(autoUpdaterMock.quitAndInstall.callCount).equals(1)
 			o(autoUpdaterMock.quitAndInstall.args[0]).equals(false)
 			o(autoUpdaterMock.quitAndInstall.args[1]).equals(true)
 			done()
-		}, 190)
+		}, 250)
 	})
 
 	o("retry after autoUpdater reports an error", done => {
@@ -420,6 +426,7 @@ o.spec("ElectronUpdater Test", function (done, timeout) {
 			publicKeyFromPem: (pem: string) => n.spyify(pem === "no" ? rightKey : wrongKey)
 		}).set()
 		const autoUpdaterMock = n.mock('electron-updater', {autoUpdater}).set().autoUpdater
+		const electronMock = n.mock('electron', electron).set()
 
 		//mock our modules
 		n.mock('./DesktopTray', desktopTray).set()
@@ -465,6 +472,9 @@ o.spec("ElectronUpdater Test", function (done, timeout) {
 				icon: 'this is an icon'
 			})
 
+
+			o(electronMock.app.emit.callCount).equals(1)
+			o(electronMock.app.emit.args[0]).equals('enable-force-quit')
 			o(autoUpdaterMock.quitAndInstall.callCount).equals(1)
 			o(autoUpdaterMock.quitAndInstall.args[0]).equals(false)
 			o(autoUpdaterMock.quitAndInstall.args[1]).equals(true)