toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address feedback (#6792)

Browse source
This commit is contained in:
Daniel Espino García 2022-11-29 12:20:22 +01:00 committed by GitHub
parent 62161750bd
commit 926d3f34b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/utils/file/index.ts
View file

@ -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}`;
}
}