summaryrefslogtreecommitdiff
path: root/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc
diff options
context:
space:
mode:
authorcollin <collin+i@collinmcqueen.com>2021-08-12 14:25:51 -0400
committercollin <collin+i@collinmcqueen.com>2021-08-12 14:25:51 -0400
commit036b1851c93bb89375e82786e4a7bd1b3848b89c (patch)
treeff16df6099307faa9ae7a0ef595e0af0c2ab4d9a /src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc
parent253280549e45ed726cce9246682fe09263ef5525 (diff)
downloadsdl_core-036b1851c93bb89375e82786e4a7bd1b3848b89c.tar.gz
Squashed commit of the following:
commit ce9fc4455093d4914dfec55a6e5003da3c28fc83 Author: Andrii Kalinich <AKalinich@luxoft.com> Date: Thu Aug 5 18:50:33 2021 -0400 Update CUSTOM_BUTTON logic commit 237562b555dc78322f6c6dd5b9c83ded0226998d Author: Andrii Kalinich <AKalinich@luxoft.com> Date: Thu Aug 5 09:10:59 2021 -0400 fixup! Address Livio comments commit 16142947000f2ed54279306468a6c4cb1594805f Author: Andrii Kalinich <AKalinich@luxoft.com> Date: Wed Aug 4 17:17:17 2021 -0400 Address Livio comments commit daa1060833441f38a7219d8a852c6d44e852e76e Author: Andrii Kalinich <AKalinich@luxoft.com> Date: Tue Jul 27 20:15:06 2021 -0400 Address Livio comments commit a327f0694db958a1925b6526e8d25ce9c86bd735 Author: Olha Vorobiova <olha.vorobiova@dxc.com> Date: Tue Jul 20 16:40:27 2021 +0300 Add unit tests for subscribe and unsubscribe button commit dce94e5d84698f5d85bddbc8b5324518d4c1f9f4 Merge: f78f0c82ea 82703c98bb Author: Andrii Kalinich (GitHub) <AKalinich@luxoft.com> Date: Fri Jul 16 19:12:45 2021 -0400 Merge pull request #206 from LuxoftSDL/impl/sdl_0192_fix_resumption_of_button_subscriptions Separate subscription processing logic for mobile requests and resumption commit 82703c98bb2b68c11bfc642bc976d7b29be416c8 Author: Andrii Kalinich <AKalinich@luxoft.com> Date: Fri Jul 16 15:07:15 2021 -0400 Return on_event() back to HMI subscription request commit f78f0c82ea495376298dae5efda25dde05a7ec7b Merge: 94c770b314 e7e1ebf3ce Author: Andrii Kalinich (GitHub) <AKalinich@luxoft.com> Date: Fri Jul 16 19:00:15 2021 -0400 Merge pull request #205 from LuxoftSDL/fix/sdl_0192_fix_custom_button_subscription_logic Fix CUSTOM_BUTTON subscription logic commit e7e1ebf3ce7b49139f3ddfb77046a642d049294e Author: Andrii Kalinich <AKalinich@luxoft.com> Date: Fri Jul 16 13:02:46 2021 -0400 Fix affected unit tests commit d156a9f0067a61b32323b1e0eae680e488780045 Author: Yana Chernysheva <ychernysheva@luxoft.com> Date: Fri Jul 16 16:09:27 2021 +0300 Separate subscription processing for mobile requests and resumption commit 9e461d05d2843dedb4a3e3945d907d6e8a376311 Author: Andrii Kalinich <AKalinich@luxoft.com> Date: Fri Jul 16 01:31:05 2021 -0400 Fix CUSTOM_BUTTON subscription logic Was removed subscription to custom button by default. Also, added check if app is actually subscribed to CUSTOM_BUTTON like for all other buttons. commit 94c770b314659a33555d81bd47e4c76325c322eb Author: Yana Chernysheva <ychernysheva@luxoft.com> Date: Wed Jul 14 15:32:40 2021 +0300 Revert expired button requests if response was received after timeout commit de6c7aac0650d6ac823cd3e6cc0ff4ff9d96eef9 Merge: 0343ea4e9f eaec9b47a5 Author: Yana Chernysheva <ychernysheva@luxoft.com> Date: Thu Jul 15 15:23:10 2021 +0300 Merge branch 'develop' into feature/sdl_0192_button_subscription_response_from_hmi commit 0343ea4e9f2ef844aa096f76b85719f66eb6db36 Author: Yana Chernysheva <ychernysheva@luxoft.com> Date: Mon Jul 5 14:46:21 2021 +0300 Add shared base class for mobile button notifications commit 3d7d670476634bf687271dd5a5ebc95b907cab05 Author: Yana Chernysheva <ychernysheva@luxoft.com> Date: Fri Jul 9 16:13:21 2021 +0300 Unify approach to result codes processing commit e5dfa88fbddd3ec71c05e3e49f68379470e24233 Author: Yana Chernysheva <ychernysheva@luxoft.com> Date: Thu Jul 8 11:40:13 2021 +0300 Remove OnButtonSubscription notification commit 06dc97859063cfc8a654365db3396a8752cb4f9b Author: Yana Chernysheva <ychernysheva@luxoft.com> Date: Wed Jul 7 13:39:12 2021 +0300 Resume button subscriptions commit 4cf9954b46c0496356200ce0d2c4a96ace5e0b6d Author: Vadym Luchko (GitHub) <76956836+VadymLuchko@users.noreply.github.com> Date: Fri Jul 9 14:09:43 2021 +0300 unsubscribe buttons implementation (#197) commit 13045471a9de73b8a37d081efbbe31b1552aa159 Author: Yana Chernysheva <ychernysheva@luxoft.com> Date: Wed Jun 30 17:16:30 2021 +0300 Add SubscribeButtonRequest and SubscribeButtonResponse classes
Diffstat (limited to 'src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc')
-rw-r--r--src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc
index 989c606085..25f389abd0 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc
@@ -240,8 +240,8 @@ void ASGetAppServiceDataRequestFromHMI::on_event(
hmi_apis::Common_Result::eType result =
static_cast<hmi_apis::Common_Result::eType>(
event_message[strings::params][hmi_response::code].asInt());
- bool success =
- IsHMIResultSuccess(result, HmiInterfaces::HMI_INTERFACE_AppService);
+ bool success = CommandImpl::IsHMIResultSuccess(
+ result, HmiInterfaces::HMI_INTERFACE_AppService);
if (ValidateResponse(msg_params)) {
SendResponse(success,
correlation_id(),
@@ -263,7 +263,8 @@ void ASGetAppServiceDataRequestFromHMI::on_event(
msg_params[strings::result_code].asInt());
hmi_apis::Common_Result::eType result =
MessageHelper::MobileToHMIResult(mobile_result);
- bool success = IsMobileResultSuccess(mobile_result);
+ bool success =
+ application_manager::commands::IsMobileResultSuccess(mobile_result);
if (ValidateResponse(msg_params)) {
SendResponse(success,