Merge branch 'release/2.16.2'

HISTORY.md

@@ -1,3 +1,18 @@
+<a name="2.16.2"></a>
+## 2.16.2 (2019-11-07)
+
+
+### Bug Fixes
+
+- [#1381](https://github.com/RocketChat/Rocket.Chat.Electron/pull/1381) Update dialog events
+
+
+### Improvements
+
+- [#1380](https://github.com/RocketChat/Rocket.Chat.Electron/pull/1380) Notifications on Gnome
+
+
+
 <a name="2.16.1"></a>
 ## 2.16.1 (2019-11-04)
 

electron-builder.json

@@ -18,7 +18,7 @@
 			"mas"
 		],
 		"icon": "build/icon.icns",
-		"bundleVersion": "59",
+		"bundleVersion": "60",
 		"helperBundleId": "chat.rocket.electron.helper",
 		"type": "distribution",
 		"artifactName": "rocketchat-${version}.${ext}",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "rocketchat",
   "description": "Official OSX, Windows, and Linux Desktop Clients for Rocket.Chat",
-  "version": "2.16.1",
+  "version": "2.16.2",
   "author": "Rocket.Chat Support <support@rocket.chat>",
   "copyright": "© 2019, Rocket.Chat",
   "homepage": "https://rocket.chat",
@@ -31,6 +31,7 @@
   },
   "dependencies": {
     "@bugsnag/js": "^6.3.2",
+    "debug": "^4.1.1",
     "electron-reload": "^1.5.0",
     "electron-updater": "^4.0.6",
     "fs-jetpack": "^2.2.0",

src/main.js

@@ -15,7 +15,6 @@ import i18n from './i18n';
 export { default as dock } from './main/dock';
 export { default as menus } from './main/menus';
 export { default as tray } from './main/tray';
-export { default as notifications } from './main/notifications';
 export { default as certificate } from './main/certificateStore';
 
 if (process.env.NODE_ENV) {

src/main/dock.js

@@ -46,7 +46,7 @@ const update = async (previousState) => {
 		mainWindow.setIcon(image);
 	}
 
-	if (!mainWindow.isFocused()) {
+	if (process.platform === 'win32' && !mainWindow.isFocused()) {
 		const count = Number.isInteger(state.badge) ? state.badge : 0;
 		mainWindow.flashFrame(count > 0);
 	}

src/preload/notifications.js

@@ -3,9 +3,6 @@ import { EventEmitter } from 'events';
 import { ipcRenderer, remote } from 'electron';
 import mem from 'mem';
 
-const { notifications } = remote.require('./main');
-
-
 class Notification extends EventEmitter {
 	static requestPermission() {
 
@@ -45,7 +42,11 @@ class Notification extends EventEmitter {
 			icon = await this.createIcon(icon);
 		}
 
-		const notification = notifications.create({ icon, hasReply: canReply, ...options });
+		const notification = new remote.Notification({
+			icon: icon && remote.nativeImage.createFromDataURL(icon),
+			hasReply: canReply,
+			...options,
+		});
 
 		notification.on('show', this.handleShow.bind(this));
 		notification.on('close', this.handleClose.bind(this));

src/public/dialogs/update.html

@@ -31,15 +31,15 @@
 					buttons: [i18n.__('dialog.updateSkip.ok')],
 					defaultId: 0,
 				}, () => {
-					ipcRenderer.send('close-update-dialog');
 					ipcRenderer.send('skip-update-version', newVersion);
+					ipcRenderer.send('close-update-dialog');
 				});
 			}, false);
 
 			document.querySelector('.update-remind-action').addEventListener('click', (e) => {
 				e.preventDefault();
-				ipcRenderer.send('close-update-dialog');
 				ipcRenderer.send('remind-update-later');
+				ipcRenderer.send('close-update-dialog');
 			}, false);
 
 			document.querySelector('.update-install-action').addEventListener('click', (e) => {
@@ -51,8 +51,8 @@
 					buttons: [i18n.__('dialog.updateDownloading.ok')],
 					defaultId: 0,
 				}, () => {
-						ipcRenderer.send('close-update-dialog');
-						ipcRenderer.send('download-update');
+					ipcRenderer.send('download-update');
+					ipcRenderer.send('close-update-dialog');
 				});
 			}, false);