From 7a0453ebd728092f05ee65abc1a7c3efdda168d1 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Wed, 27 Nov 2019 22:02:18 +0700
Subject: #232 Remove default lock password behavior, allow empty password

---
 src/containers/auth/LockedScreen.js           | 5 +----
 src/containers/settings/EditSettingsScreen.js | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/containers')

diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 94285fb06..671f2ccaf 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Locked from '../../components/auth/Locked';
 import SettingsStore from '../../stores/SettingsStore';
-import { DEFAULT_LOCK_PASSWORD } from '../../config';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
@@ -27,9 +26,7 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends
 
     let correctPassword = this.props.stores.settings.all.app.lockedPassword;
     if (!correctPassword) {
-      // Lock feature was enabled but no password was set
-      // Use default lock password so user can exit
-      correctPassword = DEFAULT_LOCK_PASSWORD;
+      correctPassword = '';
     }
 
     if (String(password) === String(correctPassword)) {
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 07efbb881..b64cd77be 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -10,7 +10,7 @@ import UserStore from '../../stores/UserStore';
 import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
-import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config';
+import { DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
@@ -309,7 +309,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         lockedPassword: {
           label: intl.formatMessage(messages.lockPassword),
           value: settings.all.app.lockedPassword,
-          default: DEFAULT_LOCK_PASSWORD,
+          default: '',
           type: 'password',
         },
         scheduledDNDEnabled: {
-- 
cgit v1.2.3-70-g09d2