Merge pull request #25742 from dukenv0307/fix/25491-android-error-att…

…empting-to-download-an-attachment Fix: Android - Error attempting to download an attachment
Expensify · Aug 25, 2023 · a906a7c · a906a7c
2 parents fe02d63 + 27381e8
commit a906a7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/CONST.js b/src/CONST.js
@@ -1198,6 +1198,7 @@ const CONST = {
         TIME_STARTS_01: /^01:\d{2} [AP]M$/,
         TIME_FORMAT: /^\d{2}:\d{2} [AP]M$/,
         DATE_TIME_FORMAT: /^\d{2}-\d{2} \d{2}:\d{2} [AP]M$/,
+        ILLEGAL_FILENAME_CHARACTERS: /\/|<|>|\*|"|:|\?|\\|\|/g,
     },
 
     PRONOUNS: {

diff --git a/src/libs/fileDownload/FileUtils.js b/src/libs/fileDownload/FileUtils.js
@@ -125,6 +125,8 @@ function cleanFileName(fileName) {
 function appendTimeToFileName(fileName) {
     const file = splitExtensionFromFileName(fileName);
     let newFileName = `${file.fileName}-${DateUtils.getDBTime()}`;
+    // Replace illegal characters before trying to download the attachment.
+    newFileName = newFileName.replace(CONST.REGEX.ILLEGAL_FILENAME_CHARACTERS, '_');
     if (file.fileExtension) {
         newFileName += `.${file.fileExtension}`;
     }

diff --git a/tests/unit/FileUtilsTest.js b/tests/unit/FileUtilsTest.js
@@ -1,3 +1,4 @@
+import CONST from '../../src/CONST';
 import DateUtils from '../../src/libs/DateUtils';
 import * as FileUtils from '../../src/libs/fileDownload/FileUtils';
 
@@ -26,13 +27,13 @@ describe('FileUtils', () => {
         it('should append current time to the end of the file name', () => {
             const actualFileName = FileUtils.appendTimeToFileName('image.jpg');
             const expectedFileName = `image-${DateUtils.getDBTime()}.jpg`;
-            expect(actualFileName).toEqual(expectedFileName);
+            expect(actualFileName).toEqual(expectedFileName.replace(CONST.REGEX.ILLEGAL_FILENAME_CHARACTERS, '_'));
         });
 
         it('should append current time to the end of the file name without extension', () => {
             const actualFileName = FileUtils.appendTimeToFileName('image');
             const expectedFileName = `image-${DateUtils.getDBTime()}`;
-            expect(actualFileName).toEqual(expectedFileName);
+            expect(actualFileName).toEqual(expectedFileName.replace(CONST.REGEX.ILLEGAL_FILENAME_CHARACTERS, '_'));
         });
     });
 });