homescreen/hs-proxy: Guard against empty appids

[apps/agl-service-homescreen.git] / src / homescreen.cpp

diff --git a/src/homescreen.cpp b/src/homescreen.cpp
index b11663b..49850be 100644 (file)
--- a/src/homescreen.cpp
+++ b/src/homescreen.cpp
@@ -17,12 +17,8 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include <memory>
-#include <algorithm>
-#include "hs-helper.h"
-#include "hs-clientmanager.h"
-#include "hs-appinfo.h"
 
+#include "homescreen.h"
 
 const char _error[] = "error";
 const char _application_id[] = "application_id";
@@ -31,14 +27,6 @@ const char _reply_message[] = "reply_message";
 const char _keyData[] = "data";
 const char _keyId[] = "id";
 
-struct hs_instance {
-  HS_ClientManager *client_manager;   // the connection session manager
-  HS_AppInfo *app_info;               // application info
-
-  hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()) {}
-  int init(afb_api_t api);
-};
-
 /**
  * init function
  *
@@ -67,8 +55,80 @@ int hs_instance::init(afb_api_t api)
     return 0;
 }
 
+/**
+ * set event hook
+ *
+ * #### Parameters
+ *  - event  : event name
+ *  - f : hook function
+ *
+ * #### Return
+ * Nothing
+ */
+void hs_instance::setEventHook(const char *event, const event_hook_func f)
+{
+    if(event == nullptr || f == nullptr) {
+        AFB_WARNING("argument is null.");
+        return;
+    }
+
+    std::string ev(event);
+    auto it = event_hook_list.find(ev);
+    if(it != event_hook_list.end()) {
+        it->second.push_back(f);
+    }
+    else {
+        std::list<event_hook_func> l;
+        l.push_back(f);
+        event_hook_list[ev] = std::move(l);
+    }
+}
+
+/**
+ * onEvent function
+ *
+ * #### Parameters
+ *  - api : the api serving the request
+ *  - event  : event name
+ *  - object : event json object
+ *
+ * #### Return
+ * Nothing
+ */
+void hs_instance::onEvent(afb_api_t api, const char *event, struct json_object *object)
+{
+    std::string ev(event);
+    auto it = event_hook_list.find(ev);
+    if(it != event_hook_list.end()) {
+        for(auto &ref : it->second) {
+            if(ref(api, event, object))
+                break;
+        }
+    }
+}
+
 static struct hs_instance *g_hs_instance;
 
+/**
+ * set event hook
+ *
+ * #### Parameters
+ *  - event  : event name
+ *  - f : hook function pointer
+ *
+ * #### Return
+ * Nothing
+ */
+void setEventHook(const char *event, const event_hook_func f)
+{
+    if(g_hs_instance == nullptr) {
+        AFB_ERROR("g_hs_instance is null.");
+        return;
+    }
+
+    g_hs_instance->setEventHook(event, f);
+}
+
 /*
 ********** Method of HomeScreen Service (API) **********
 */
@@ -102,9 +162,13 @@ static void tap_shortcut (afb_req_t request)
         ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
         if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
             std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
-            HS_AfmMainProxy afm_proxy;
-            afm_proxy.start(request, id);
-            ret = 0;
+           if (!id.empty()) {
+                   HS_AfmMainProxy afm_proxy;
+                   afm_proxy.start(g_hs_instance, request, id);
+                   ret = 0;
+           } else {
+                   ret = AFB_EVENT_BAD_REQUEST;
+           }
         }
     }
     else {
@@ -254,9 +318,13 @@ static void showWindow(afb_req_t request)
         ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
         if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
             std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
-            HS_AfmMainProxy afm_proxy;
-            afm_proxy.start(request, id);
-            ret = 0;
+           if (!id.empty()) {
+                   HS_AfmMainProxy afm_proxy;
+                   afm_proxy.start(g_hs_instance, request, id);
+                   ret = 0;
+           } else {
+                   ret = AFB_EVENT_BAD_REQUEST;
+           }
         }
     }
     else {
@@ -444,6 +512,7 @@ static const afb_verb_t verbs[]= {
  */
 static int preinit(afb_api_t api)
 {
+   (void)  api;
    AFB_DEBUG("binding preinit (was register)");
    return 0;
 }
@@ -491,8 +560,8 @@ static int init(afb_api_t api)
  */
 static void onevent(afb_api_t api, const char *event, struct json_object *object)
 {
-    AFB_DEBUG("on_event %s", event);
-    g_hs_instance->app_info->onEvent(api, event, object);
+    AFB_INFO("on_event %s", event);
+    g_hs_instance->onEvent(api, event, object);
 }
 
 const afb_binding_t afbBindingExport = {