Remove app id from IU

- Requirement:
IU module does not need to manage client app ID.

- Solution:
This patch removes app ID parameter from functions and methods of IU
module. Through this patch, IU does not need to manage client app ID.

Change-Id: I6f690129e3c1e5542045822f85fd1052435262b1
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/src/mmimgr/iu/VoiceTouchEngine.cpp b/src/mmimgr/iu/VoiceTouchEngine.cpp
index 615348bd2d06c013761addd2342293d26ce16daf..4aef0634855a8ef77912dc0b8faf160b4c1b80ff 100644 (file)
--- a/src/mmimgr/iu/VoiceTouchEngine.cpp
+++ b/src/mmimgr/iu/VoiceTouchEngine.cpp
@@ -92,7 +92,6 @@ void VoiceTouchEngine::InitializeMembers()
        __outputModalityUserData = nullptr;
 
        __asrResult.clear();
-       __appId.clear();
 
        if (__findCommandTimer != nullptr) {
                ecore_timer_del(__findCommandTimer);
@@ -128,10 +127,9 @@ long VoiceTouchEngine::getCurrentTimestamp()
        return timestamp;
 }
 
-bool VoiceTouchEngine::setInputModalityData(std::string appId, int modalityType, void *data)
+bool VoiceTouchEngine::setInputModalityData(int modalityType, void *data)
 {
-       _I("[VoiceTouchEngine] Set input modality data. appId(%s)", appId.c_str());
-       __appId = appId;
+       _I("[VoiceTouchEngine] Set input modality data");
 
        if (modalityType == MMI_PROVIDER_EVENT_VOICE) {
                _I("[VoiceTouchEngine] Voice modality");
@@ -602,7 +600,7 @@ void VoiceTouchEngine::invokeOutputResultCallback(std::string outputResult)
                return;
        }
 
-       __outputResultCallback(__appId.c_str(), outputResult.c_str(), __outputResultUserData);
+       __outputResultCallback(outputResult.c_str(), __outputResultUserData);
 }
 
 void VoiceTouchEngine::invokeOutputModalityCallback(void* outputModality)
@@ -611,7 +609,7 @@ void VoiceTouchEngine::invokeOutputModalityCallback(void* outputModality)
                return;
        }
 
-       __outputModalityCallback(__appId.c_str(), outputModality, __outputModalityUserData);
+       __outputModalityCallback(outputModality, __outputModalityUserData);
 }
 
 void VoiceTouchEngine::setOutputResultCallback(voice_touch_engine_output_result_cb callback, void *userData)

diff --git a/src/mmimgr/iu/VoiceTouchEngine.h b/src/mmimgr/iu/VoiceTouchEngine.h
index 89131fd1133576ebf567f1c21291a7d488748e7f..d235e9b14d096ef5190f1a3ca67fce4776aea392 100644 (file)
--- a/src/mmimgr/iu/VoiceTouchEngine.h
+++ b/src/mmimgr/iu/VoiceTouchEngine.h
@@ -50,9 +50,9 @@ enum voice_result_type_e {
        VOICE_RESULT_TYPE_PARTIAL
 };
 
-typedef void (*voice_touch_engine_output_result_cb)(const char* app_id, const char* output_result, void *user_data);
+typedef void (*voice_touch_engine_output_result_cb)(const char *output_result, void *user_data);
 
