summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2019-11-22 11:04:46 -0500
committerjacobkeeler <jacob.keeler@livioradio.com>2019-11-22 11:04:46 -0500
commitcd5189a9e628eb302940f858ca585ad6d0c62691 (patch)
treeb34764f2b58203cda7375c0cd2dfbf598f29de5b
parent1633fa7c9cfaf4b4d91dc09c37ea1e8f7a16e234 (diff)
downloadsdl_core-cd5189a9e628eb302940f858ca585ad6d0c62691.tar.gz
Break up long condition
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
index 30f5b0d8de..c2f4418b66 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
@@ -350,14 +350,14 @@ void RegisterAppInterfaceRequest::Run() {
}
}
- bool is_preferred_application =
- (!mobile_app_exists ||
- (!is_cloud_app &&
- preference == mobile_apis::HybridAppPreference::MOBILE)) ||
- (!cloud_app_exists ||
- (is_cloud_app &&
- preference == mobile_apis::HybridAppPreference::CLOUD));
- if (!is_preferred_application) {
+ bool mobile_app_matches =
+ !is_cloud_app &&
+ preference == mobile_apis::HybridAppPreference::MOBILE;
+ bool cloud_app_matches =
+ is_cloud_app && preference == mobile_apis::HybridAppPreference::CLOUD;
+
+ bool is_preferred_application = mobile_app_matches || cloud_app_matches;
+ if (mobile_app_exists && cloud_app_exists && !is_preferred_application) {
SendResponse(false,
mobile_apis::Result::USER_DISALLOWED,
"App is disabled by user preferences");