From 926d3f34b027540114852ded18e610b6387b1e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Espino=20Garc=C3=ADa?= <larkox@gmail.com>
Date: Tue, 29 Nov 2022 12:20:22 +0100
Subject: [PATCH] Address feedback (#6792)

---
 app/utils/file/index.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/utils/file/index.ts b/app/utils/file/index.ts
index 322934649..f76c2bc69 100644
--- a/app/utils/file/index.ts
+++ b/app/utils/file/index.ts
@@ -359,11 +359,13 @@ export function getLocalFilePathFromFile(serverUrl: string, file: FileInfo | Fil
     const fileIdPath = file.id?.replace(/[^0-9a-z]/g, '');
     if (serverUrl) {
         const server = urlSafeBase64Encode(serverUrl);
-        if (file?.name && !file.name.includes('/')) {
+        const hasValidFilename = file?.name && !file.name.includes('/');
+        const hasValidExtension = file?.extension && !file.extension.includes('/');
+        if (hasValidFilename) {
             let extension: string | undefined = file.extension;
             let filename = file.name;
 
-            if (!extension) {
+            if (!hasValidExtension) {
                 const mimeType = (file instanceof Model) ? file.mimeType : file.mime_type;
                 extension = getExtensionFromMime(mimeType);
             }
@@ -380,8 +382,10 @@ export function getLocalFilePathFromFile(serverUrl: string, file: FileInfo | Fil
             }
 
             return `${FileSystem.CachesDirectoryPath}/${server}/${filename}-${fileIdPath}.${extension}`;
-        } else if (file?.id && file?.extension) {
+        } else if (file?.id && hasValidExtension) {
             return `${FileSystem.CachesDirectoryPath}/${server}/${fileIdPath}.${file.extension}`;
+        } else if (file?.id) {
+            return `${FileSystem.CachesDirectoryPath}/${server}/${fileIdPath}`;
         }
     }