Prevent Password Lock to trigger while not logged in

2 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 941107adb..303845e55 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -800,7 +800,7 @@ export default class FranzMenu {
     }, {
       label: intl.formatMessage(menuItems.lockFerdi),
       accelerator: 'CmdOrCtrl+Shift+L',
-      enabled: this.stores.settings.app.lockingFeatureEnabled,
+      enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled,
       click() {
         // Disable lock first - otherwise the application might not update correctly
         actions.settings.update({
@@ -964,7 +964,7 @@ export default class FranzMenu {
     this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
     const lockedMenu = Menu.buildFromTemplate([]);
-    Menu.setApplicationMenu(this.stores.settings.app.locked ? lockedMenu : menu);
+    Menu.setApplicationMenu(this.stores.user.isLoggedIn && this.stores.settings.app.locked ? lockedMenu : menu);
   }
 
   serviceTpl() {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index df0fc77e9..051e86be2 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -68,7 +68,6 @@ export default class SettingsStore extends Store {
       () => 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');
@@ -82,7 +81,8 @@ export default class SettingsStore extends Store {
 
     // Make sure to lock app on launch if locking feature is enabled
     setTimeout(() => {
-      if (this.all.app.lockingFeatureEnabled) {
+      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',