APPLINK-7849: fixes for SDL.ActivateApp implementation on QT_HMI

2 files changed, 28 insertions, 28 deletions

diff --git a/src/components/qt_hmi/qml_model_qt5/models/SettingsStorage.qml b/src/components/qt_hmi/qml_model_qt5/models/SettingsStorage.qml
index 0dfc603562..88101ad2b5 100644
--- a/src/components/qt_hmi/qml_model_qt5/models/SettingsStorage.qml
+++ b/src/components/qt_hmi/qml_model_qt5/models/SettingsStorage.qml
@@ -232,46 +232,46 @@ Item
 
         console.debug("SDL.ActivateApp Request enter", appId);
 
-        RequestToSDL.SDL_ActivateApp(appId, function(params){
-            settingsContainer.activateApp_Response(appId, params)
+        RequestToSDL.SDL_ActivateApp(appId, function(isSDLAllowed, device, isPermissionsConsentNeeded, isAppPermissionsRevoked, appRevokedPermissions, isAppRevoked, priority){
+            settingsContainer.activateApp_Response(appId, isSDLAllowed, device, isPermissionsConsentNeeded, isAppPermissionsRevoked, appRevokedPermissions, isAppRevoked, priority)
         })
 
         console.debug("SDL.ActivateApp Request exit");
     }
 
-    function activateApp_Response (appId, params) {
+    function activateApp_Response (appId, isSDLAllowed, device, isPermissionsConsentNeeded, isAppPermissionsRevoked, appRevokedPermissions, isAppRevoked, priority) {
 
         console.debug("activateApp_Response enter", appId);
 
-        if (!params.isSDLAllowed) {
+        if (!isSDLAllowed) {
 
             userActionPopUp.activate("Allow SDL Functionality request",
-                                        "Would you like to allow SDL functionality for device '" + params.device.name + "'?",
+                                        "Would you like to allow SDL functionality for device '" + device.name + "'?",
                                         function(result){
-                                            allowSDLFunctionality(result, params.device)
+                                            allowSDLFunctionality(result, device)
                                         },
                                         true
                                     )
         }
 
-        if (params.isPermissionsConsentNeeded) {
-            RequestToSDL.SDL_GetListOfPermissions(appId, function(params){
-                settingsContainer.getListOfPermissions_Response(appId, params)
+        if (isPermissionsConsentNeeded) {
+            RequestToSDL.SDL_GetListOfPermissions(appId, function(allowedFunctions){
+                settingsContainer.getListOfPermissions_Response(appId, allowedFunctions)
             })
         }
 
-        if (params.isAppPermissionsRevoked) {
+        if (isAppPermissionsRevoked) {
 
-            appPermissionsRevoked(appId, params.appRevokedPermissions, "AppPermissionsRevoked")
+            appPermissionsRevoked(appId, appRevokedPermissions, "AppPermissionsRevoked")
         }
 
-        if (params.isAppRevoked) {
+        if (isAppRevoked) {
 
 
-            RequestToSDL.SDL_GetUserFriendlyMessage(["AppUnsupported"], dataContainer.hmiUILanguage, function(params){
-                settingsContainer.getUserFriendlyMessageAppPermissionsRevoked("AppUnsupported", params)
+            RequestToSDL.SDL_GetUserFriendlyMessage(["AppUnsupported"], dataContainer.hmiUILanguage, function(messages){
+                settingsContainer.getUserFriendlyMessageAppPermissionsRevoked("AppUnsupported", messages)
             });
-        } else if (params.isSDLAllowed && !params.isPermissionsConsentNeeded) {
+        } else if (isSDLAllowed && !isPermissionsConsentNeeded) {
             dataContainer.setCurrentApplication(appId)
             contentLoader.go(
                 Internal.chooseAppStartScreen(
@@ -301,8 +301,8 @@ Item
             messageCodes.push(x.name);
         });
 
-        RequestToSDL.SDL_GetUserFriendlyMessage(messageCodes, dataContainer.hmiUILanguage, function(params){
-            settingsContainer.onAppPermissionConsent_Notification(appId, params)
+        RequestToSDL.SDL_GetUserFriendlyMessage(messageCodes, dataContainer.hmiUILanguage, function(messages){
+            settingsContainer.onAppPermissionConsent_Notification(appId, messages)
         });
 
         console.log("getListOfPermissions_Response exit");
@@ -318,16 +318,16 @@ Item
 
         messageCodes.push("AppPermissionsRevoked");
 
-        RequestToSDL.SDL_GetUserFriendlyMessage(messageCodes, dataContainer.hmiUILanguage, function(params){
-            settingsContainer.getUserFriendlyMessageAppPermissionsRevoked(title, params)
+        RequestToSDL.SDL_GetUserFriendlyMessage(messageCodes, dataContainer.hmiUILanguage, function(messages){
+            settingsContainer.getUserFriendlyMessageAppPermissionsRevoked(title, messages)
         });
     }
 
-    function getUserFriendlyMessageAppPermissionsRevoked (title, message) {
+    function getUserFriendlyMessageAppPermissionsRevoked (title, messages) {
         var tts = "",
             text = "";
 
-        message.forEach(function (x) {
+        messages.forEach(function (x) {
             if (x.tts) {
                 tts += x.tts;
             }
@@ -344,22 +344,22 @@ Item
 
     }
 
-    function onAppPermissionConsent_Notification (appId, params) {
+    function onAppPermissionConsent_Notification (appId, messages) {
         console.log("onAppPermissionConsent_Notification enter");
 
         onAppPermissionConsentPopUp.permissionItems.clear()
 
         var tts = "";
 
-        for (var i = 0; i < params.length; i++) {
+        for (var i = 0; i < messages.length; i++) {
             onAppPermissionConsentPopUp.permissionItems.append({
-                                 "messageCode": params[i].messageCode,
-                                 "label": params[i].label,
-                                 "textBody": params[i].textBody,
+                                 "messageCode": messages[i].messageCode,
+                                 "label": messages[i].label,
+                                 "textBody": messages[i].textBody,
                                  "allowed": false
                              });
 
-            if (params[i].tts) {
+            if (messages[i].tts) {
                 tts += x.tts;
             }
         }
diff --git a/src/components/qt_hmi/qml_model_qt5/popups/UserActionPopUp.qml b/src/components/qt_hmi/qml_model_qt5/popups/UserActionPopUp.qml
index c3abc9a42c..d49c212297 100644
--- a/src/components/qt_hmi/qml_model_qt5/popups/UserActionPopUp.qml
+++ b/src/components/qt_hmi/qml_model_qt5/popups/UserActionPopUp.qml
@@ -167,7 +167,7 @@ Item {
             callbackFunc(result);
             callbackFunc = null;
         }
-        okButton.visible = fasle
+        okButton.visible = false
         cancelButton.visible = false
         closeButton.visible = false
         console.debug("userActionPopUp deactivate exit");