Merge pull request #1197 from erikaperugachi/dark

Fixes

Author: Erika Perugachi

electron_app/build/entitlements.mac.plist

@@ -14,5 +14,7 @@
     <true/>
     <key>com.apple.security.print</key>
     <true/>
+    <key>NSRequiresAquaSystemAppearance</key>
+    <false />
   </dict>
 </plist>

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.23.10",
+  "version": "0.23.11",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",
@@ -41,6 +41,7 @@
       "category": "public.app-category.productivity",
       "identity": "Criptext Inc.",
       "provisioningProfile": "build/Criptext_Mail_Distribution.provisionprofile",
+      "darkModeSupport": true,
       "type": "distribution",
       "publish": [
         {
@@ -131,7 +132,7 @@
   "devDependencies": {
     "criptext-js-tools": "0.5.0",
     "electron": "3.1.10",
-    "electron-builder": "^20.18.0"
+    "electron-builder": "^20.37.0"
   },
   "dependencies": {
     "@criptext/api": "0.15.20",
@@ -143,7 +144,7 @@
     "electron-context-menu": "^0.10.1",
     "electron-dl": "^1.12.0",
     "electron-nucleus": "^2.3.0",
-    "electron-updater": "^3.0.3",
+    "electron-updater": "^4.0.0",
     "electron-window-state": "^4.1.1",
     "getos": "^3.1.1",
     "knex": "0.17.6",

electron_app/src/nucleusManager.js

@@ -2,12 +2,12 @@ const { APP_VERSION, NUCLEUS_ID, INSTALLER_TYPE } = require('./utils/const');
 const myAccount = require('./Account');
 let Nucleus;
 
-const initNucleus = ({ userId }) => {
+const initNucleus = ({ userId, language }) => {
   const data = {
     onlyMainProcess: true,
     userId: userId || 'unknown',
     version: APP_VERSION,
-    installerType: INSTALLER_TYPE
+    language
   };
   Nucleus = require('electron-nucleus')(NUCLEUS_ID, data);
 };
@@ -22,6 +22,9 @@ const addEventTrack = (event, data) => {
 
 const updateUserData = () => {
   Nucleus.setUserId(myAccount.recipientId);
+  Nucleus.setProps({
+    installerType: INSTALLER_TYPE
+  });
 };
 
 const NUCLEUS_EVENTS = {

electron_app/src/windows/login.js

@@ -35,7 +35,10 @@ const create = () => {
 
   loginWindow.on('close', e => {
     const isMacOs = process.platform === 'darwin';
-    if (shouldCloseForce === true) return;
+    if (shouldCloseForce === true) {
+      shouldCloseForce = false;
+      return;
+    }
     if (isMacOs && !globalManager.forcequit.get()) {
       e.preventDefault();
       hide();

electron_app/src/windows/mailbox.js

@@ -48,7 +48,6 @@ const create = () => {
     webPreferences: { webSecurity: !isDev }
   });
   mailboxWindow.loadURL(mailboxUrl);
-
   if (isWindows()) mailboxWindow.setMenuBarVisibility(false);
 
   // Firebase
@@ -71,6 +70,7 @@ const create = () => {
     if (!mailboxWindow || globalManager.forcequit.get()) {
       destroyTrayIcon();
       require('./../socketClient').disconnect();
+      return;
     }
     e.preventDefault();
     if (mailboxWindow && mailboxWindow.isFullScreen()) {