Update analytics location. Fix #1145

Author: JulianAdams4

electron_app/electron-starter.js

@@ -9,7 +9,6 @@ const mailboxWindow = require('./src/windows/mailbox');
 const loadingWindow = require('./src/windows/loading');
 const composerWindowManager = require('./src/windows/composer');
 const { createAppMenu } = require('./src/windows/menu');
-const { APP_VERSION, NUCLEUS_ID } = require('./src/utils/const');
 const {
   showWindows, 
   isDev, 
@@ -47,7 +46,7 @@ async function initApp() {
       mySettings.initialize(settings);
       wsClient.start(myAccount);
       createAppMenu();
-      mailboxWindow.show();
+      mailboxWindow.show({ firstOpenApp: true });
     } else {
       await getUserLanguage();
       createAppMenu();
@@ -80,8 +79,6 @@ async function initApp() {
       loadingWindow.send('socket-message', data);
     }
   });
-
-  upNucleus();
 }
 
 //   App
@@ -102,17 +99,6 @@ const getUserLanguage = async () => {
   await dbManager.updateSettings({ language: osLanguage });
 };
 
-const upNucleus = () => {
-  const data = {
-    onlyMainProcess: true,
-    userId: myAccount.recipientId,
-    version: APP_VERSION,
-    language: mySettings.language
-  }
-  const Nucleus = require('electron-nucleus')(NUCLEUS_ID, data);
-  Nucleus.track("MAILBOX_TRACK");
-}
-
 app.on('ready', () => {
   initApp();
 });

electron_app/src/ipc/mailbox.js

@@ -44,9 +44,9 @@ ipc.answerRenderer('open-file-explorer', filename => {
   mailboxWindow.showFileExplorer(filename);
 });
 
-ipc.answerRenderer('open-mailbox', () => {
+ipc.answerRenderer('open-mailbox', ({ firstOpenApp }) => {
   wsClient.start(myAccount);
-  mailboxWindow.show();
+  mailboxWindow.show({ firstOpenApp });
 });
 
 ipc.answerRenderer('print-to-pdf', async ({ emailId, threadId }) => {

electron_app/src/windows/mailbox.js

@@ -8,7 +8,12 @@ const { appUpdater } = require('./../updater');
 const globalManager = require('./../globalManager');
 const { mailtoProtocolRegex } = require('./../utils/RegexUtils');
 const { removeProtocolFromUrl } = require('./../utils/stringUtils');
-const { isFromStore, isDev } = require('./windowUtils');
+const {
+  isFromStore,
+  isDev,
+  nucleusTrack,
+  NUCLEUS_EVENTS
+} = require('./windowUtils');
 const { createTrayIcon, destroyTrayIcon } = require('./tray');
 const { isWindows } = require('./../utils/osUtils');
 
@@ -89,18 +94,20 @@ const showFileExplorer = filename => {
   mailboxWindow.send('display-message-success-download');
 };
 
-const show = async () => {
+const show = async ({ firstOpenApp = false }) => {
   const existVisibleWindow = BrowserWindow.getAllWindows().filter(w =>
     w.isVisible()
   );
   if (mailboxWindow) {
     mailboxWindow.show();
     createTrayIcon();
+    if (firstOpenApp) nucleusTrack(NUCLEUS_EVENTS.MAILBOX_TRACK);
   } else if (!existVisibleWindow.length || !mailboxWindow) {
     await create();
     mailboxWindow.on('ready-to-show', () => {
       mailboxWindow.show();
       createTrayIcon();
+      if (firstOpenApp) nucleusTrack(NUCLEUS_EVENTS.MAILBOX_TRACK);
     });
     mailboxWindow.on('focus', () => {
       if (!globalManager.windowsEvents.checkDisabled()) {

electron_app/src/windows/tray.js

@@ -53,7 +53,7 @@ const createTrayIcon = () => {
     tray.setContextMenu(contextMenu);
     tray.on('click', () => {
       const mailboxWindow = require('./mailbox');
-      mailboxWindow.show();
+      mailboxWindow.show({});
     });
   }
 };

electron_app/src/windows/windowUtils.js

@@ -1,6 +1,9 @@
 const { app, BrowserWindow } = require('electron');
 const osLocale = require('os-locale');
 const globalManager = require('./../globalManager');
+const myAccount = require('./../Account');
+const mySettings = require('./../Settings');
+const { APP_VERSION, NUCLEUS_ID } = require('./../utils/const');
 
 const showWindows = () => {
   const visibleWindows = BrowserWindow.getAllWindows();
@@ -39,6 +42,23 @@ const sendEventToAllWindows = (eventName, params) => {
   });
 };
 
+const getNucleusPayload = () => ({
+  onlyMainProcess: true,
+  userId: myAccount.recipientId,
+  version: APP_VERSION,
+  language: mySettings.language
+});
+
+const nucleusTrack = eventName => {
+  const data = getNucleusPayload();
+  const Nucleus = require('electron-nucleus')(NUCLEUS_ID, data);
+  Nucleus.track(eventName);
+};
+
+const NUCLEUS_EVENTS = {
+  MAILBOX_TRACK: 'MAILBOX_TRACK'
+};
+
 module.exports = {
   quit,
   isDev,
@@ -48,5 +68,7 @@ module.exports = {
   isFromStore,
   showWindows,
   getSystemLanguage,
-  sendEventToAllWindows
+  sendEventToAllWindows,
+  NUCLEUS_EVENTS,
+  nucleusTrack
 };

email_loading/src/utils/ipc.js

@@ -7,7 +7,7 @@ export const closeCreatingKeysLoadingWindow = () => {
 export const getComputerName = () => callMain('get-computer-name');
 
 export const openMailboxWindow = () => {
-  callMain('open-mailbox');
+  callMain('open-mailbox', { firstOpenApp: true });
 };
 
 export const throwError = error => {