-typedef void (*voice_touch_engine_output_modality_cb)(const char* app_id, void* output_modality, void *user_data);
+typedef void (*voice_touch_engine_output_modality_cb)(void *output_modality, void *user_data);
 
 
 class VoiceTouchEngine {
@@ -63,7 +63,7 @@ public:
        void setDisplayInfo(int width, int height);
        void setGridConfig(int numX, int numY, int step);
 
-       bool setInputModalityData(std::string appId, int modalityType, void *data);
+       bool setInputModalityData(int modalityType, void *data);
        void setOutputResultCallback(voice_touch_engine_output_result_cb callback, void *userData);
        void setOutputModalityCallback(voice_touch_engine_output_modality_cb callback, void *userData);
 
@@ -112,8 +112,6 @@ private:
        int __gridX[__MAXIMUM_GRID_STEP];
        int __gridY[__MAXIMUM_GRID_STEP];
 
-       std::string __appId;
-
        CommandManager __commandManager;
        std::list<ClickableItem> __itemList;
        std::list<ClickableItem> __gridList;

diff --git a/src/mmimgr/iu/mmi_iu.cpp b/src/mmimgr/iu/mmi_iu.cpp
index 6aefac2ceb1cf0a08fca247c6389c5897cda7e9e..9226f9c82bf790cd6da1a6c446d27fc3ec6b559f 100644 (file)
--- a/src/mmimgr/iu/mmi_iu.cpp
+++ b/src/mmimgr/iu/mmi_iu.cpp
@@ -53,24 +53,24 @@ static void init()
     iu_output_modality_user_data = nullptr;
 }
 
-void __mmi_iu_voice_touch_engine_output_result_cb(const char* app_id, const char* output_result, void *user_data)
+void __mmi_iu_voice_touch_engine_output_result_cb(const char *output_result, void *user_data)
 {
     if (iu_output_result_received_callback == nullptr) {
         _E("[MMI IU] Output result callback is not set");
         return;
     }
 
-    iu_output_result_received_callback(app_id, MMI_INPUT_EVENT_TYPE_VOICE_TOUCH, output_result, iu_output_result_user_data);
+    iu_output_result_received_callback(MMI_INPUT_EVENT_TYPE_VOICE_TOUCH, output_result, iu_output_result_user_data);
 }
 
-void __mmi_iu_voice_touch_engine_output_modality_cb(const char* app_id, void* output_modality, void *user_data)
+void __mmi_iu_voice_touch_engine_output_modality_cb(void *output_modality, void *user_data)
 {
     if (iu_output_modality_received_callback == nullptr) {
         _E("[MMI IU] Output result callback is not set");
         return;
     }
 
-    iu_output_modality_received_callback(app_id, MMI_PROVIDER_EVENT_VOICE_TOUCH, output_modality, iu_output_modality_user_data);
+    iu_output_modality_received_callback(MMI_PROVIDER_EVENT_VOICE_TOUCH, output_modality, iu_output_modality_user_data);
 }
 
 EXPORT_API int mmi_iu_init()
@@ -107,9 +107,9 @@ EXPORT_API int mmi_iu_shutdown()
     return MMI_IU_ERROR_NONE;
 }
 
