Merge branch 'develop'

2 files changed, 34 insertions, 0 deletions

diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 671f2ccaf..aced64a98 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -19,6 +19,7 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends
     super(props);
 
     this.onSubmit = this.onSubmit.bind(this);
+    this.unlock = this.unlock.bind(this);
   }
 
   onSubmit(values) {
@@ -45,11 +46,24 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends
     }
   }
 
+  unlock() {
+    this.props.actions.settings.update({
+      type: 'app',
+      data: {
+        locked: false,
+      },
+    });
+  }
+
   render() {
     const { stores, error } = this.props;
+    const { useTouchIdToUnlock } = this.props.stores.settings.all.app;
+
     return (
       <Locked
         onSubmit={this.onSubmit}
+        unlock={this.unlock}
+        useTouchIdToUnlock={useTouchIdToUnlock}
         isSubmitting={stores.user.loginRequest.isExecuting}
         error={this.state.error || error}
       />
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 6dd21f961..5221b0694 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -48,6 +48,10 @@ const messages = defineMessages({
     id: 'settings.app.form.enableSystemTray',
     defaultMessage: '!!!Always show Ferdi in system tray',
   },
+  reloadAfterResume: {
+    id: 'settings.app.form.reloadAfterResume',
+    defaultMessage: '!!!Reload Ferdi after system resume',
+  },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
     defaultMessage: '!!!Minimize Ferdi to system tray',
@@ -88,6 +92,10 @@ const messages = defineMessages({
     id: 'settings.app.form.lockPassword',
     defaultMessage: '!!!Password',
   },
+  useTouchIdToUnlock: {
+    id: 'settings.app.form.useTouchIdToUnlock',
+    defaultMessage: '!!!Allow using Touch ID to unlock',
+  },
   inactivityLock: {
     id: 'settings.app.form.inactivityLock',
     defaultMessage: '!!!Lock after inactivity',
@@ -191,6 +199,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       data: {
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
+        reloadAfterResume: settingsData.reloadAfterResume,
         startMinimized: settingsData.startMinimized,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         privateNotifications: settingsData.privateNotifications,
@@ -202,6 +211,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         todoServer: settingsData.todoServer,
         lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
         lockedPassword: settingsData.lockedPassword,
+        useTouchIdToUnlock: settingsData.useTouchIdToUnlock,
         inactivityLock: settingsData.inactivityLock,
         scheduledDNDEnabled: settingsData.scheduledDNDEnabled,
         scheduledDNDStart: settingsData.scheduledDNDStart,
@@ -312,6 +322,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.enableSystemTray,
           default: DEFAULT_APP_SETTINGS.enableSystemTray,
         },
+        reloadAfterResume: {
+          label: intl.formatMessage(messages.reloadAfterResume),
+          value: settings.all.app.reloadAfterResume,
+          default: DEFAULT_APP_SETTINGS.reloadAfterResume,
+        },
         minimizeToSystemTray: {
           label: intl.formatMessage(messages.minimizeToSystemTray),
           value: settings.all.app.minimizeToSystemTray,
@@ -365,6 +380,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           default: '',
           type: 'password',
         },
+        useTouchIdToUnlock: {
+          label: intl.formatMessage(messages.useTouchIdToUnlock),
+          value: settings.all.app.useTouchIdToUnlock,
+          default: DEFAULT_APP_SETTINGS.useTouchIdToUnlock,
+        },
         inactivityLock: {
           label: intl.formatMessage(messages.inactivityLock),
           value: settings.all.app.inactivityLock,