emit event to one application

[src/libhomescreen.git] / src / libhomescreen.cpp

diff --git a/src/libhomescreen.cpp b/src/libhomescreen.cpp
index 66fd259..c3e76ba 100644 (file)
--- a/src/libhomescreen.cpp
+++ b/src/libhomescreen.cpp
@@ -175,7 +175,7 @@ int LibHomeScreen::initialize_websocket()
 
        /* Initialize interface from websocket */
        minterface.on_hangup = _on_hangup_static;
-       minterface.on_call = _on_call_static; /* Is this necessary? */
+       minterface.on_call = _on_call_static;
        minterface.on_event = _on_event_static;
        muri += "ws://localhost:" + to_string(mport) + "/api?token=" + mtoken; /*To be modified*/
        sp_websock = afb_ws_client_connect_wsj1(mploop, muri.c_str(), &minterface, this);
@@ -280,6 +280,10 @@ int LibHomeScreen::onScreenReply(const char* reply_message)
  *
  * #### Return
  * Nothing
+ *
+ * #### Note
+ * Don't release json_object by json_object_put in handler_func.
+ * The resource is released by libafbwsc library.
  */
 void LibHomeScreen::set_event_handler(enum EventType et, handler_func f)
 {
@@ -455,7 +459,11 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m
        }
 
        struct json_object* ev_contents = afb_wsj1_msg_object_j(msg);
-       struct json_object *json_data = json_object_object_get(ev_contents, "data");
+       struct json_object *json_data;
+       if(!json_object_object_get_ex(ev_contents, "data", &json_data)) {
+               HMI_ERROR("libhomescreen", "got ev_contents error.");
+               return;
+       }
 
        if(onEvent != nullptr)
        {
@@ -463,31 +471,34 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m
                onEvent(ev, ev_contents);
        }
 
-       const char* event_only = strchr(event, '/');
-       if (event_only != nullptr) {
-               event_only = event_only + 1;
+       const char* event_type = nullptr;
+       struct json_object *json_event_type;
+       if(json_object_object_get_ex(json_data, "type", &json_event_type)) {
+               event_type = json_object_get_string(json_event_type);
+       }
+       else {
+               HMI_WARNING("libhomescreen","event_type is null.");
+               return;
        }
 
-       if (strcasecmp(event_only, LibHomeScreen::event_list[0].c_str()) == 0) {
+       if (strcasecmp(event_type, LibHomeScreen::event_list[0].c_str()) == 0) {
                auto i = this->handlers.find(Event_TapShortcut);
                if ( i != this->handlers.end() ) {
                        i->second(json_data);
                }
        }
-       else if (strcasecmp(event_only, LibHomeScreen::event_list[1].c_str()) == 0) {
+       else if (strcasecmp(event_type, LibHomeScreen::event_list[1].c_str()) == 0) {
                auto i = this->handlers.find(Event_OnScreenMessage);
                if ( i != this->handlers.end() ) {
                        i->second(json_data);
                }
        }
-       else if (strcasecmp(event_only, LibHomeScreen::event_list[2].c_str()) == 0) {
+       else if (strcasecmp(event_type, LibHomeScreen::event_list[2].c_str()) == 0) {
                auto i = this->handlers.find(Event_OnScreenReply);
                if ( i != this->handlers.end() ) {
                        i->second(json_data);
                }
        }
-
-       json_object_put(ev_contents);
 }
 
 /**
@@ -501,8 +512,6 @@ void LibHomeScreen::on_reply(void *closure, struct afb_wsj1_msg *msg)
        {
                struct json_object* reply = afb_wsj1_msg_object_j(msg);
                onReply(reply);
-
-               json_object_put(reply);
        }
 }