X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhs-client.cpp;h=185b4233e353485a2f09b82aebe73a4de726c22b;hb=refs%2Fheads%2Fjellyfish;hp=792825b38cd32a99addd0a2c33ab8e1d65c2c9ef;hpb=496e9aa2539afbe922d6df9f3da1b0384b1b1351;p=apps%2Fagl-service-homescreen.git

diff --git a/src/hs-client.cpp b/src/hs-client.cpp
index 792825b..185b423 100644
--- a/src/hs-client.cpp
+++ b/src/hs-client.cpp
@@ -235,8 +235,6 @@ int HS_Client::showWindow(afb_req_t request)
 {
     AFB_INFO("%s application_id = %s.", __FUNCTION__, my_id.c_str());
     int ret = 0;
-    struct json_object* push_obj = json_object_new_object();
-    hs_add_object_to_json_object_str( push_obj, 4, _application_id, my_id.c_str(), _type, __FUNCTION__);
     const char* param = afb_req_value(request, _parameter);
     if(param) {
         std::string req_appid = std::move(get_application_id(request));
@@ -245,6 +243,8 @@ int HS_Client::showWindow(afb_req_t request)
             return AFB_REQ_GETAPPLICATIONID_ERROR;
         }
 
+        struct json_object* push_obj = json_object_new_object();
+        hs_add_object_to_json_object_str( push_obj, 4, _application_id, my_id.c_str(), _type, __FUNCTION__);
         struct json_object* param_obj = json_tokener_parse(param);
         json_object_object_add(param_obj, _replyto, json_object_new_string(req_appid.c_str()));
         json_object_object_add(push_obj, _parameter, param_obj);
@@ -301,10 +301,10 @@ int HS_Client::replyShowWindow(afb_req_t request)
 {
     AFB_INFO("%s application_id = %s.", __FUNCTION__, my_id.c_str());
     int ret = 0;
-    struct json_object* push_obj = json_object_new_object();
-    hs_add_object_to_json_object_str( push_obj, 4, _application_id, my_id.c_str(), _type, __FUNCTION__);
     const char* param = afb_req_value(request, _parameter);
     if(param) {
+        struct json_object* push_obj = json_object_new_object();
+        hs_add_object_to_json_object_str( push_obj, 4, _application_id, my_id.c_str(), _type, __FUNCTION__);
         json_object_object_add(push_obj, _parameter, json_tokener_parse(param));
         afb_event_push(my_event, push_obj);
     }
@@ -338,9 +338,9 @@ int HS_Client::showNotification(afb_req_t request)
             return AFB_REQ_GETAPPLICATIONID_ERROR;
         }
 
-        struct json_object* param_obj = json_object_new_object();
         const char *icon = afb_req_value(request, _icon);
         if(icon) {
+            struct json_object* param_obj = json_object_new_object();
             json_object_object_add(param_obj, _icon, json_object_new_string(icon));
             json_object_object_add(param_obj, _text, json_object_new_string(value));
             json_object_object_add(param_obj, _caller, json_object_new_string(appid.c_str()));
@@ -490,4 +490,4 @@ int HS_Client::pushEvent(const char *event, struct json_object *param)
         json_object_object_add(push_obj, _parameter, param);
     afb_event_push(my_event, push_obj);
     return 0;
-}
\ No newline at end of file
+}