diff options
author | Amine Mouafik <amine@mouafik.fr> | 2019-11-27 22:02:18 +0700 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2019-11-27 22:02:18 +0700 |
commit | 7a0453ebd728092f05ee65abc1a7c3efdda168d1 (patch) | |
tree | f648f20a4edd9159761eeeb49323b836606e7b7f /src/containers | |
parent | Revert "Deprecate electron-rebuild, follow electron-builder suggestion" (diff) | |
download | ferdium-app-7a0453ebd728092f05ee65abc1a7c3efdda168d1.tar.gz ferdium-app-7a0453ebd728092f05ee65abc1a7c3efdda168d1.tar.zst ferdium-app-7a0453ebd728092f05ee65abc1a7c3efdda168d1.zip |
#232 Remove default lock password behavior, allow empty password
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/auth/LockedScreen.js | 5 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 4 |
2 files changed, 3 insertions, 6 deletions
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'; | |||
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import Locked from '../../components/auth/Locked'; | 4 | import Locked from '../../components/auth/Locked'; |
5 | import SettingsStore from '../../stores/SettingsStore'; | 5 | import SettingsStore from '../../stores/SettingsStore'; |
6 | import { DEFAULT_LOCK_PASSWORD } from '../../config'; | ||
7 | 6 | ||
8 | import { globalError as globalErrorPropType } from '../../prop-types'; | 7 | import { globalError as globalErrorPropType } from '../../prop-types'; |
9 | 8 | ||
@@ -27,9 +26,7 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends | |||
27 | 26 | ||
28 | let correctPassword = this.props.stores.settings.all.app.lockedPassword; | 27 | let correctPassword = this.props.stores.settings.all.app.lockedPassword; |
29 | if (!correctPassword) { | 28 | if (!correctPassword) { |
30 | // Lock feature was enabled but no password was set | 29 | correctPassword = ''; |
31 | // Use default lock password so user can exit | ||
32 | correctPassword = DEFAULT_LOCK_PASSWORD; | ||
33 | } | 30 | } |
34 | 31 | ||
35 | if (String(password) === String(correctPassword)) { | 32 | 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'; | |||
10 | import TodosStore from '../../features/todos/store'; | 10 | import TodosStore from '../../features/todos/store'; |
11 | import Form from '../../lib/Form'; | 11 | import Form from '../../lib/Form'; |
12 | import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; | 12 | import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; |
13 | import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config'; | 13 | import { DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES } from '../../config'; |
14 | import { config as spellcheckerConfig } from '../../features/spellchecker'; | 14 | import { config as spellcheckerConfig } from '../../features/spellchecker'; |
15 | 15 | ||
16 | import { getSelectOptions } from '../../helpers/i18n-helpers'; | 16 | import { getSelectOptions } from '../../helpers/i18n-helpers'; |
@@ -309,7 +309,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
309 | lockedPassword: { | 309 | lockedPassword: { |
310 | label: intl.formatMessage(messages.lockPassword), | 310 | label: intl.formatMessage(messages.lockPassword), |
311 | value: settings.all.app.lockedPassword, | 311 | value: settings.all.app.lockedPassword, |
312 | default: DEFAULT_LOCK_PASSWORD, | 312 | default: '', |
313 | type: 'password', | 313 | type: 'password', |
314 | }, | 314 | }, |
315 | scheduledDNDEnabled: { | 315 | scheduledDNDEnabled: { |