From feb2b5e0200b0182478e1c87be994de741885fbe Mon Sep 17 00:00:00 2001
From: Andrew Melnik <AMelnik@luxoft.com>
Date: Tue, 25 Mar 2014 17:31:45 +0200
Subject: APPLINK-5714: fix on HMI side, manualTextEntry parameter send in
 response on PerformInteraction request

---
 src/components/HMI/app/model/sdl/Model.js                        | 2 +-
 src/components/HMI/app/view/sdl/shared/interactionChoicesView.js | 2 --
 src/components/HMI/app/view/sdl/shared/keyboard.js               | 1 +
 src/components/HMI/ffw/UIRPC.js                                  | 2 +-
 src/components/interfaces/HMI_API.xml                            | 2 --
 src/components/interfaces/QT_HMI_API.xml                         | 2 --
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/HMI/app/model/sdl/Model.js b/src/components/HMI/app/model/sdl/Model.js
index eac343f01..1891178a2 100644
--- a/src/components/HMI/app/model/sdl/Model.js
+++ b/src/components/HMI/app/model/sdl/Model.js
@@ -910,7 +910,7 @@ SDL.SDLModel = Em.Object.create({
         if (!SDL.SDLController.getApplicationModel(message.params.appID).activeRequests.uiPerformInteraction) {
             SDL.SDLController.getApplicationModel(message.params.appID).activeRequests.uiPerformInteraction = message.id;
         } else {
-            SDL.SDLController.interactionChoiseCloseResponse(message.appID, SDL.SDLModel.resultCode['REJECTED']);
+            SDL.SDLController.interactionChoiseCloseResponse(message.params.appID, SDL.SDLModel.resultCode['REJECTED']);
             return;
         }
 
diff --git a/src/components/HMI/app/view/sdl/shared/interactionChoicesView.js b/src/components/HMI/app/view/sdl/shared/interactionChoicesView.js
index 16ffe89ee..64b9384ff 100644
--- a/src/components/HMI/app/view/sdl/shared/interactionChoicesView.js
+++ b/src/components/HMI/app/view/sdl/shared/interactionChoicesView.js
@@ -252,8 +252,6 @@ SDL.InteractionChoicesView = SDL.SDLAbstractView.create({
         SDL.SDLController.VRMove();
         SDL.Keyboard.deactivate();
 
-
-
         switch (result) {
             case "ABORTED":
             {
diff --git a/src/components/HMI/app/view/sdl/shared/keyboard.js b/src/components/HMI/app/view/sdl/shared/keyboard.js
index b82b7c697..2391c66b2 100644
--- a/src/components/HMI/app/view/sdl/shared/keyboard.js
+++ b/src/components/HMI/app/view/sdl/shared/keyboard.js
@@ -103,6 +103,7 @@ SDL.Keyboard = SDL.SDLAbstractView.create({
                 break;
             }
             case "Search": {
+                this.target.set('value', "");
                 this.target.search();
                 this.deactivate();
                 break;
diff --git a/src/components/HMI/ffw/UIRPC.js b/src/components/HMI/ffw/UIRPC.js
index ad9eb57ca..7a457e01a 100644
--- a/src/components/HMI/ffw/UIRPC.js
+++ b/src/components/HMI/ffw/UIRPC.js
@@ -1246,7 +1246,7 @@ FFW.UI = FFW.RPCObserver.create({
                 JSONMessage.result.choiceID = commandID;
             }
 
-            if (manualTextEntry) {
+            if (manualTextEntry != null) {
                 JSONMessage.result.manualTextEntry = manualTextEntry;
             }
         } else {
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index bb57182c7..12703716c 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -1863,11 +1863,9 @@
           May not interfere with any name or synonym of previously registered applications and any predefined blacklist of words (global commands)
         </description>
       </param>
-
       <param name="resume" type="Boolean" mandatory="false">
         <description>The information about resumption application. </description>
       </param>
-
     </function>
     <function name="OnAppUnregistered" messagetype="notification">
       <description>Issued by SDL to notify HMI about application unregistered. Application then to be removed from application list; all data connected with application has to be cleared up.</description>
diff --git a/src/components/interfaces/QT_HMI_API.xml b/src/components/interfaces/QT_HMI_API.xml
index fedc8ed75..55a6e4e9a 100644
--- a/src/components/interfaces/QT_HMI_API.xml
+++ b/src/components/interfaces/QT_HMI_API.xml
@@ -1870,11 +1870,9 @@
           May not interfere with any name or synonym of previously registered applications and any predefined blacklist of words (global commands)
         </description>
       </param>
-
       <param name="resume" type="Boolean" mandatory="false">
         <description>The information about resumption application. </description>
       </param>
-
     </function>
     <function name="OnAppUnregistered" messagetype="notification">
       <description>Issued by SDL to notify HMI about application unregistered. Application then to be removed from application list; all data connected with application has to be cleared up.</description>
-- 
cgit v1.2.1