diff options
author | Bennett <hello@vantezzen.io> | 2020-01-31 17:24:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-31 17:24:30 +0100 |
commit | 9277d42ee8fd6d9e3eccf948f71c8688f726784e (patch) | |
tree | 6f167ea9eb2ed50a079596048993a79c7aeb9447 /src/containers/auth/LockedScreen.js | |
parent | Update (diff) | |
parent | Fix lint (diff) | |
download | ferdium-app-9277d42ee8fd6d9e3eccf948f71c8688f726784e.tar.gz ferdium-app-9277d42ee8fd6d9e3eccf948f71c8688f726784e.tar.zst ferdium-app-9277d42ee8fd6d9e3eccf948f71c8688f726784e.zip |
Merge branch 'develop' into start-in-tray
Diffstat (limited to 'src/containers/auth/LockedScreen.js')
-rw-r--r-- | src/containers/auth/LockedScreen.js | 5 |
1 files changed, 1 insertions, 4 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)) { |