1 files changed, 22 insertions, 2 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index df0fc77e9..8a5ee7204 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');
@@ -80,9 +79,30 @@ export default class SettingsStore extends Store {
       },
     );
 
+    // Inactivity lock timer
+    let inactivityTimer;
+    remote.getCurrentWindow().on('blur', () => {
+      if (this.all.app.inactivityLock !== 0) {
+        inactivityTimer = setTimeout(() => {
+          this.actions.settings.update({
+            type: 'app',
+            data: {
+              locked: true,
+            },
+          });
+        }, this.all.app.inactivityLock * 1000 * 60);
+      }
+    });
+    remote.getCurrentWindow().on('focus', () => {
+      if (inactivityTimer) {
+        clearTimeout(inactivityTimer);
+      }
+    });
+
     // 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',