1 files changed, 98 insertions, 18 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index d8519c609..9ea14a911 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,54 +1,105 @@
+import { remote, ipcRenderer } from 'electron';
 import { action, computed, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
-import SettingsModel from '../models/Settings';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
+import { getLocale } from '../helpers/i18n-helpers';
 
-const debug = require('debug')('SettingsStore');
+import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
+
+const { systemPreferences } = remote;
+const debug = require('debug')('Franz:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
 
+  @observable fileSystemSettingsRequests = [];
+
+  fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
+  @observable _fileSystemSettingsCache = {
+    app: DEFAULT_APP_SETTINGS,
+    proxy: {},
+  };
+
   constructor(...args) {
     super(...args);
 
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
+
+    this.fileSystemSettingsTypes.forEach((type) => {
+      this.fileSystemSettingsRequests[type] = new CachedRequest(this.api.local, 'getAppSettings');
+    });
+
+    ipcRenderer.on('appSettings', (event, resp) => {
+      debug('Get appSettings resolves', resp, resp.type, resp.data);
+
+      this._fileSystemSettingsCache[resp.type] = resp.data;
+    });
+
+    this.fileSystemSettingsTypes.forEach((type) => {
+      ipcRenderer.send('getAppSettings', type);
+    });
   }
 
   async setup() {
     // We need to wait until `appSettingsRequest` has been executed once, otherwise we can't patch the result. If we don't wait we'd run into an issue with mobx not reacting to changes of previously not existing keys
     await this.appSettingsRequest._promise;
-    this._migrate();
+    await this._migrate();
+  }
+
+  @computed get app() {
+    return this._fileSystemSettingsCache.app || DEFAULT_APP_SETTINGS;
+  }
+
+  @computed get proxy() {
+    return this._fileSystemSettingsCache.proxy || {};
+  }
+
+  @computed get service() {
+    return localStorage.getItem('service') || {
+      activeService: '',
+    };
+  }
+
+  @computed get stats() {
+    return localStorage.getItem('stats') || {
+      activeService: '',
+    };
+  }
+
+  @computed get migration() {
+    return localStorage.getItem('migration') || {};
   }
 
   @computed get all() {
-    return new SettingsModel({
-      app: this.appSettingsRequest.execute().result || {},
-      service: localStorage.getItem('service') || {},
-      group: localStorage.getItem('group') || {},
-      stats: localStorage.getItem('stats') || {},
-      migration: localStorage.getItem('migration') || {},
-    });
+    return {
+      app: this.app,
+      proxy: this.proxy,
+      service: this.service,
+      stats: this.stats,
+      migration: this.migration,
+    };
   }
 
   @action async _update({ type, data }) {
     const appSettings = this.all;
-    if (type !== 'app') {
+    if (!this.fileSystemSettingsTypes.includes(type)) {
       debug('Update settings', type, data, this.all);
       localStorage.setItem(type, Object.assign(appSettings[type], data));
     } else {
       debug('Update settings on file system', type, data);
-      this.updateAppSettingsRequest.execute(data);
-
-      this.appSettingsRequest.patch((result) => {
-        if (!result) return;
-        Object.assign(result, data);
+      ipcRenderer.send('updateAppSettings', {
+        type,
+        data,
       });
+
+      Object.assign(this._fileSystemSettingsCache[type], data);
     }
   }
 
@@ -67,8 +118,8 @@ export default class SettingsStore extends Store {
   }
 
   // Helper
-  _migrate() {
-    const legacySettings = localStorage.getItem('app');
+  async _migrate() {
+    const legacySettings = localStorage.getItem('app') || {};
 
     if (!this.all.migration['5.0.0-beta.17-settings']) {
       this.actions.settings.update({
@@ -104,5 +155,34 @@ export default class SettingsStore extends Store {
 
       debug('Migrated settings to split stores');
     }
+
+    // Enable dark mode once
+    if (!this.all.migration['5.0.0-beta.19-settings']) {
+      const spellcheckerLanguage = getLocale({
+        locale: this.stores.settings.app.locale,
+        locales: SPELLCHECKER_LOCALES,
+        defaultLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+        fallbackLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+      });
+
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          darkMode: systemPreferences.isDarkMode(),
+          spellcheckerLanguage,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.19-settings': true,
+        },
+      });
+    }
+  }
+
+  _getFileBasedSettings(type) {
+    ipcRenderer.send('getAppSettings', type);
   }
 }