self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-10 22:11:50 +02:00
Code Issues Releases Activity

Mobile: Biometrics: Fix notebook list can still be accessed when the app is locked (#12691)

Browse Source
This commit is contained in:
Henry Heino
2025-07-09 15:47:06 -07:00
committed by GitHub
parent b0d888ee73
commit a962f48b38
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/app-mobile/root.tsx
View File

@@ -1346,7 +1346,6 @@ class AppComponent extends React.Component<AppComponentProps, AppComponentState>
isOpen={this.props.showSideMenu} isOpen={this.props.showSideMenu}
disableGestures={disableSideMenuGestures} disableGestures={disableSideMenuGestures}
> >
<StatusBar barStyle={statusBarStyle} />
<View style={{ flexGrow: 1, flexShrink: 1, flexBasis: '100%' }}> <View style={{ flexGrow: 1, flexShrink: 1, flexBasis: '100%' }}>
<SafeAreaView style={{ flex: 0, backgroundColor: theme.backgroundColor2 }}/> <SafeAreaView style={{ flex: 0, backgroundColor: theme.backgroundColor2 }}/>
<SafeAreaView style={{ flex: 1 }}> <SafeAreaView style={{ flex: 1 }}>
@@ -1355,11 +1354,6 @@ class AppComponent extends React.Component<AppComponentProps, AppComponentState>
</View> </View>
{/* eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied */} {/* eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied */}
<DropdownAlert alert={(func: any) => (this.dropdownAlert_ = func)} /> <DropdownAlert alert={(func: any) => (this.dropdownAlert_ = func)} />
{ !shouldShowMainContent && <BiometricPopup
dispatch={this.props.dispatch}
themeId={this.props.themeId}
sensorInfo={this.state.sensorInfo}
/> }
</SafeAreaView> </SafeAreaView>
</View> </View>
</SideMenu> </SideMenu>
@@ -1409,12 +1403,21 @@ class AppComponent extends React.Component<AppComponentProps, AppComponentState>
}, },
}}> }}>
<DialogManager themeId={this.props.themeId}> <DialogManager themeId={this.props.themeId}>
<StatusBar barStyle={statusBarStyle} />
<MenuProvider <MenuProvider
style={{ flex: 1 }} style={{ flex: 1 }}
closeButtonLabel={_('Dismiss')} closeButtonLabel={_('Dismiss')}
> >
<FocusControl.MainAppContent style={{ flex: 1 }}> <FocusControl.MainAppContent style={{ flex: 1 }}>
{mainContent} {shouldShowMainContent ? mainContent : (
<SafeAreaView>
<BiometricPopup
dispatch={this.props.dispatch}
themeId={this.props.themeId}
sensorInfo={this.state.sensorInfo}
/>
</SafeAreaView>
)}
</FocusControl.MainAppContent> </FocusControl.MainAppContent>
</MenuProvider> </MenuProvider>
</DialogManager> </DialogManager>