Merge branch 'develop' into fix/lock-menu

# Conflicts:
#	src/lib/Menu.js

10 files changed, 93 insertions, 86 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 48a83c5a1..bd10ccb4a 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -118,21 +118,12 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                 type="button"
                 className="sidebar__button"
                 onClick={() => {
-                  // Disable lock first - otherwise the application might not update correctly
                   actions.settings.update({
                     type: 'app',
                     data: {
-                      locked: false,
+                      locked: true,
                     },
                   });
-                  setTimeout(() => {
-                    actions.settings.update({
-                      type: 'app',
-                      data: {
-                        locked: true,
-                      },
-                    });
-                  }, 0);
                 }}
                 data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`}
               >
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 860863d26..f6832038a 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -135,9 +135,11 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
     } = this.props;
 
     const {
-      showServiceNavigationBar,
+      navigationBarBehaviour,
     } = stores.settings.app;
 
+    const showNavBar = navigationBarBehaviour === 'always' || (navigationBarBehaviour === 'custom' && service.recipe.id === CUSTOM_WEBSITE_ID);
+
     const webviewClasses = classnames({
       services__webview: true,
       'services__webview-wrapper': true,
@@ -193,7 +195,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
           <>
             {!service.isHibernating ? (
               <>
-                {(service.recipe.id === CUSTOM_WEBSITE_ID || showServiceNavigationBar) && (
+                {showNavBar && (
                   <WebControlsScreen service={service} />
                 )}
                 <ServiceWebview
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 432a546d9..f41c7db8e 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -256,7 +256,7 @@ export default @observer class EditSettingsForm extends Component {
               <Toggle field={form.$('minimizeToSystemTray')} />
             )}
             <Toggle field={form.$('privateNotifications')} />
-            <Toggle field={form.$('showServiceNavigationBar')} />
+            <Select field={form.$('navigationBarBehaviour')} />
 
             <Hr />
 
diff --git a/src/config.js b/src/config.js
index 9b77aa9a5..283c20f84 100644
--- a/src/config.js
+++ b/src/config.js
@@ -45,6 +45,12 @@ export const HIBERNATION_STRATEGIES = {
   3600: 'Extemely Slow Hibernation (1hour)',
 };
 
+export const NAVIGATION_BAR_BEHAVIOURS = {
+  custom: 'Show navigation bar on custom websites only',
+  always: 'Show navigation bar on all services',
+  never: 'Never show navigation bar',
+};
+
 export const SIDEBAR_WIDTH = {
   35: 'Extemely slim sidebar',
   45: 'Very slim sidebar',
@@ -107,6 +113,7 @@ export const DEFAULT_APP_SETTINGS = {
   serviceRibbonWidth: 68,
   iconSize: iconSizeBias,
   sentry: false,
+  navigationBarBehaviour: 'custom',
 };
 
 export const DEFAULT_FEATURES_CONFIG = {
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index ee5e3615c..6dd21f961 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -11,7 +11,7 @@ import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
-  DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES,
+  DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS,
 } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
@@ -56,9 +56,9 @@ const messages = defineMessages({
     id: 'settings.app.form.privateNotifications',
     defaultMessage: '!!!Don\'t show message content in notifications',
   },
-  showServiceNavigationBar: {
-    id: 'settings.app.form.showServiceNavigationBar',
-    defaultMessage: '!!!Always show service navigation bar',
+  navigationBarBehaviour: {
+    id: 'settings.app.form.navigationBarBehaviour',
+    defaultMessage: '!!!Navigation bar behaviour',
   },
   sentry: {
     id: 'settings.app.form.sentry',
@@ -194,7 +194,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         startMinimized: settingsData.startMinimized,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         privateNotifications: settingsData.privateNotifications,
-        showServiceNavigationBar: settingsData.showServiceNavigationBar,
+        navigationBarBehaviour: settingsData.navigationBarBehaviour,
         sentry: settingsData.sentry,
         hibernate: settingsData.hibernate,
         hibernationStrategy: settingsData.hibernationStrategy,
@@ -260,6 +260,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       locales: APP_LOCALES,
     });
 
+    const navigationBarBehaviours = getSelectOptions({
+      locales: NAVIGATION_BAR_BEHAVIOURS,
+      sort: false,
+    });
+
     const hibernationStrategies = getSelectOptions({
       locales: HIBERNATION_STRATEGIES,
       sort: false,
@@ -317,10 +322,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.privateNotifications,
           default: DEFAULT_APP_SETTINGS.privateNotifications,
         },
-        showServiceNavigationBar: {
-          label: intl.formatMessage(messages.showServiceNavigationBar),
-          value: settings.all.app.showServiceNavigationBar,
-          default: DEFAULT_APP_SETTINGS.showServiceNavigationBar,
+        navigationBarBehaviour: {
+          label: intl.formatMessage(messages.navigationBarBehaviour),
+          value: settings.all.app.navigationBarBehaviour,
+          default: DEFAULT_APP_SETTINGS.navigationBarBehaviour,
+          options: navigationBarBehaviours,
         },
         sentry: {
           label: intl.formatMessage(messages.sentry),
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 0ea45b977..211214d93 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4214,15 +4214,15 @@
         }
       },
       {
-        "defaultMessage": "!!!Always show service navigation bar",
+        "defaultMessage": "!!!Navigation bar behaviour",
         "end": {
           "column": 3,
           "line": 62
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showServiceNavigationBar",
+        "id": "settings.app.form.navigationBarBehaviour",
         "start": {
-          "column": 28,
+          "column": 26,
           "line": 59
         }
       },
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 935b8550c..36494724b 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -284,6 +284,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -295,7 +296,6 @@
   "settings.app.form.serviceRibbonWidth": "Sidebar width",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
   "settings.app.form.startMinimized": "Start minimized in tray",
   "settings.app.form.todoServer": "Todo Server",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 98abb0f2b..fdf49bbb6 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -91,12 +91,12 @@
     }
   },
   {
-    "id": "settings.app.form.showServiceNavigationBar",
-    "defaultMessage": "!!!Always show service navigation bar",
+    "id": "settings.app.form.navigationBarBehaviour",
+    "defaultMessage": "!!!Navigation bar behaviour",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 59,
-      "column": 28
+      "column": 26
     },
     "end": {
       "line": 62,
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 56276ce2d..2ac7e4465 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,15 +1,15 @@
-import { remote, shell, clipboard } from 'electron';
-import { observable, autorun } from 'mobx';
+import { clipboard, remote, shell } from 'electron';
+import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
-
-import { isMac, ctrlKey, cmdKey } from '../environment';
-import { workspaceStore } from '../features/workspaces/index';
-import { workspaceActions } from '../features/workspaces/actions';
-import { announcementActions } from '../features/announcements/actions';
+import { cmdKey, ctrlKey, isMac } from '../environment';
 import { announcementsStore } from '../features/announcements';
+import { announcementActions } from '../features/announcements/actions';
 import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { CUSTOM_WEBSITE_ID } from '../features/webControls/constants';
+import { workspaceActions } from '../features/workspaces/actions';
+import { workspaceStore } from '../features/workspaces/index';
+
 
 const { app, Menu, dialog } = remote;
 
@@ -811,22 +811,13 @@ export default class FranzMenu {
         accelerator: 'CmdOrCtrl+Shift+L',
         enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled,
         click() {
-          // Disable lock first - otherwise the application might not update correctly
           actions.settings.update({
             type: 'app',
             data: {
-              locked: false,
+              locked: true,
             },
           });
-          setTimeout(() => {
-            actions.settings.update({
-              type: 'app',
-              data: {
-                locked: true,
-              },
-            });
-          }, 0);
-        },
+        }
       });
 
       if (serviceTpl.length > 0) {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index da63bc972..26e83b725 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,21 +1,18 @@
 import { ipcRenderer, remote } from 'electron';
-import {
-  action, computed, observable, reaction,
-} from 'mobx';
+import { 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, LOCAL_SERVER } from '../config';
+import { API } from '../environment';
+import { getLocale } from '../helpers/i18n-helpers';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
+import Request from './lib/Request';
+import Store from './lib/Store';
 
 const debug = require('debug')('Ferdi:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
+  startup = true;
 
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
 
@@ -30,16 +27,6 @@ export default class SettingsStore extends Store {
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
-
-    ipcRenderer.on('appSettings', (event, resp) => {
-      debug('Get appSettings resolves', resp.type, resp.data);
-
-      Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
-    });
-
-    this.fileSystemSettingsTypes.forEach((type) => {
-      ipcRenderer.send('getAppSettings', type);
-    });
   }
 
   async setup() {
@@ -101,27 +88,30 @@ export default class SettingsStore extends Store {
       }
     });
 
-    // Make sure to lock app on launch if locking feature is enabled
-    setTimeout(() => {
-      const isLoggedIn = Boolean(localStorage.getItem('authToken'));
-      if (isLoggedIn && 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);
+    ipcRenderer.on('appSettings', (event, resp) => {
+      // Lock on startup if enabled in settings
+      if (this.startup && resp.type === 'app' && resp.data.lockingFeatureEnabled) {
+        this.startup = false;
+        process.nextTick(() => {
+          // If the app was previously closed unlocked
+          // we can update the `locked` setting and rely on the reaction to lock at startup
+          if (!this.all.app.locked) {
+            this.all.app.locked = true;
+          } else {
+            // Otherwise the app previously closed in a locked state
+            // We can't rely on updating the locked setting for the reaction to be triggered
+            // So we lock manually
+            window.ferdi.stores.router.push('/auth/locked');
+          }
+        })
       }
-    }, 1000);
+      debug('Get appSettings resolves', resp.type, resp.data);
+      Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
+    });
+
+    this.fileSystemSettingsTypes.forEach((type) => {
+      ipcRenderer.send('getAppSettings', type);
+    });
   }
 
   @computed get app() {
@@ -250,5 +240,25 @@ export default class SettingsStore extends Store {
         },
       });
     }
+
+    if (!this.all.migration['5.4.4-beta.2-settings']) {
+      const {
+        showServiceNavigationBar,
+      } = this.all.app;
+
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          navigationBarBehaviour: showServiceNavigationBar ? 'custom' : 'never',
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.4.4-beta.2-settings': true,
+        },
+      });
+    }
   }
 }