From 7d30372a631033fb23611f5ab195491cc8a82bda Mon Sep 17 00:00:00 2001 From: Mahadevan Sreenivasan Date: Wed, 13 May 2020 03:36:03 +0530 Subject: Fix crash when using Password Lock with TouchID API unavailable (#737) --- src/components/auth/Locked.js | 3 ++- src/components/settings/settings/EditSettingsForm.js | 2 +- src/lib/Menu.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') 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'; import Input from '../ui/Input'; import Button from '../ui/Button'; import Infobox from '../ui/Infobox'; +import { isMac } from '../../environment'; import { globalError as globalErrorPropType } from '../../prop-types'; @@ -100,7 +101,7 @@ export default @observer class Locked extends Component { useTouchIdToUnlock, } = this.props; - const touchIdEnabled = useTouchIdToUnlock && systemPreferences.canPromptTouchID(); + const touchIdEnabled = isMac ? (useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false; const submitButtonLabel = touchIdEnabled ? intl.formatMessage(messages.unlockWithPassword) : intl.formatMessage(messages.submitButtonLabel); 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 { {lockingFeatureEnabled && ( <> - {systemPreferences.canPromptTouchID() && ( + {isMac && systemPreferences.canPromptTouchID() && ( )} 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 { tpl[5].submenu = this.todosMenu(); } } else { - const touchIdEnabled = this.stores.settings.app.useTouchIdToUnlock && systemPreferences.canPromptTouchID(); + const touchIdEnabled = isMac ? (this.stores.settings.app.useTouchIdToUnlock && systemPreferences.canPromptTouchID()) : false; tpl[0].submenu.unshift({ label: intl.formatMessage(menuItems.touchId), -- cgit v1.2.3-54-g00ecf