1 files changed, 11 insertions, 50 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index e33f50f05..162422017 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -3,17 +3,15 @@ import { action, computed, observable } from 'mobx';
 import moment from 'moment';
 import key from 'keymaster';
 import { getDoNotDisturb } from '@meetfranz/electron-notification-state';
-import idleTimer from '@paulcbetts/system-idle-time';
 import AutoLaunch from 'auto-launch';
 import prettyBytes from 'pretty-bytes';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
-import { isMac } from '../environment';
+import { isMac, isLinux, isWindows } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
-import Miner from '../lib/Miner';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
@@ -46,11 +44,6 @@ export default class AppStore extends Store {
 
   @observable locale = defaultLocale;
 
-  @observable idleTime = 0;
-
-  miner = null;
-  @observable minerHashrate = 0.0;
-
   @observable isSystemMuteOverridden = false;
 
   @observable isClearingAllCache = false;
@@ -74,8 +67,6 @@ export default class AppStore extends Store {
     this.registerReactions([
       this._offlineCheck.bind(this),
       this._setLocale.bind(this),
-      this._handleMiner.bind(this),
-      this._handleMinerThrottle.bind(this),
       this._muteAppHandler.bind(this),
     ]);
   }
@@ -133,15 +124,10 @@ export default class AppStore extends Store {
       this.stores.router.push(data.url);
     });
 
-    const TIMEOUT = 5000;
-    // Check system idle time every minute
-    setInterval(() => {
-      this.idleTime = idleTimer.getIdleTime();
-    }, TIMEOUT);
-
     // 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();
@@ -193,9 +179,12 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        if (!isMac) {
-          const mainWindow = remote.getCurrentWindow();
+        const mainWindow = remote.getCurrentWindow();
+
+        if (isWindows) {
           mainWindow.restore();
+        } else if (isLinux) {
+          mainWindow.show();
         }
       }
     };
@@ -336,28 +325,6 @@ export default class AppStore extends Store {
     return locale;
   }
 
-  _handleMiner() {
-    if (!this.stores.user.isLoggedIn) return;
-
-    if (this.stores.user.data.isMiner) {
-      this.miner = new Miner('cVO1jVkBWuIJkyqlcEHRTScAfQwaEmuH');
-      this.miner.start(({ hashesPerSecond }) => {
-        this.minerHashrate = hashesPerSecond;
-      });
-    } else if (this.miner) {
-      this.miner.stop();
-      this.miner = 0;
-    }
-  }
-
-  _handleMinerThrottle() {
-    if (this.idleTime > 300000) {
-      if (this.miner) this.miner.setIdleThrottle();
-    } else {
-      if (this.miner) this.miner.setActiveThrottle(); // eslint-disable-line
-    }
-  }
-
   _muteAppHandler() {
     const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
 
@@ -367,10 +334,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,
@@ -381,10 +345,7 @@ 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;
-
-    if (!this.stores.settings.all.appStarts) {
+    if (this.stores.settings.all.appStarts === 1) {
       this.actions.app.launchOnStartup({
         enable: true,
       });
@@ -400,8 +361,8 @@ export default class AppStore extends Store {
       console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
       setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
     } else {
-      console.debug('reactivateServices: reload all services');
-      this.actions.service.reloadAll();
+      console.debug('reactivateServices: reload Franz');
+      window.location.reload();
     }
   }