rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/3.5.16' into develop

Browse Source
This commit is contained in:
Baptiste Grob
2021-01-20 14:38:20 +01:00
parent 4bac38f15f 923d14b787
commit e0d04efd8e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/services/archiveManager.ts
View File

@@ -3,7 +3,8 @@ import {
EncryptionIntent, EncryptionIntent,
ContentType, ContentType,
SNNote, SNNote,
BackupFile BackupFile,
PayloadContent,
} from '@standardnotes/snjs'; } from '@standardnotes/snjs';
function zippableTxtName(name: string, suffix = ""): string { function zippableTxtName(name: string, suffix = ""): string {
@@ -106,8 +107,8 @@ export class ArchiveManager {
let name, contents; let name, contents;
if (item.content_type === ContentType.Note) { if (item.content_type === ContentType.Note) {
const note = item as SNNote; const note = item as SNNote;
name = note.title; name = (note.content as PayloadContent).title;
contents = note.text; contents = (note.content as PayloadContent).text;
} else { } else {
name = item.content_type; name = item.content_type;
contents = JSON.stringify(item.content, null, 2); contents = JSON.stringify(item.content, null, 2);

4
app/assets/javascripts/services/desktopManager.ts
View File

@@ -197,7 +197,9 @@ export class DesktopManager extends ApplicationService {
} }
async desktop_requestBackupFile() { async desktop_requestBackupFile() {
const data = this.application!.createBackupFile(EncryptionIntent.FileEncrypted); const data = await this.application!.createBackupFile(
EncryptionIntent.FileEncrypted
);
if (data) { if (data) {
return JSON.stringify(data, null, 2); return JSON.stringify(data, null, 2);
} }