Merge branch 'hotfix/3.5.16'

standardnotes · Jan 20, 2021 · f77125c · f77125c
2 parents 5c60c3f + 923d14b
commit f77125c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/assets/javascripts/services/archiveManager.ts b/app/assets/javascripts/services/archiveManager.ts
@@ -1,5 +1,5 @@
 import { WebApplication } from '@/ui_models/application';
-import { EncryptionIntent, ProtectedAction, SNItem, ContentType, SNNote, BackupFile } from '@standardnotes/snjs';
+import { EncryptionIntent, ProtectedAction, ContentType, SNNote, BackupFile, PayloadContent } from '@standardnotes/snjs';
 
 function zippableTxtName(name: string, suffix = ""): string {
   const sanitizedName = name
@@ -116,8 +116,8 @@ export class ArchiveManager {
           let name, contents;
           if (item.content_type === ContentType.Note) {
             const note = item as SNNote;
-            name = note.title;
-            contents = note.text;
+            name = (note.content as PayloadContent).title;
+            contents = (note.content as PayloadContent).text;
           } else {
             name = item.content_type;
             contents = JSON.stringify(item.content, null, 2);

diff --git a/app/assets/javascripts/services/desktopManager.ts b/app/assets/javascripts/services/desktopManager.ts
@@ -189,7 +189,9 @@ export class DesktopManager extends ApplicationService {
   }
 
   async desktop_requestBackupFile() {
-    const data = this.application!.createBackupFile(EncryptionIntent.FileEncrypted);
+    const data = await this.application!.createBackupFile(
+      EncryptionIntent.FileEncrypted
+    );
     if (data) {
       return JSON.stringify(data, null, 2);
     }