-EXPORT_API int mmi_iu_feed_input_modality(const char *app_id, int type, void *event)
+EXPORT_API int mmi_iu_feed_input_modality(int type, void *event)
 {
-    if (!app_id || !event) {
+    if (!event) {
         _W("[ERROR] Invalid parameter");
         return MMI_IU_ERROR_INVALID_PARAMETER;
     }
@@ -121,7 +121,7 @@ EXPORT_API int mmi_iu_feed_input_modality(const char *app_id, int type, void *ev
 
     string json_output_result;
     if (g_VoiceTouchEngine) {
-        g_VoiceTouchEngine->setInputModalityData(app_id, type, event);
+        g_VoiceTouchEngine->setInputModalityData(type, event);
     }
 
     _I("app state: %d\n", g_app_state);

diff --git a/src/mmimgr/iu/mmi_iu.h b/src/mmimgr/iu/mmi_iu.h
index 8bbc1ae36afc327a47669b4ce0f110ed2fb91fb1..b73a15d988804c76e75cbfe38341f468e53cc8b8 100644 (file)
--- a/src/mmimgr/iu/mmi_iu.h
+++ b/src/mmimgr/iu/mmi_iu.h
@@ -47,9 +47,9 @@ extern "C" {
  * @param[in] json_data The output intent data with json format
  * @param[in] user_data The user data passed from the callback function
  */
-typedef void (*mmi_iu_output_result_received_cb)(const char *target_app_id, int type, const char *json_data, void *user_data);
+typedef void (*mmi_iu_output_result_received_cb)(int type, const char *json_data, void *user_data);
 
-typedef void (*mmi_iu_output_modality_received_cb)(const char *target_app_id, int type, void *event, void *user_data);
+typedef void (*mmi_iu_output_modality_received_cb)(int type, void *event, void *user_data);
 
 /**
  * @brief Initialize Intent Understanding library
@@ -72,7 +72,7 @@ int mmi_iu_shutdown();
  * @param[in] type The input event type (key, voice, gesture, ..)
  * @param[in] event The event information
  */
-int mmi_iu_feed_input_modality(const char *app_id, int type, void *event);
+int mmi_iu_feed_input_modality(int type, void *event);
 
 /**
  * @brief Register the callback function to receive output intent

diff --git a/src/mmimgr/mmi-core.c b/src/mmimgr/mmi-core.c
index 3e489aa05b836d966e1f78731d6201389de1e3df..07942ee5adec315fa7ff5b7320a76a6ac314f18a 100644 (file)
--- a/src/mmimgr/mmi-core.c
+++ b/src/mmimgr/mmi-core.c
@@ -32,8 +32,6 @@
 #include "output_modality/mmi_output_modality.h"
 #include "mmi-core.h"
 
-#define APP_ID "org.tizen.voice-touch"
-
 enum event_handlers {
        EVENT_HANDLER_FOCUS_CHANGE,
        EVENT_HANDLER_STATE_CHANGE,
@@ -152,7 +150,7 @@ static Eina_Bool __key_event_cb(void *data EINA_UNUSED, int type, void *event)
        _I("[key event] code : %d, name : %s, type : %d, timestamp : %d, source: %s", ev->keycode, ev->keyname, ev->type, ev->timestamp, ev->source);
 
        if (ev->key_down) {
-               mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_KEY, ev);
+               mmi_iu_feed_input_modality(MMI_PROVIDER_EVENT_KEY, ev);
        }
 
        return ECORE_CALLBACK_PASS_ON;
@@ -163,7 +161,7 @@ static Eina_Bool __gesture_event_cb(void *data EINA_UNUSED, int type, void *even
        mmi_provider_event_gesture *ev = (mmi_provider_event_gesture *)event;
        _I("[gesture event] type : %d, timestamp : %d", ev->type, ev->timestamp);
 
-       mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_GESTURE, ev);
+       mmi_iu_feed_input_modality(MMI_PROVIDER_EVENT_GESTURE, ev);
 
        return ECORE_CALLBACK_PASS_ON;
 }
@@ -173,7 +171,7 @@ static Eina_Bool __voice_event_cb(void *data EINA_UNUSED, int type, void *event)
        mmi_provider_event_voice *ev = (mmi_provider_event_voice *)event;
        _I("[voice event] type : %d, timestamp : %d", ev->type, ev->timestamp);
 
-       mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_VOICE, ev);
+       mmi_iu_feed_input_modality(MMI_PROVIDER_EVENT_VOICE, ev);
 
        return ECORE_CALLBACK_PASS_ON;
 }
@@ -182,7 +180,7 @@ static Eina_Bool __vision_event_cb(void *data EINA_UNUSED, int type, void *event
 {
        mmi_provider_event_vision *ev = (mmi_provider_event_vision *)event;
 
-       mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_VISION, ev);
+       mmi_iu_feed_input_modality(MMI_PROVIDER_EVENT_VISION, ev);
 
        return ECORE_CALLBACK_PASS_ON;
 }
@@ -192,7 +190,7 @@ static Eina_Bool __screen_analyzer_event_cb(void *data EINA_UNUSED, int type, vo
        mmi_provider_event_screen_analyzer *ev = (mmi_provider_event_screen_analyzer *)event;
        _I("[Screen analyzer] Number of items : %d, type : %d, timestamp : %d", ev->n_items, ev->type, ev->timestamp);
 
-       mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_SCREEN_ANALYZER, ev);
+       mmi_iu_feed_input_modality(MMI_PROVIDER_EVENT_SCREEN_ANALYZER, ev);
 
        return ECORE_CALLBACK_PASS_ON;
 }

diff --git a/tests/iu/mmi_iu_feed_input_event_unittests.cpp b/tests/iu/mmi_iu_feed_input_event_unittests.cpp
index 7d0dbbefb4998432cff3be9cd11c45d3f14d311f..6ee38e2a7416fcce5985f6b0b958711b8c2172d2 100644 (file)
--- a/tests/iu/mmi_iu_feed_input_event_unittests.cpp
+++ b/tests/iu/mmi_iu_feed_input_event_unittests.cpp
@@ -47,7 +47,7 @@ static void *g_received_event_data = NULL;
 
 namespace {
 
-static void output_intent_received_cb(const char *app_id, int type, const char *json_data, void *user_data)
+static void output_intent_received_cb(int type, const char *json_data, void *user_data)
 {
     JsonParser *parser = json_parser_new();
     GError *err_msg = NULL;
@@ -85,7 +85,7 @@ cleanup:
         g_object_unref(parser);
 }
 
-static void output_event_received_cb(const char *app_id, int type, void *event, void *user_data)
+static void output_event_received_cb(int type, void *event, void *user_data)
 {
     g_received_event_type = type;
     g_received_event_data = event;
@@ -136,7 +136,7 @@ int feed_input_event_test(mmi_state app_state, int type, void *event)
     if (ret != MMI_IU_ERROR_NONE)
         return ret;
 
-    ret = mmi_iu_feed_input_modality(TEST_APP_ID, type, event);
+    ret = mmi_iu_feed_input_modality(type, event);
     return ret;
 }
 
@@ -451,7 +451,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_input_event_gesture_push_diff
     mmi_provider_event_gesture ge = { 0, };
     ge.type = MMI_EVENT_GESTURE_TYPE_PUSH;
 
-    ret = mmi_iu_feed_input_modality(TEST_APP_ID, MMI_PROVIDER_EVENT_GESTURE, &ge);
+    ret = mmi_iu_feed_input_modality(MMI_PROVIDER_EVENT_GESTURE, &ge);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
 
     EXPECT_STREQ(output_action.c_str(), "");

diff --git a/tests/iu/mmi_iu_noinit_unittests.cpp b/tests/iu/mmi_iu_noinit_unittests.cpp
index 6687b6c66bec1a24679572770f57bc1a309284a6..e5e7be4cce4ee4a79a3ab9033fe9581915f044f6 100644 (file)
--- a/tests/iu/mmi_iu_noinit_unittests.cpp
+++ b/tests/iu/mmi_iu_noinit_unittests.cpp
@@ -49,7 +49,7 @@ class IUClientNoInitTest : public testing::Test {
     private:
 };
 
-static void output_intent_received_cb(const char *app_id, int type, const char *json_data, void *user_data)
+static void output_intent_received_cb(int type, const char *json_data, void *user_data)
 {
 
 }
@@ -60,7 +60,7 @@ TEST_F(IUClientNoInitTest, utc_mmi_iu_feed_input_event_no_init)
     key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = MMI_EVENT_KEYEVENT_MIC;
 
-    int ret = mmi_iu_feed_input_modality(TEST_APP_ID, MMI_PROVIDER_EVENT_KEY, &key_event);
+    int ret = mmi_iu_feed_input_modality(MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NOT_INITIALIZED);
 }
 

diff --git a/tests/iu/mmi_iu_unittests.cpp b/tests/iu/mmi_iu_unittests.cpp
index 57a46452f422a6e87dc5417fd43a76de834f3ee8..38ddf8ee79d39d8db9817b75a105cfb89449298f 100644 (file)
--- a/tests/iu/mmi_iu_unittests.cpp
+++ b/tests/iu/mmi_iu_unittests.cpp
@@ -41,7 +41,7 @@ static string output_action;
 
 namespace {
 
-static void output_intent_received_cb(const char *app_id, int type, const char *json_data, void *user_data)
+static void output_intent_received_cb(int type, const char *json_data, void *user_data)
 {
 
 }