Method reuse (#1379)

* Used already exported common functions to avoid the same logic being repeated.

* Use a different package to retrieve the os-name for the 'About Dialog'.

2 files changed, 9 insertions, 8 deletions

diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index 70f14d95e..0691e5170 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -1,9 +1,10 @@
 import { app, ipcMain } from 'electron';
 import path from 'path';
 import { autorun } from 'mobx';
+import { isMac, isWindows, isLinux } from '../../environment';
 
 const INDICATOR_TASKBAR = 'taskbar';
-const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
+const FILE_EXTENSION = isWindows ? 'ico' : 'png';
 
 let isTrayIconEnabled;
 
@@ -28,29 +29,28 @@ export default (params) => {
     // Flash TaskBar for windows, bounce Dock on Mac
     if (!app.mainWindow.isFocused()) {
       if (params.settings.app.get('notifyTaskBarOnMessage')) {
-        if (process.platform === 'win32') {
+        if (isWindows) {
           app.mainWindow.flashFrame(true);
           app.mainWindow.once('focus', () => app.mainWindow.flashFrame(false));
-        } else if (process.platform === 'darwin') {
+        } else if (isMac) {
           app.dock.bounce('informational');
         }
       }
     }
 
     // Update badge
-    if (process.platform === 'darwin'
+    if (isMac
       && typeof (args.indicator) === 'string') {
       app.dock.setBadge(args.indicator);
     }
 
-    if ((process.platform === 'darwin'
-      || process.platform === 'linux')
+    if ((isMac || isLinux)
       && typeof (args.indicator) === 'number'
     ) {
       app.badgeCount = args.indicator;
     }
 
-    if (process.platform === 'win32') {
+    if (isWindows) {
       if (typeof args.indicator === 'number'
         && args.indicator !== 0) {
         params.mainWindow.setOverlayIcon(
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index a81bc918f..ec7fa9d8a 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -1,5 +1,6 @@
 import { app, ipcMain } from 'electron';
 import { autoUpdater } from 'electron-updater';
+import { isMac, isWindows } from '../../environment';
 
 const debug = require('debug')('Ferdi:ipcApi:autoUpdate');
 
@@ -9,7 +10,7 @@ export default (params) => {
   if (!enableUpdate) {
     autoUpdater.autoInstallOnAppQuit = false;
     autoUpdater.autoDownload = false;
-  } else if (process.platform === 'darwin' || process.platform === 'win32' || process.env.APPIMAGE) {
+  } else if (isMac || isWindows || process.env.APPIMAGE) {
     ipcMain.on('autoUpdate', (event, args) => {
       if (enableUpdate) {
         try {