From ef3425d9e9d865b7d304b365574bdf9dffcc118e Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Thu, 12 Jun 2025 10:33:44 +0100 Subject: [PATCH] fix broken backup after changes to stop operlapping operations (fix https://github.com/espruino/BangleApps/issues/3879) --- backup.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/backup.js b/backup.js index a96377a08..47cc12b93 100644 --- a/backup.js +++ b/backup.js @@ -72,13 +72,13 @@ function bangleUpload() { type:"arraybuffer", mimeType:".zip,application/zip"}, function(data) { if (data===undefined) return; - var promise = Promise.resolve(); var zip = new JSZip(); var cmds = ""; - zip.loadAsync(data).then(function(zip) { + return zip.loadAsync(data).then(function(zip) { return showPrompt("Restore from ZIP","Are you sure? This will overwrite existing apps"); }).then(()=>{ Progress.show({title:`Reading ZIP`}); + var promise = Promise.resolve(); zip.forEach(function (path, file){ console.log("path"); promise = promise @@ -124,16 +124,14 @@ function bangleUpload() { showToast('Restore failed, ' + err, 'error'); resolve(); }); - return promise; - }); - } + })); } window.addEventListener('load', (event) => { document.getElementById("downloadallapps").addEventListener("click",event=>{ - startOperation({name:"Backup Apps"}, () => bangleDownload); + startOperation({name:"Backup Apps"}, () => bangleDownload()); }); document.getElementById("uploadallapps").addEventListener("click",event=>{ - startOperation({name:"Restore Apps"}, () => bangleUpload); + startOperation({name:"Restore Apps"}, () => bangleUpload()); }); });