fix: handle bad access when accessing paths (#2375)

This commit is contained in:
Mo
2023-07-27 13:09:03 -05:00
committed by GitHub
parent bfd2b14264
commit 804a39dabc
10 changed files with 63 additions and 44 deletions

View File

@@ -160,14 +160,21 @@ export class FilesBackupService
}
private async automaticallyEnableTextBackupsIfPreferenceNotSet(): Promise<void> {
if (this.storage.getValue(StorageKey.TextBackupsEnabled) == undefined) {
this.storage.setValue(StorageKey.TextBackupsEnabled, true)
const location = await this.device.joinPaths(
await this.device.getUserDocumentsDirectory(),
await this.prependWorkspacePathForPath(TextBackupsDirectoryName),
)
this.storage.setValue(StorageKey.TextBackupsLocation, location)
if (this.storage.getValue(StorageKey.TextBackupsEnabled) != undefined) {
return
}
this.storage.setValue(StorageKey.TextBackupsEnabled, true)
const documentsDir = await this.device.getUserDocumentsDirectory()
if (!documentsDir) {
return
}
const location = await this.device.joinPaths(
documentsDir,
await this.prependWorkspacePathForPath(TextBackupsDirectoryName),
)
this.storage.setValue(StorageKey.TextBackupsLocation, location)
}
openAllDirectoriesContainingBackupFiles(): void {

View File

@@ -170,6 +170,9 @@ export class HomeServerService
let location = await this.getHomeServerDataLocation()
if (!location) {
const documentsDirectory = await this.desktopDevice.getUserDocumentsDirectory()
if (!documentsDirectory) {
return
}
location = `${documentsDirectory}/${this.HOME_SERVER_DATA_DIRECTORY_NAME}`
}