Revert "Use appid between homescreen-service and apps"

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

diff --git a/src/libhomescreen.cpp b/src/libhomescreen.cpp
index 2f3ef44..0462d4d 100644 (file)
--- a/src/libhomescreen.cpp
+++ b/src/libhomescreen.cpp
@@ -38,6 +38,7 @@ const std::vector<std::string> LibHomeScreen::api_list {
        std::string("ping"), // debug do not use
        std::string("tap_shortcut"), // HomeScreen Application only
        std::string("on_screen_message"),
+       std::string("on_screen_reply"),
        std::string("subscribe"),
        std::string("unsubscribe")
 };
@@ -45,6 +46,7 @@ const std::vector<std::string> LibHomeScreen::api_list {
 const std::vector<std::string> LibHomeScreen::event_list {
        std::string("tap_shortcut"),
        std::string("on_screen_message"),
+       std::string("on_screen_reply"),
        std::string("none")
 };
 
@@ -173,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);
@@ -243,6 +245,30 @@ int LibHomeScreen::onScreenMessage(const char* display_message)
        return this->call("on_screen_message", j_obj);
 }
 
+/**
+ * Sending onScreen reply event
+ *
+ * Sending OnScreen reply event to applications from HomeScreen
+ *
+ * #### Parameters
+ * - reply_message [in] : message for reply
+ *
+ * #### Return
+ * - Returns 0 on success or -1 in case of error.
+ */
+int LibHomeScreen::onScreenReply(const char* reply_message)
+{
+       if(!sp_websock)
+       {
+               return -1;
+       }
+
+       struct json_object* j_obj = json_object_new_object();
+       struct json_object* val = json_object_new_string(reply_message);
+       json_object_object_add(j_obj, "reply_message", val);
+       return this->call("on_screen_reply", j_obj);
+}
+
 /**
  * Setting Event Handler
  *
@@ -254,10 +280,14 @@ int LibHomeScreen::onScreenMessage(const char* display_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)
 {
-       if (et >= 1 && et <= 2) {
+       if (et >= 1 && et <= 3) {
                switch (et) {
                        case Event_TapShortcut:
                                this->subscribe(LibHomeScreen::event_list[0]);
@@ -265,6 +295,9 @@ void LibHomeScreen::set_event_handler(enum EventType et, handler_func f)
                        case Event_OnScreenMessage:
                                this->subscribe(LibHomeScreen::event_list[1]);
                                break;
+                       case Event_OnScreenReply:
+                               this->subscribe(LibHomeScreen::event_list[2]);
+                               break;
                }
 
                this->handlers[et] = std::move(f);
@@ -437,6 +470,9 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m
        const char* event_only = strchr(event, '/');
        if (event_only != nullptr) {
                event_only = event_only + 1;
+       }else{
+               HMI_WARNING("libhomescreen","event_only is null.");
+               return;
        }
 
        if (strcasecmp(event_only, LibHomeScreen::event_list[0].c_str()) == 0) {
@@ -451,8 +487,12 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m
                        i->second(json_data);
                }
        }
-
-       json_object_put(ev_contents);
+       else if (strcasecmp(event_only, LibHomeScreen::event_list[2].c_str()) == 0) {
+               auto i = this->handlers.find(Event_OnScreenReply);
+               if ( i != this->handlers.end() ) {
+                       i->second(json_data);
+               }
+       }
 }
 
 /**
@@ -466,8 +506,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);
        }
 }