Settings import function improved (#1234)

core/storage-manager.js

@@ -121,17 +121,10 @@ storageManager.startImportFilePicker = function () {
 
 storageManager.handleImportFilePicker = function () {
     return new Promise((resolve) => {
-        try {
+        let file = document.getElementById('import-file-picker').files[0];
-            let file = document.getElementById('import-file-picker').files[0];
+        storageManager._readFile(file)
-            storageManager._readFile(file)
+            .then(storageManager._validation);
-                .then(JSON.parse)
+        resolve();
-                .then(storageManager._validation);
-            resolve();
-
-        } catch (err) {
-            console.error(`[ LocalCDN ] ${err}`);
-            alert(err);
-        }
     });
 };
 
@@ -164,6 +157,13 @@ storageManager._readFile = function (file) {
 storageManager._validation = function (content) {
     let imported = {};
 
+    try {
+        JSON.parse(content);
+    } catch (err) {
+        console.error(`[ LocalCDN ] ${err}`);
+        alert(err);
+    }
+
     // Delete old keys
     if (content.whitelistedDomains !== undefined) {
         content.allowlistedDomains = content.whitelistedDomains;

pages/updates/updates.html

@@ -54,6 +54,7 @@
                         <p>Improved</p>
                         <ul>
                             <li>Block all non GET requests to CDN (<a href="https://codeberg.org/nobody/LocalCDN/issues/1226">#1226</a>)</li>
+                            <li>Settings import function improved (<a href="https://codeberg.org/nobody/LocalCDN/issues/1234">#1234</a>)</li>
                         </ul>
                         <p>Fixed</p>
                         <ul>