Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/mobile/src/Lib/MobileDevice.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import SNReactNative from '@standardnotes/react-native-utils'
import { sanitizeFileNameForNativeWrite } from './Utils'
import {
AppleIAPProductId,
AppleIAPReceipt,
Expand Down Expand Up @@ -502,7 +503,8 @@ export class MobileDevice implements MobileDeviceInterface {
directory = saveInTempLocation ? CachesDirectoryPath : DownloadDirectoryPath
}

return `${directory}/${filename}`
const safeFilename = sanitizeFileNameForNativeWrite(filename)
return `${directory}/${safeFilename}`
}

async downloadBase64AsFile(
Expand Down
21 changes: 21 additions & 0 deletions packages/mobile/src/Lib/Utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,24 @@ export function isSameDay(dateA: Date, dateB: Date) {
dateA.getDate() === dateB.getDate()
)
}

function parseFileName(fileName: string): {
name: string
ext: string
} {
const pattern = /(?:\.([^.]+))$/
const extMatches = pattern.exec(fileName)
const ext = extMatches?.[1] || ''
const name = fileName.includes('.') ? fileName.substring(0, fileName.lastIndexOf('.')) : fileName

return { name, ext }
}

function sanitizeFileName(name: string): string {
return name.trim().replace(/[.\\/:"?*|<>]/g, '_')
}

export function sanitizeFileNameForNativeWrite(filename: string): string {
const { name, ext } = parseFileName(filename)
return `${sanitizeFileName(name)}.${ext}`
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import ImagePreview from './ImagePreview'
import { OptionalSuperEmbeddedImageProps } from './OptionalSuperEmbeddedImageProps'
import { PreviewableTextFileTypes, RequiresNativeFilePreview } from './isFilePreviewable'
import TextPreview from './TextPreview'
import { parseFileName, sanitizeFileName } from '@standardnotes/utils'
import VideoPreview from './VideoPreview'

type Props = {
Expand Down Expand Up @@ -60,11 +59,7 @@ const PreviewComponent: FunctionComponent<Props> = ({
}),
)

const { name, ext } = parseFileName(file.name)
const sanitizedName = sanitizeFileName(name)
const filename = `${sanitizedName}.${ext}`

void application.mobileDevice.previewFile(fileBase64, filename)
void application.mobileDevice.previewFile(fileBase64, file.name)
}, [application, bytes, file.mimeType, file.name, isNativeMobileWeb])

if (isNativeMobileWeb && requiresNativePreview) {
Expand Down
Loading