aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Mahadevan Sreenivasan <mahadevan_sv@yahoo.com>2020-05-13 03:36:03 +0530
committerLibravatar GitHub <noreply@github.com>2020-05-12 22:06:03 +0000
commit7d30372a631033fb23611f5ab195491cc8a82bda (patch)
tree817e98737b384b568157bd1f3fb525af23cd6df7 /src
parentReview GitHub issues/pull requests templates (#732) (diff)
downloadferdium-app-7d30372a631033fb23611f5ab195491cc8a82bda.tar.gz
ferdium-app-7d30372a631033fb23611f5ab195491cc8a82bda.tar.zst
ferdium-app-7d30372a631033fb23611f5ab195491cc8a82bda.zip
Fix crash when using Password Lock with TouchID API unavailable (#737)
Diffstat (limited to 'src')
-rw-r--r--src/components/auth/Locked.js3
-rw-r--r--src/components/settings/settings/EditSettingsForm.js2
-rw-r--r--src/lib/Menu.js2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index 6142e78c6..c5e8a5aad 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -8,6 +8,7 @@ import Form from '../../lib/Form';
8import Input from '../ui/Input'; 8import Input from '../ui/Input';
9import Button from '../ui/Button'; 9import Button from '../ui/Button';
10import Infobox from '../ui/Infobox'; 10import Infobox from '../ui/Infobox';
11import { isMac } from '../../environment';
11 12
12import { globalError as globalErrorPropType } from '../../prop-types'; 13import { globalError as globalErrorPropType } from '../../prop-types';
13 14
@@ -100,7 +101,7 @@ export default @observer class Locked extends Component {
100 useTouchIdToUnlock, 101 useTouchIdToUnlock,
101 } = this.props; 102 } = this.props;
102 103
103 const touchIdEnabled = useTouchIdToUnlock && systemPreferences.canPromptTouchID(); 104 const touchIdEnabled = isMac ? (useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false;
104 const submitButtonLabel = touchIdEnabled ? intl.formatMessage(messages.unlockWithPassword) : intl.formatMessage(messages.submitButtonLabel); 105 const submitButtonLabel = touchIdEnabled ? intl.formatMessage(messages.unlockWithPassword) : intl.formatMessage(messages.submitButtonLabel);
105 106
106 return ( 107 return (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 8faea708b..50358c36f 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -367,7 +367,7 @@ export default @observer class EditSettingsForm extends Component {
367 <Toggle field={form.$('lockingFeatureEnabled')} /> 367 <Toggle field={form.$('lockingFeatureEnabled')} />
368 {lockingFeatureEnabled && ( 368 {lockingFeatureEnabled && (
369 <> 369 <>
370 {systemPreferences.canPromptTouchID() && ( 370 {isMac && systemPreferences.canPromptTouchID() && (
371 <Toggle field={form.$('useTouchIdToUnlock')} /> 371 <Toggle field={form.$('useTouchIdToUnlock')} />
372 )} 372 )}
373 373
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 07a29a224..3c5fc6530 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -921,7 +921,7 @@ export default class FranzMenu {
921 tpl[5].submenu = this.todosMenu(); 921 tpl[5].submenu = this.todosMenu();
922 } 922 }
923 } else { 923 } else {
924 const touchIdEnabled = this.stores.settings.app.useTouchIdToUnlock && systemPreferences.canPromptTouchID(); 924 const touchIdEnabled = isMac ? (this.stores.settings.app.useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false;
925 925
926 tpl[0].submenu.unshift({ 926 tpl[0].submenu.unshift({
927 label: intl.formatMessage(menuItems.touchId), 927 label: intl.formatMessage(menuItems.touchId),