1 files changed, 37 insertions, 35 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 162422017..9ad4cd531 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -15,7 +15,11 @@ import { gaEvent } from '../lib/analytics';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
-const { app } = remote;
+const debug = require('debug')('Franz:AppStore');
+
+const { app, systemPreferences } = remote;
+
+const mainWindow = remote.getCurrentWindow();
 
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
@@ -46,8 +50,12 @@ export default class AppStore extends Store {
 
   @observable isSystemMuteOverridden = false;
 
+  @observable isSystemDarkModeEnabled = false;
+
   @observable isClearingAllCache = false;
 
+  @observable isFullScreen = mainWindow.isFullScreen();
+
   constructor(...args) {
     super(...args);
 
@@ -80,6 +88,10 @@ export default class AppStore extends Store {
     window.addEventListener('online', () => { this.isOnline = true; });
     window.addEventListener('offline', () => { this.isOnline = false; });
 
+    mainWindow.on('enter-full-screen', () => { this.isFullScreen = true; });
+    mainWindow.on('leave-full-screen', () => { this.isFullScreen = false; });
+
+
     this.isOnline = navigator.onLine;
 
     // Check if Franz should launch on start
@@ -98,6 +110,10 @@ export default class AppStore extends Store {
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
+
+        if (isMac) {
+          app.dock.bounce();
+        }
       }
 
       if (data.available !== undefined && !data.available) {
@@ -124,19 +140,6 @@ export default class AppStore extends Store {
       this.stores.router.push(data.url);
     });
 
-    // Reload all services after a healthy nap
-    // Alternative solution for powerMonitor as the resume event is not fired
-    // More information: https://github.com/electron/electron/issues/1615
-    const TIMEOUT = 5000;
-    let lastTime = (new Date()).getTime();
-    setInterval(() => {
-      const currentTime = (new Date()).getTime();
-      if (currentTime > (lastTime + TIMEOUT + 2000)) {
-        this._reactivateServices();
-      }
-      lastTime = currentTime;
-    }, TIMEOUT);
-
     // Set active the next service
     key(
       '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
@@ -158,6 +161,8 @@ export default class AppStore extends Store {
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
+
+    this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
   }
 
   @computed get cacheSize() {
@@ -166,7 +171,7 @@ export default class AppStore extends Store {
 
   // Actions
   @action _notify({ title, options, notificationId, serviceId = null }) {
-    if (this.stores.settings.all.isAppMuted) return;
+    if (this.stores.settings.all.app.isAppMuted) return;
 
     const notification = new window.Notification(title, options);
     notification.onclick = (e) => {
@@ -179,8 +184,6 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        const mainWindow = remote.getCurrentWindow();
-
         if (isWindows) {
           mainWindow.restore();
         } else if (isLinux) {
@@ -244,17 +247,18 @@ export default class AppStore extends Store {
   }
 
   @action _muteApp({ isMuted, overrideSystemMute = true }) {
-    this.isSystemMuteOverriden = overrideSystemMute;
+    this.isSystemMuteOverridden = overrideSystemMute;
 
     this.actions.settings.update({
-      settings: {
+      type: 'app',
+      data: {
         isAppMuted: isMuted,
       },
     });
   }
 
   @action _toggleMuteApp() {
-    this._muteApp({ isMuted: !this.stores.settings.all.isAppMuted });
+    this._muteApp({ isMuted: !this.stores.settings.all.app.isAppMuted });
   }
 
   @action async _clearAllCache() {
@@ -288,13 +292,19 @@ export default class AppStore extends Store {
   }
 
   _setLocale() {
-    const locale = this.stores.settings.all.locale;
+    let locale;
+    if (this.stores.user.isLoggedIn) {
+      locale = this.stores.user.data.locale;
+    }
+
 
     if (locale && Object.prototype.hasOwnProperty.call(locales, locale) && locale !== this.locale) {
       this.locale = locale;
     } else if (!locale) {
       this.locale = this._getDefaultLocale();
     }
+
+    debug(`Set locale to "${this.locale}"`);
   }
 
   _getDefaultLocale() {
@@ -336,8 +346,9 @@ export default class AppStore extends Store {
   // Helpers
   _appStartsCounter() {
     this.actions.settings.update({
-      settings: {
-        appStarts: (this.stores.settings.all.appStarts || 0) + 1,
+      type: 'stats',
+      data: {
+        appStarts: (this.stores.settings.all.stats.appStarts || 0) + 1,
       },
     });
   }
@@ -345,7 +356,8 @@ export default class AppStore extends Store {
   async _autoStart() {
     this.autoLaunchOnStart = await this._checkAutoStart();
 
-    if (this.stores.settings.all.appStarts === 1) {
+    if (this.stores.settings.all.stats.appStarts === 1) {
+      debug('Set app to launch on start');
       this.actions.app.launchOnStartup({
         enable: true,
       });
@@ -356,19 +368,9 @@ export default class AppStore extends Store {
     return autoLauncher.isEnabled() || false;
   }
 
-  _reactivateServices(retryCount = 0) {
-    if (!this.isOnline) {
-      console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
-      setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
-    } else {
-      console.debug('reactivateServices: reload Franz');
-      window.location.reload();
-    }
-  }
-
   _systemDND() {
     const dnd = getDoNotDisturb();
-    if (dnd === this.stores.settings.all.isAppMuted || !this.isSystemMuteOverriden) {
+    if (dnd !== this.stores.settings.all.app.isAppMuted && !this.isSystemMuteOverridden) {
       this.actions.app.muteApp({
         isMuted: dnd,
         overrideSystemMute: false,