diff --git a/packages/app-mobile/components/CameraView/Camera/index.tsx b/packages/app-mobile/components/CameraView/Camera/index.tsx index f3ef426349..b702a99134 100644 --- a/packages/app-mobile/components/CameraView/Camera/index.tsx +++ b/packages/app-mobile/components/CameraView/Camera/index.tsx @@ -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) => { // 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(); diff --git a/packages/app-mobile/components/CameraView/CameraView.tsx b/packages/app-mobile/components/CameraView/CameraView.tsx index 5d2e900ba0..a60167a488 100644 --- a/packages/app-mobile/components/CameraView/CameraView.tsx +++ b/packages/app-mobile/components/CameraView/CameraView.tsx @@ -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;