Replace localAPI requests with mobx-localstorage

3 files changed, 12 insertions, 19 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 06c43f83f..77027f88d 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -331,10 +331,7 @@ export default class AppStore extends Store {
   }
 
   // Helpers
-  async _appStartsCounter() {
-    // we need to wait until the settings request is resolved
-    await this.stores.settings.allSettingsRequest;
-
+  _appStartsCounter() {
     this.actions.settings.update({
       settings: {
         appStarts: (this.stores.settings.all.appStarts || 0) + 1,
@@ -345,10 +342,10 @@ export default class AppStore extends Store {
   async _autoStart() {
     this.autoLaunchOnStart = await this._checkAutoStart();
 
-    // we need to wait until the settings request is resolved
-    await this.stores.settings.allSettingsRequest;
+    console.log('### settings appstarts', this.stores.settings.all.appStarts);
 
     if (!this.stores.settings.all.appStarts) {
+      console.log('launch Franz on start');
       this.actions.app.launchOnStartup({
         enable: true,
       });
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 26d895b7e..f6f340c2b 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,5 +1,6 @@
 import { ipcRenderer } from 'electron';
 import { action, computed, observable, extendObservable } from 'mobx';
+import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
@@ -26,19 +27,12 @@ export default class SettingsStore extends Store {
   }
 
   @computed get all() {
-    console.log('get all settings');
-    return new SettingsModel(this.allSettingsRequest.result);
+    return new SettingsModel(localStorage.getItem('app') || {});
   }
 
   @action async _update({ settings }) {
-    await this.updateSettingsRequest.execute(settings)._promise;
-    // await this.allSettingsRequest.patch((result) => {
-    //   if (!result) return;
-    //   console.log(result.runInBackground, settings.runInBackground);
-    //   extendObservable(result, settings);
-    //   console.log(result.runInBackground);
-    //   // result.update(settings);
-    // });
+    const appSettings = this.all;
+    localStorage.setItem('app', Object.assign(appSettings, settings));
 
     // We need a little hack to wait until everything is patched
     setTimeout(() => this._shareSettingsWithMainProcess(), 0);
@@ -47,8 +41,11 @@ export default class SettingsStore extends Store {
   }
 
   @action async _remove({ key }) {
-    await this.removeSettingsKeyRequest.execute(key);
-    await this.allSettingsRequest.invalidate({ immediately: true });
+    const appSettings = this.all;
+    if (Object.hasOwnProperty.call(appSettings, key)) {
+      delete appSettings[key];
+      localStorage.setItem('app', appSettings);
+    }
 
     this._shareSettingsWithMainProcess();
   }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7b8ffb2b2..7dbbd955b 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -226,7 +226,6 @@ export default class UserStore extends Store {
 
   // This is a mobx autorun which forces the user to login if not authenticated
   _requireAuthenticatedUser = () => {
-    console.log('requireAuthenticatedUser');
     if (this.isTokenExpired) {
       this._logout();
     }