Add id exist check logic for get app control

Change-Id: I1012fb99ea15eb6bca6ca234b185c68989979512
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>

diff --git a/watch-control/src/control.c b/watch-control/src/control.c
index b287bcb..b7da2c5 100644 (file)
--- a/watch-control/src/control.c
+++ b/watch-control/src/control.c
@@ -296,6 +296,11 @@ API int watch_manager_get_app_control(const char *app_id, app_control_h *app_con
        bundle *b = NULL;
        screen_connector_toolkit_evas_ops ops;
 
+       if (app_id == NULL) {
+               _E("Invalid param");
+               return -1;
+       }
+
        app_control_create(app_control);
        app_control_set_app_id(*app_control, app_id);
 
@@ -306,10 +311,21 @@ API int watch_manager_get_app_control(const char *app_id, app_control_h *app_con
 
        app_control_set_operation(*app_control, APP_CONTROL_OPERATION_MAIN);
 
-       ops.added_cb = __screen_connector_toolkit_evas_added_cb;
-       ops.removed_cb = __screen_connector_toolkit_evas_removed_cb;
-       ops.updated_cb = __screen_connector_toolkit_evas_updated_cb;
-       __toolkit = screen_connector_toolkit_evas_add(&ops, (char *)app_id, SCREEN_CONNECTOR_SCREEEN_TYPE_WATCH, NULL);
+       if (__toolkit == NULL ||
+                       (__watch_appid != NULL &&
+                       strcmp(__watch_appid, app_id) != 0)) {
+
+               _D("cur %s, new %s", __watch_appid, app_id);
+               if (screen_connector_toolkit_is_exist((char *)__watch_appid,
+                               SCREEN_CONNECTOR_SCREEEN_TYPE_WATCH))
+                       screen_connector_toolkit_evas_remove(__toolkit);
+               ops.added_cb = __screen_connector_toolkit_evas_added_cb;
+               ops.removed_cb = __screen_connector_toolkit_evas_removed_cb;
+               ops.updated_cb = __screen_connector_toolkit_evas_updated_cb;
+               __toolkit = screen_connector_toolkit_evas_add(&ops,
+                               (char *)app_id,
+                               SCREEN_CONNECTOR_SCREEEN_TYPE_WATCH, NULL);
+       }
 
        app_control_to_bundle(*app_control, &b);
        if (b) {