diff --git a/src/Model/Global/.fileTransferModel.ts.swp b/src/Model/Global/.fileTransferModel.ts.swp new file mode 100644 index 00000000..d1d3d56d Binary files /dev/null and b/src/Model/Global/.fileTransferModel.ts.swp differ diff --git a/src/Model/Global/fileTransferModel.ts b/src/Model/Global/fileTransferModel.ts index f3143caa..605b3b8c 100644 --- a/src/Model/Global/fileTransferModel.ts +++ b/src/Model/Global/fileTransferModel.ts @@ -93,7 +93,7 @@ export default class FileTransferModel { const parsed = parse(decrypted); if (!Array.isArray(parsed)) { console.error("Canceling backup - not an array", decrypted); - return; + throw "no array"; } for (const file of parsed) { diff --git a/src/View/Modals/dataTransferModal.tsx b/src/View/Modals/dataTransferModal.tsx index 2c885b5e..ad237183 100644 --- a/src/View/Modals/dataTransferModal.tsx +++ b/src/View/Modals/dataTransferModal.tsx @@ -928,7 +928,7 @@ function ImportDecryptionDataModal( class="primary flex" on:click={fileTransferViewModel.decryptImport} toggle:disabled={ - fileTransferViewModel.cannotDecryptImport + fileTransferViewModel.importDecryptSuccessful } > { diff --git a/src/ViewModel/Global/.fileTransferViewModel.ts.swp b/src/ViewModel/Global/.fileTransferViewModel.ts.swp new file mode 100644 index 00000000..b9b24768 Binary files /dev/null and b/src/ViewModel/Global/.fileTransferViewModel.ts.swp differ diff --git a/src/ViewModel/Global/fileTransferViewModel.ts b/src/ViewModel/Global/fileTransferViewModel.ts index 0fd443e2..4a41ef23 100644 --- a/src/ViewModel/Global/fileTransferViewModel.ts +++ b/src/ViewModel/Global/fileTransferViewModel.ts @@ -86,7 +86,7 @@ export default class FileTransferViewModel extends Context { [this.importedFile], () => this.importedFile.value == undefined, ); - cannotDecryptImport: React.State = React.createProxyState( + importDecryptSuccessful: React.State = React.createProxyState( [this.importKey], () => this.importKey.value == "", ); @@ -179,7 +179,7 @@ export default class FileTransferViewModel extends Context { const key = this.importKey.value; if (!fileString || !key) return; - this.cannotDecryptImport.value = true; + this.importDecryptSuccessful.value = true; try { await this.coreViewModel.fileTransferModel.handleBackupFile( fileString, @@ -189,7 +189,7 @@ export default class FileTransferViewModel extends Context { } catch (e) { console.error(e); this.isImportKeyCorrect.value = false; - this.cannotDecryptImport.value = false; + this.importDecryptSuccessful.value = false; } };