From 1c7872d8b046e7eb3156e8fcaf801c3419a3f73e Mon Sep 17 00:00:00 2001
From: Yurii Nazarenko <yurii.nazarenko@tine.no>
Date: Sun, 17 Nov 2024 22:39:25 +0100
Subject: [PATCH] #44, Fix the issue when on DSM 7.1.1 RRM can't fetch task
 list. Improve erro handling

---
 Makefile                         | 2 +-
 src/src/tabs/main.js             | 9 +++++----
 src/src/utils/synoApiProvider.js | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 0bc7eac..5443e3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = rr-manager
 SPK_VERS = 2.0
-SPK_REV = 76
+SPK_REV = 77
 SPK_ICON = src/rr-manager.png
 
 DSM_UI_DIR = app
diff --git a/src/src/tabs/main.js b/src/src/tabs/main.js
index 71ce897..c8881fd 100644
--- a/src/src/tabs/main.js
+++ b/src/src/tabs/main.js
@@ -191,7 +191,8 @@ export default
                     );
                 }
             } catch (error) {
-                console.error('Error checking or creating tasks:', error);
+                self.showMsg(`Error checking or creating RRM tasks: ${error}`);
+                console.error(`Error checking or creating RRM tasks: ${error}`);
             }
         },
         showPasswordConfirmDialog: function (taskName) {
@@ -243,7 +244,8 @@ export default
                         self.apiProvider.getPackagesList(),
                         self.apiProvider.checkRRVersion()
                     ]);
-
+                    self.systemInfo = systemInfo;
+                    self.__checkDownloadFolder(self.__checkRequiredTasks.bind(self));
                     if (systemInfo && packages) {
                         self.rrCheckVersion = rrCheckVersion;
                         //TODO: implement localization
@@ -292,8 +294,7 @@ export default
                     self.showMsg(`Error during RRM initialization: ${error}`);
                     return;
                 }
-            })();
-            self.__checkDownloadFolder(self.__checkRequiredTasks.bind(self));
+            })();           
         },
         isUpdateAvailable: function (rrCheckVersion) {
             return rrCheckVersion?.status == "update available"
diff --git a/src/src/utils/synoApiProvider.js b/src/src/utils/synoApiProvider.js
index bd0da01..3390489 100644
--- a/src/src/utils/synoApiProvider.js
+++ b/src/src/utils/synoApiProvider.js
@@ -23,7 +23,7 @@ export default
             that = this;
             return new Promise((resolve, reject) => {
                 let params = {
-                    additional: ["maintainer","dsm_app_launch_name", "url", "available_operation", "install_type"],
+                    additional: ["maintainer", "dsm_app_launch_name", "url", "available_operation", "install_type"],
                     ignore_hidden: false,
                 };
                 let args = {
@@ -50,10 +50,10 @@ export default
                 let args = {
                     api: 'SYNO.Core.TaskScheduler',
                     method: 'list',
-                    version: 3,
+                    version: 2,
                     params: params,
-                    callback: function (success, message) {
-                        success ? resolve(message) : reject('Unable to get packages!');
+                    callback: function (success, response) {
+                        success ? resolve(response) : reject(`Unable to get DSM task list!, success: ${success}, code: ${response.code}`);
                     }
                 };
                 that.sendWebAPI(args);