Merge pull request #371 from erikaperugachi/9.2

0.9.2

Author: Erika Perugachi

.gitignore

@@ -16,6 +16,7 @@ email_*/build
 */src/app/build/
 electron_app/build/Certificates.p12
 electron_app/build/Criptext_Mail_Distribution.provisionprofile
+electron_app/dev-app-update.yml
 
 # misc
 */.env*

electron_app/electron-starter.js

@@ -126,4 +126,8 @@ app.on('window-all-closed', () => {
 
 app.on("activate", () => {
   mailboxWindow.show();
-})
+})
+
+app.on('before-quit', function() {
+  globalManager.forcequit.set(true);
+});

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "author": {
     "name": "Criptext Inc.",
     "email": "[email protected]",

electron_app/src/globalManager.js

@@ -11,6 +11,14 @@ const getModalData = () => {
   return global.modalData;
 };
 
+// Force quit
+const setForceQuit = data => {
+  global.forcequit = data;
+};
+const getForceQuit = () => {
+  return global.forcequit;
+};
+
 // Loading
 const setLoadingData = data => {
   global.loadingData = data;
@@ -46,6 +54,10 @@ module.exports = {
     get: getEmailToEdit,
     set: setEmailToEdit
   },
+  forcequit: {
+    get: getForceQuit,
+    set: setForceQuit
+  },
   loadingData: {
     get: getLoadingData,
     set: setLoadingData

electron_app/src/updater.js

@@ -2,6 +2,7 @@ const { dialog } = require('electron');
 const { autoUpdater } = require('electron-updater');
 const notifier = require('node-notifier');
 const path = require('path');
+const globalManager = require('./globalManager');
 const appId = 'com.criptext.criptextmail';
 
 let currentUpdaterType;
@@ -102,7 +103,10 @@ autoUpdater.on('update-downloaded', () => {
     () => {
       currentUpdaterType = updaterTypes.NONE;
       isDownloadingUpdate = false;
-      setImmediate(() => autoUpdater.quitAndInstall());
+      setImmediate(() => {
+        globalManager.forcequit.set(true);
+        autoUpdater.quitAndInstall();
+      });
     }
   );
 });

electron_app/src/windows/mailbox.js

@@ -2,11 +2,12 @@ const { app, BrowserWindow, shell } = require('electron');
 const windowStateManager = require('electron-window-state');
 const { mailboxUrl } = require('./../window_routing');
 const { appUpdater } = require('./../updater');
+const globalManager = require('./../globalManager');
 const path = require('path');
 const opn = require('opn');
 
 let mailboxWindow;
-let force_quit = false;
+globalManager.forcequit.set(false);
 
 const mailboxSize = {
   width: 1400,
@@ -40,7 +41,7 @@ const create = () => {
     ev.preventDefault();
   });
   mailboxWindow.on('close', e => {
-    if (process.platform === 'darwin' && !force_quit) {
+    if (!globalManager.forcequit.get()) {
       e.preventDefault();
       mailboxWindow.hide();
     }
@@ -124,7 +125,7 @@ const openLinkInDefaultBrowser = (ev, url) => {
 };
 
 const quit = () => {
-  force_quit = true;
+  globalManager.forcequit.set(true);
   app.quit();
 };
 

email_mailbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "private": true,
   "dependencies": {
     "animejs": "^2.2.0",