1 files changed, 49 insertions, 3 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 75bb38fe0..8c4cd47eb 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,17 +1,18 @@
-import { ipcRenderer } from 'electron';
+import { ipcRenderer, remote } from 'electron';
 import {
-  action, computed, observable,
+  action, computed, observable, reaction,
 } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { getLocale } from '../helpers/i18n-helpers';
+import { API } from '../environment';
 
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
-const debug = require('debug')('Franz:SettingsStore');
+const debug = require('debug')('Ferdi:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
@@ -43,6 +44,50 @@ export default class SettingsStore extends Store {
 
   async setup() {
     await this._migrate();
+
+    reaction(
+      () => this.all.app.autohideMenuBar,
+      () => remote.getCurrentWindow().setAutoHideMenuBar(
+        this.all.app.autohideMenuBar,
+      ),
+    );
+
+    reaction(
+      () => this.all.app.locked,
+      () => {
+        const { router } = window.ferdi.stores;
+
+        if (this.all.app.locked && this.all.app.lockingFeatureEnabled) {
+          // App just got locked, redirect to unlock screen
+          router.push('/auth/locked');
+        } else if (router.location.pathname.includes('/auth/locked')) {
+          // App is unlocked but user is still on locked screen
+          // Redirect to homepage
+          router.push('/');
+        }
+      },
+    );
+
+    // Make sure to lock app on launch if locking feature is enabled
+    setTimeout(() => {
+      if (this.all.app.lockingFeatureEnabled) {
+        // Disable lock first - otherwise the lock might not get activated corrently
+        this.actions.settings.update({
+          type: 'app',
+          data: {
+            locked: false,
+          },
+        });
+        setTimeout(() => {
+          this.actions.settings.update({
+            type: 'app',
+            data: {
+              locked: true,
+            },
+          });
+        }, 0);
+      }
+    }, 1000);
   }
 
   @computed get app() {
@@ -121,6 +166,7 @@ export default class SettingsStore extends Store {
           runInBackground: legacySettings.runInBackground,
           enableSystemTray: legacySettings.enableSystemTray,
           minimizeToSystemTray: legacySettings.minimizeToSystemTray,
+          server: API,
           isAppMuted: legacySettings.isAppMuted,
           enableGPUAcceleration: legacySettings.enableGPUAcceleration,
           showMessageBadgeWhenMuted: legacySettings.showMessageBadgeWhenMuted,