mirror/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2026-02-16 04:00:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Android: Attempt to fix application hang when opening the camera (#13974)

Browse Source
This commit is contained in:
Henry Heino
2025-12-23 11:41:13 -08:00
committed by GitHub
parent 150f6c9a3f
commit c4e0ed18eb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/app-mobile/components/CameraView/Camera/index.tsx
View File

@@ -5,7 +5,6 @@ import { ForwardedRef, forwardRef, useCallback, useEffect, useImperativeHandle,
import useAsyncEffect from '@joplin/lib/hooks/useAsyncEffect';
import { CameraRef, Props } from './types';
import { _ } from '@joplin/lib/locale';
import { Platform } from 'react-native';
import Logger from '@joplin/utils/Logger';
const logger = Logger.create('Camera/expo');
@@ -66,7 +65,9 @@ const Camera = (props: Props, ref: ForwardedRef<CameraRef>) => {
// iOS issue workaround: Since upgrading to Expo SDK 52, closing and reopening the camera on iOS
// never emits onCameraReady. As a workaround, call .resumePreview and wait for it to resolve,
// rather than relying on the CameraView's onCameraReady prop.
if (Platform.OS === 'ios' && camera) {
//
// Update 12/23/2025: This also happens on certain Android devices.
if (camera) {
// Work around an issue on iOS where the onCameraReady callback is never called.
// Instead, wait for the preview to start using resumePreview:
await camera.resumePreview();

2
packages/app-mobile/components/CameraView/CameraView.tsx
View File

@@ -85,7 +85,7 @@ const useStyles = ({ themeId, style, cameraRatio }: UseStyleProps) => {
}, [themeId, style, outputPositioning]);
};
const androidRatios = ['1:1', '4:3', '16:9'];
const androidRatios = ['4:3', '16:9'];
const iOSRatios: string[] = [];
const useAvailableRatios = (): string[] => {
return Platform.OS === 'android' ? androidRatios : iOSRatios;