Merge pull request #464 from RocketChat/bugfix/duplicate-notifications

Remove duplicate notification on windows 7

src/background.custom.js

@@ -3,11 +3,9 @@
 // It doesn't have any windows which you can see on screen, but we can open
 // window from here.
 
-import os from 'os';
 import { app, ipcMain, BrowserWindow } from 'electron';
 import windowStateKeeper from './background/windowState';
 import certificate from './background/certificate';
-import Toaster from './Toaster';
 import idle from '@paulcbetts/system-idle-time';
 import { checkForUpdates } from './background/autoUpdate';
 
@@ -132,26 +130,6 @@ export function afterMainWindow (mainWindow) {
         event.returnValue = idle.getIdleTime();
     });
 
-    // Windows 7 and below
-    const useToaster = ['win32', 'win64'].indexOf(os.platform()) !== -1 &&
-      parseFloat(os.release()) < 6.2;
-
-    if (useToaster) {
-        const toaster = new Toaster(mainWindow);
-
-        ipcMain.on('notification-shim', (e, title, options) => {
-            toaster.toast({
-                title: title,
-                message: options.body,
-                icon: options.icon,
-                tag: options.tag,
-                width: 400,
-                timeout: 5000,
-                htmlFile: 'file://'+__dirname+'/public/notification.html'
-            }, () => e.sender.send(`clicked-${options.tag}`));
-        });
-    }
-
     certificate.initWindow(mainWindow);
 
     checkForUpdates();

src/public/lib/Notification.js

@@ -4,10 +4,6 @@ class Notification extends window.Notification {
 
     constructor (title, options) {
         super(title, options);
-        ipcRenderer.send('notification-shim', title, options);
-
-        // Handle correct notification using unique tag
-        ipcRenderer.once(`clicked-${options.tag}`, () => this.onclick());
     }
 
     get onclick () {