diff --git a/src/CONST/index.ts b/src/CONST/index.ts index dce0d894d35f..2a6e82e02c40 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -2817,6 +2817,7 @@ const CONST = { FILE_TOO_LARGE: 'fileTooLarge', FILE_TOO_SMALL: 'fileTooSmall', FILE_CORRUPTED: 'fileCorrupted', + HEIC_CONVERSION_FAILED: 'heicConversionFailed', PROTECTED_FILE: 'protectedFile', HEIC_OR_HEIF_IMAGE: 'heicOrHeifImage', IMAGE_DIMENSIONS_TOO_LARGE: 'imageDimensionsTooLarge', diff --git a/src/components/AttachmentPicker/index.native.tsx b/src/components/AttachmentPicker/index.native.tsx index 6b8cde6c3ce9..62d02bec6f78 100644 --- a/src/components/AttachmentPicker/index.native.tsx +++ b/src/components/AttachmentPicker/index.native.tsx @@ -261,9 +261,8 @@ function AttachmentPicker({ checkAllProcessed(); }) .catch((error: Error) => { - Log.warn('Failed to convert HEIC image, falling back to original', {error: error.message}); - const fallbackAsset = processAssetWithFallbacks(asset); - processedAssets.push(fallbackAsset); + Log.warn('Failed to convert HEIC image, skipping asset', {error: error.message}); + showGeneralAlert(translate('attachmentPicker.errorWhileConvertingHeic')); checkAllProcessed(); }); } else { diff --git a/src/hooks/useFilesValidation.tsx b/src/hooks/useFilesValidation.tsx index f16a6a37dbfa..74ab78224136 100644 --- a/src/hooks/useFilesValidation.tsx +++ b/src/hooks/useFilesValidation.tsx @@ -218,46 +218,46 @@ function useFilesValidation(onFilesValidated: (files: FileObject[], dataTransfer const convertedFilesToResize: FileObject[] = []; const convertedFiles: FileObject[] = []; - await Promise.all( - filesToConvert.map( - (file) => - new Promise((resolve) => { - convertHeicImage(file, { - onSuccess: (convertedFile) => { - if (validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE) { - convertedFilesToResize.push(convertedFile); - resolve(); - return; - } - - if (!validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) { - collectedErrors.current.push({ - error: CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE, - isValidatingMultipleFiles: validationState.isValidatingMultipleFiles, - }); - resolve(); - return; - } - - convertedFiles.push(convertedFile); - resolve(); - }, - onError: () => { - Log.warn('HEIC conversion failed, falling back to original file', {fileName: file.name}); - convertedFiles.push(file); - resolve(); - }, + + for (const file of filesToConvert) { + // Convert sequentially to avoid the native memory pressure caused by processing multiple HEIC images in parallel. + // eslint-disable-next-line no-await-in-loop + await new Promise((resolve) => { + convertHeicImage(file, { + onSuccess: (convertedFile) => { + if (validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE) { + convertedFilesToResize.push(convertedFile); + resolve(); + return; + } + + if (!validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) { + collectedErrors.current.push({ + error: CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE, + isValidatingMultipleFiles: validationState.isValidatingMultipleFiles, + }); + resolve(); + return; + } + + convertedFiles.push(convertedFile); + updateFileOrderMapping(file, convertedFile); + resolve(); + }, + onError: () => { + Log.warn('HEIC conversion failed, blocking file', {fileName: file.name}); + collectedErrors.current.push({ + error: CONST.FILE_VALIDATION_ERRORS.HEIC_CONVERSION_FAILED, + isValidatingMultipleFiles: validationState.isValidatingMultipleFiles, }); - }), - ), - ); + resolve(); + }, + }); + }); + } filesToResize.push(...convertedFilesToResize); validNonPdfFiles.push(...convertedFiles); - - for (const [index, convertedFile] of convertedFiles.entries()) { - updateFileOrderMapping(filesToConvert.at(index), convertedFile); - } } if (filesToResize.length > 0) { diff --git a/src/languages/de.ts b/src/languages/de.ts index d0991c549c73..ccd3cdf65e79 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -581,6 +581,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Anlagenfehler', errorWhileSelectingAttachment: 'Beim Auswählen eines Anhangs ist ein Fehler aufgetreten. Bitte versuche es erneut.', errorWhileSelectingCorruptedAttachment: 'Beim Auswählen eines beschädigten Anhangs ist ein Fehler aufgetreten. Bitte versuchen Sie es mit einer anderen Datei.', + errorWhileConvertingHeic: 'Wir konnten dieses Bild nicht verarbeiten. Bitte versuchen Sie es erneut oder laden Sie das Foto in einem anderen Format hoch.', takePhoto: 'Foto aufnehmen', chooseFromGallery: 'Aus Galerie wählen', chooseDocument: 'Datei auswählen', diff --git a/src/languages/el.ts b/src/languages/el.ts index 4391e63ad2cd..e37d42143800 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -588,6 +588,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Σφάλμα συνημμένου', errorWhileSelectingAttachment: 'Παρουσιάστηκε σφάλμα κατά την επιλογή συνημμένου. Παρακαλούμε δοκιμάστε ξανά.', errorWhileSelectingCorruptedAttachment: 'Προέκυψε σφάλμα κατά την επιλογή κατεστραμμένου συνημμένου. Παρακαλούμε δοκιμάστε άλλο αρχείο.', + errorWhileConvertingHeic: 'Δεν μπορέσαμε να επεξεργαστούμε αυτήν την εικόνα. Δοκιμάστε ξανά ή ανεβάστε τη φωτογραφία σε διαφορετική μορφή.', takePhoto: 'Βγάλτε φωτογραφία', chooseFromGallery: 'Επιλογή από τη συλλογή', chooseDocument: 'Επιλέξτε αρχείο', diff --git a/src/languages/en.ts b/src/languages/en.ts index 91a6c4fc24e8..c56b10e25b07 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -610,6 +610,7 @@ const translations = { attachmentError: 'Attachment error', errorWhileSelectingAttachment: 'An error occurred while selecting an attachment. Please try again.', errorWhileSelectingCorruptedAttachment: 'An error occurred while selecting a corrupted attachment. Please try another file.', + errorWhileConvertingHeic: "We couldn't process this image. Please try again, or upload the photo in a different format.", takePhoto: 'Take photo', chooseFromGallery: 'Choose from gallery', chooseDocument: 'Choose file', diff --git a/src/languages/es.ts b/src/languages/es.ts index 10a973e7a9bc..7d11f8baca6a 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -541,6 +541,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Error al adjuntar archivo', errorWhileSelectingAttachment: 'Se ha producido un error al seleccionar un archivo adjunto. Por favor, inténtalo de nuevo.', errorWhileSelectingCorruptedAttachment: 'Se ha producido un error al seleccionar un archivo adjunto corrupto. Por favor, inténtalo con otro archivo.', + errorWhileConvertingHeic: 'No hemos podido procesar esta imagen. Inténtalo de nuevo o sube la foto en un formato diferente.', takePhoto: 'Hacer una foto', chooseFromGallery: 'Elegir de la galería', chooseDocument: 'Elegir un archivo', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index e27e999b89df..4ae979672ada 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -581,6 +581,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Erreur de pièce jointe', errorWhileSelectingAttachment: 'Une erreur s’est produite lors de la sélection d’une pièce jointe. Veuillez réessayer.', errorWhileSelectingCorruptedAttachment: 'Une erreur s’est produite lors de la sélection d’une pièce jointe corrompue. Veuillez essayer un autre fichier.', + errorWhileConvertingHeic: 'Nous n’avons pas pu traiter cette image. Veuillez réessayer ou téléverser la photo dans un format différent.', takePhoto: 'Prendre une photo', chooseFromGallery: 'Choisir depuis la galerie', chooseDocument: 'Choisir un fichier', diff --git a/src/languages/it.ts b/src/languages/it.ts index cf6c4b48a409..5eb2beeb0c1e 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -581,6 +581,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Errore allegato', errorWhileSelectingAttachment: 'Si è verificato un errore durante la selezione di un allegato. Riprova.', errorWhileSelectingCorruptedAttachment: 'Si è verificato un errore durante la selezione di un allegato danneggiato. Riprova con un altro file.', + errorWhileConvertingHeic: 'Non è stato possibile elaborare questa immagine. Riprova o carica la foto in un altro formato.', takePhoto: 'Scatta foto', chooseFromGallery: 'Scegli dalla galleria', chooseDocument: 'Scegli file', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index b5cb7e254633..f001244da921 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -583,6 +583,7 @@ const translations: TranslationDeepObject = { attachmentError: '添付ファイルエラー', errorWhileSelectingAttachment: '添付ファイルの選択中にエラーが発生しました。もう一度お試しください。', errorWhileSelectingCorruptedAttachment: '破損した添付ファイルを選択した際にエラーが発生しました。別のファイルをお試しください。', + errorWhileConvertingHeic: 'この画像を処理できませんでした。もう一度お試しいただくか、別の形式で写真をアップロードしてください。', takePhoto: '写真を撮る', chooseFromGallery: 'ギャラリーから選択', chooseDocument: 'ファイルを選択', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 0ef89e0a32c9..8820686961ec 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -580,6 +580,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Bijlagefout', errorWhileSelectingAttachment: 'Er is een fout opgetreden bij het selecteren van een bijlage. Probeer het opnieuw.', errorWhileSelectingCorruptedAttachment: 'Er is een fout opgetreden bij het selecteren van een beschadigde bijlage. Probeer een ander bestand.', + errorWhileConvertingHeic: 'We konden deze afbeelding niet verwerken. Probeer het opnieuw of upload de foto in een ander formaat.', takePhoto: 'Maak foto', chooseFromGallery: 'Kies uit galerij', chooseDocument: 'Bestand kiezen', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index cbe6f9a63725..b65dd548e2aa 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -580,6 +580,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Błąd załącznika', errorWhileSelectingAttachment: 'Wystąpił błąd podczas wybierania załącznika. Spróbuj ponownie.', errorWhileSelectingCorruptedAttachment: 'Wystąpił błąd podczas wybierania uszkodzonego załącznika. Spróbuj użyć innego pliku.', + errorWhileConvertingHeic: 'Nie udało nam się przetworzyć tego obrazu. Spróbuj ponownie lub prześlij zdjęcie w innym formacie.', takePhoto: 'Zrób zdjęcie', chooseFromGallery: 'Wybierz z galerii', chooseDocument: 'Wybierz plik', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index d755a20e994d..40bd0c879fe4 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -579,6 +579,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Erro de anexo', errorWhileSelectingAttachment: 'Ocorreu um erro ao selecionar um anexo. Tente novamente.', errorWhileSelectingCorruptedAttachment: 'Ocorreu um erro ao selecionar um anexo corrompido. Tente outro arquivo.', + errorWhileConvertingHeic: 'Não foi possível processar esta imagem. Tente novamente ou envie a foto em um formato diferente.', takePhoto: 'Tirar foto', chooseFromGallery: 'Escolher da galeria', chooseDocument: 'Escolher arquivo', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index ee4798c12823..5c87da572d53 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -578,6 +578,7 @@ const translations: TranslationDeepObject = { attachmentError: '附件错误', errorWhileSelectingAttachment: '选择附件时发生错误。请重试。', errorWhileSelectingCorruptedAttachment: '选择已损坏的附件时发生错误。请尝试另一个文件。', + errorWhileConvertingHeic: '我们无法处理此图片。请重试,或以其他格式上传照片。', takePhoto: '拍照', chooseFromGallery: '从相册中选择', chooseDocument: '选择文件', diff --git a/src/libs/fileDownload/FileUtils.ts b/src/libs/fileDownload/FileUtils.ts index 7442266a1734..c4d3b03c7f1a 100644 --- a/src/libs/fileDownload/FileUtils.ts +++ b/src/libs/fileDownload/FileUtils.ts @@ -826,6 +826,11 @@ const getFileValidationErrorText = ( title: translate('attachmentPicker.attachmentError'), reason: translate('attachmentPicker.errorWhileSelectingCorruptedAttachment'), }; + case CONST.FILE_VALIDATION_ERRORS.HEIC_CONVERSION_FAILED: + return { + title: translate('attachmentPicker.attachmentError'), + reason: translate('attachmentPicker.errorWhileConvertingHeic'), + }; case CONST.FILE_VALIDATION_ERRORS.PROTECTED_FILE: return { title: translate('attachmentPicker.attachmentError'), diff --git a/src/libs/fileDownload/heicConverter/index.native.ts b/src/libs/fileDownload/heicConverter/index.native.ts index 750dea50e680..fe97617463ac 100644 --- a/src/libs/fileDownload/heicConverter/index.native.ts +++ b/src/libs/fileDownload/heicConverter/index.native.ts @@ -1,7 +1,5 @@ -import {verifyFileFormat} from '@libs/fileDownload/FileUtils'; import Log from '@libs/Log'; -import CONST from '@src/CONST'; import type {FileObject} from '@src/types/utils/Attachment'; import {ImageManipulator, SaveFormat} from 'expo-image-manipulator'; @@ -69,50 +67,12 @@ const convertHeicImage: HeicConverterFunction = (file, {onSuccess = () => {}, on onStart(); - if (!file.uri) { - onError(new Error('File URI is undefined'), file); - onFinish(); - return; - } - // Conversion based on extension - if (needsConversion) { - const fileUri = file.uri; - convertImageWithManipulator(file, fileUri, /\.(heic|heif)$/i, { - onSuccess, - onError, - onFinish, - }); - return; - } - - // If not detected by extension, check using file signatures - verifyFileFormat({fileUri: file.uri, formatSignatures: CONST.HEIC_SIGNATURES}) - .then((isHEIC) => { - if (isHEIC) { - const fileUri = file.uri; - if (!fileUri) { - onError(new Error('File URI is undefined'), file); - onFinish(); - return; - } - convertImageWithManipulator(file, fileUri, /\.heic$/i, { - onSuccess, - onError, - onFinish, - }); - return; - } - - onSuccess(file); - }) - .catch((err) => { - Log.warn('Error processing the file', {error: err instanceof Error ? err.message : String(err)}); - onError(err, file); - }) - .finally(() => { - onFinish(); - }); + convertImageWithManipulator(file, file.uri, /\.(heic|heif)$/i, { + onSuccess, + onError, + onFinish, + }); }; export default convertHeicImage; diff --git a/tests/unit/HeicConverterTest.ts b/tests/unit/HeicConverterTest.ts new file mode 100644 index 000000000000..26a3259568a5 --- /dev/null +++ b/tests/unit/HeicConverterTest.ts @@ -0,0 +1,75 @@ +import convertHeicImage from '@libs/fileDownload/heicConverter/index.native'; + +const mockSaveAsync = jest.fn(); +const mockRenderAsync = jest.fn(); + +jest.mock('expo-image-manipulator', () => ({ + ImageManipulator: { + manipulate: () => ({ + renderAsync: () => mockRenderAsync() as unknown, + }), + }, + SaveFormat: {JPEG: 'jpeg'}, +})); + +jest.mock('@libs/Log', () => ({ + info: jest.fn(), + warn: jest.fn(), +})); + +const heicFile = {uri: 'file:///photo.heic', name: 'photo.heic', type: 'image/heic', size: 1024}; + +const mockRenderSuccess = () => mockRenderAsync.mockResolvedValueOnce({saveAsync: () => mockSaveAsync() as unknown}); + +describe('convertHeicImage (native)', () => { + beforeEach(() => { + jest.clearAllMocks(); + jest.useFakeTimers(); + mockSaveAsync.mockResolvedValue({uri: 'file:///photo.jpg', width: 100, height: 200}); + }); + + afterEach(() => { + jest.useRealTimers(); + }); + + it('converts a HEIC file to JPEG and reports success', async () => { + mockRenderSuccess(); + const onSuccess = jest.fn(); + const onError = jest.fn(); + const onFinish = jest.fn(); + + convertHeicImage(heicFile, {onSuccess, onError, onFinish}); + await jest.runAllTimersAsync(); + + expect(onError).not.toHaveBeenCalled(); + expect(onFinish).toHaveBeenCalledTimes(1); + expect(onSuccess).toHaveBeenCalledWith(expect.objectContaining({uri: 'file:///photo.jpg', name: 'photo.jpg', type: 'image/jpeg'})); + }); + + it('reports an error on conversion failure, and never falls back to the original HEIC', async () => { + mockRenderAsync.mockRejectedValueOnce(new Error('Image context has been lost')); + const onSuccess = jest.fn(); + const onError = jest.fn(); + const onFinish = jest.fn(); + + convertHeicImage(heicFile, {onSuccess, onError, onFinish}); + await jest.runAllTimersAsync(); + + expect(mockRenderAsync).toHaveBeenCalledTimes(1); + expect(onError).toHaveBeenCalledTimes(1); + expect(onFinish).toHaveBeenCalledTimes(1); + // The raw HEIC must never be surfaced as a success: the server rejects image/heic. + expect(onSuccess).not.toHaveBeenCalled(); + }); + + it('passes non-HEIC files straight through without conversion', async () => { + const onSuccess = jest.fn(); + const jpegFile = {uri: 'file:///photo.jpg', name: 'photo.jpg', type: 'image/jpeg', size: 1024}; + + convertHeicImage(jpegFile, {onSuccess}); + await jest.runAllTimersAsync(); + + expect(mockRenderAsync).not.toHaveBeenCalled(); + expect(onSuccess).toHaveBeenCalledWith(jpegFile); + }); +});