Add b_event_handler_click_on_text_input_button to db

Change-Id: Ib7703b772173f15f8e677e4dcc50e63e7994db2b
Signed-off-by: Myungki Lee <mk5004.lee@samsung.com>

diff --git a/include/notification_private.h b/include/notification_private.h
index 116c0c76e80e37d48bd395305467e51454ffffbc..86866b4ac81341a6220ae8265d20a0a43d38e4a7 100644 (file)
--- a/include/notification_private.h
+++ b/include/notification_private.h
@@ -122,6 +122,7 @@ typedef enum notification_data_type {
        NOTIFICATION_DATA_TYPE_BUTTON6_EVENT,
        NOTIFICATION_DATA_TYPE_ICON_EVENT,
        NOTIFICATION_DATA_TYPE_THUMBNAIL_EVENT,
+       NOTIFICATION_DATA_TYPE_TEXT_INPUT_BUTTON_EVENT,
        NOTIFICATION_DATA_TYPE_DOMAIN,
        NOTIFICATION_DATA_TYPE_DIR,
        NOTIFICATION_DATA_TYPE_TEXT,

diff --git a/src/notification_db.c b/src/notification_db.c
index 3b5c2c99b9057fe1dfaf01ab6c0ed9023112d8d6..4e9214d5b44702fc446992ee724d66cb9ff97f7c 100755 (executable)
--- a/src/notification_db.c
+++ b/src/notification_db.c
@@ -65,6 +65,7 @@ create        table if not exists noti_list ( \
                        b_event_handler_click_on_button_6 TEXT, \
                        b_event_handler_click_on_icon TEXT, \
                        b_event_handler_click_on_thumbnail TEXT, \
+                       b_event_handler_click_on_text_input_button TEXT, \
                        sound_type INTEGER default 0, \
                        sound_path TEXT, \
                        vibration_type INTEGER default 0, \
@@ -187,6 +188,7 @@ create      table if not exists noti_list ( \
                        b_event_handler_click_on_button_6 TEXT, \
                        b_event_handler_click_on_icon TEXT, \
                        b_event_handler_click_on_thumbnail TEXT, \
+                       b_event_handler_click_on_text_input_button TEXT, \
                        sound_type INTEGER default 0, \
                        sound_path TEXT, \
                        vibration_type INTEGER default 0, \

diff --git a/src/notification_ipc.c b/src/notification_ipc.c
index 120e3a7efd4c8b0f78dffb2c6130b333028736fa..1513768c6a6ba64d7e481dc11243f15a504851e4 100755 (executable)
--- a/src/notification_ipc.c
+++ b/src/notification_ipc.c
@@ -1835,6 +1835,7 @@ EXPORT_API GVariant *notification_ipc_make_gvariant_from_noti(notification_h not
        g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_AUTO_REMOVE, g_variant_new_int32(noti->auto_remove));
        g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_DEFAULT_BUTTON, g_variant_new_int32(noti->default_button_index));
        g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_TIMEOUT, g_variant_new_int32(noti->timeout));
+       g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_TEXT_INPUT_MAX_LENGTH, g_variant_new_int32(noti->text_input_max_length));
        g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_EVENT_FLAG, g_variant_new_int32(noti->event_flag));
        g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_UID, g_variant_new_int32(noti->uid));
 
@@ -1955,6 +1956,7 @@ EXPORT_API int notification_ipc_make_noti_from_gvariant(notification_h noti,
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_BUTTON6_EVENT, "&s", &b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_BUTTON_6]);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_ICON_EVENT, "&s", &b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_ICON]);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_THUMBNAIL_EVENT, "&s", &b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_THUMBNAIL]);
+       _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_TEXT_INPUT_BUTTON_EVENT, "&s", &b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_TEXT_INPUT_BUTTON]);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_DOMAIN, "&s", &domain);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_DIR, "&s", &dir);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_TEXT, "&s", &b_text);
@@ -1988,6 +1990,7 @@ EXPORT_API int notification_ipc_make_noti_from_gvariant(notification_h noti,
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_AUTO_REMOVE, "i", &noti->auto_remove);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_DEFAULT_BUTTON, "i", &noti->default_button_index);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_TIMEOUT, "i", &noti->timeout);
+       _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_TEXT_INPUT_MAX_LENGTH, "i", &noti->text_input_max_length);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_EVENT_FLAG, "i", &noti->event_flag);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_UID, "i", &noti->uid);
 

diff --git a/src/notification_noti.c b/src/notification_noti.c
index edfeec854a8fadcc8d7be5fce3f111f974d01924..047c6d4f8baa505de014d0d538a9719f98a7ae57 100755 (executable)
--- a/src/notification_noti.c
+++ b/src/notification_noti.c
@@ -258,7 +258,7 @@ static int _insertion_query_create(notification_h noti, char **query)
                "b_service_responding, b_service_single_launch, b_service_multi_launch, "
                "b_event_handler_click_on_button_1, b_event_handler_click_on_button_2, b_event_handler_click_on_button_3, "
                "b_event_handler_click_on_button_4, b_event_handler_click_on_button_5, b_event_handler_click_on_button_6, "
-               "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
+               "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, b_event_handler_click_on_text_input_button, "
                "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
                "flags_for_property, flag_simmode, display_applist, "
                "progress_size, progress_percentage, "
@@ -278,11 +278,12 @@ static int _insertion_query_create(notification_h noti, char **query)
                "'%s', '%s', '%s', "
                "'%s', '%s', '%s', "
                "'%s', '%s', '%s', "
-               "'%s', '%s', "
+               "'%s', '%s', '%s', "
                "%d, '%s', %d, '%s', %d, %d, %d, %d,"
                "%d, %d, %d, "
                "$progress_size, $progress_percentage, "
-               "%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)",
+               "%d, %d, %d, %d, "
+               "%d, %d, %d, %d, %d, %d)",
                noti->type,
                noti->layout,
                NOTIFICATION_CHECK_STR(noti->caller_pkgname),
@@ -307,6 +308,7 @@ static int _insertion_query_create(notification_h noti, char **query)
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_BUTTON_6]),
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_ICON]),
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_THUMBNAIL]),
+               NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_TEXT_INPUT_BUTTON]),
                noti->sound_type, NOTIFICATION_CHECK_STR(noti->sound_path),
                noti->vibration_type,
                NOTIFICATION_CHECK_STR(noti->vibration_path),
@@ -453,6 +455,7 @@ static int _update_query_create(notification_h noti, char **query)
                "b_event_handler_click_on_button_6= '%s', "
                "b_event_handler_click_on_icon= '%s', "
                "b_event_handler_click_on_thumbnail= '%s', "
+               "b_event_handler_click_on_text_input_button= '%s', "
                "sound_type = %d, sound_path = '%s', "
                "vibration_type = %d, vibration_path = '%s', "
                "led_operation = %d, led_argb = %d, "
@@ -485,6 +488,7 @@ static int _update_query_create(notification_h noti, char **query)
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_BUTTON_6]),
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_ICON]),
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_THUMBNAIL]),
+               NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_TEXT_INPUT_BUTTON]),
                noti->sound_type, NOTIFICATION_CHECK_STR(noti->sound_path),
                noti->vibration_type,
                NOTIFICATION_CHECK_STR(noti->vibration_path),
@@ -1057,7 +1061,7 @@ EXPORT_API int notification_noti_get_by_priv_id(notification_h noti, char *pkgna
                         "b_execute_option, b_service_responding, b_service_single_launch, b_service_multi_launch, "
                         "b_event_handler_click_on_button_1, b_event_handler_click_on_button_2, b_event_handler_click_on_button_3, "
                         "b_event_handler_click_on_button_4, b_event_handler_click_on_button_5, b_event_handler_click_on_button_6, "
-                        "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
+                        "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, b_event_handler_click_on_text_input_button, "
                         "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
                         "flags_for_property, display_applist, progress_size, progress_percentage, ongoing_flag, ongoing_value_type, "
                         "ongoing_current, ongoing_duration, auto_remove, default_button_index, timeout, text_input_max_length, event_flag "
@@ -1128,7 +1132,7 @@ EXPORT_API int notification_noti_get_by_tag(notification_h noti, char *pkgname,
                         "b_execute_option, b_service_responding, b_service_single_launch, b_service_multi_launch, "
                         "b_event_handler_click_on_button_1, b_event_handler_click_on_button_2, b_event_handler_click_on_button_3, "
                         "b_event_handler_click_on_button_4, b_event_handler_click_on_button_5, b_event_handler_click_on_button_6, "
-                        "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
+                        "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, b_event_handler_click_on_text_input_button, "
                         "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
                         "flags_for_property, display_applist, progress_size, progress_percentage, ongoing_flag, ongoing_value_type, "
                         "ongoing_current, ongoing_duration, auto_remove, default_button_index, timeout, text_input_max_length, event_flag "
@@ -1164,7 +1168,7 @@ EXPORT_API int notification_noti_get_by_tag(notification_h noti, char *pkgname,
                         "b_execute_option, b_service_responding, b_service_single_launch, b_service_multi_launch, "
                         "b_event_handler_click_on_button_1, b_event_handler_click_on_button_2, b_event_handler_click_on_button_3, "
                         "b_event_handler_click_on_button_4, b_event_handler_click_on_button_5, b_event_handler_click_on_button_6, "
-                        "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
+                        "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, b_event_handler_click_on_text_input_button, "
                         "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
                         "flags_for_property, display_applist, progress_size, progress_percentage, ongoing_flag, ongoing_value_type, "
                         "ongoing_current, ongoing_duration, auto_remove, default_button_index, timeout, text_input_max_length, event_flag "
@@ -1623,7 +1627,7 @@ EXPORT_API int notification_noti_get_grouping_list(notification_type_e type,
                 "b_execute_option, b_service_responding, b_service_single_launch, b_service_multi_launch, "
                 "b_event_handler_click_on_button_1, b_event_handler_click_on_button_2, b_event_handler_click_on_button_3, "
                 "b_event_handler_click_on_button_4, b_event_handler_click_on_button_5, b_event_handler_click_on_button_6, "
-                "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
+                "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, b_event_handler_click_on_text_input_button, "
                 "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
                 "flags_for_property, display_applist, progress_size, progress_percentage, ongoing_flag, ongoing_value_type, "
                 "ongoing_current, ongoing_duration, auto_remove, default_button_index, timeout, text_input_max_length, event_flag "
@@ -1725,7 +1729,7 @@ EXPORT_API int notification_noti_get_detail_list(const char *pkgname,
                 "b_execute_option, b_service_responding, b_service_single_launch, b_service_multi_launch, "
                 "b_event_handler_click_on_button_1, b_event_handler_click_on_button_2, b_event_handler_click_on_button_3, "
                 "b_event_handler_click_on_button_4, b_event_handler_click_on_button_5, b_event_handler_click_on_button_6, "
-                "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
+                "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, b_event_handler_click_on_text_input_button, "
                 "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
                 "flags_for_property, display_applist, progress_size, progress_percentage, ongoing_flag, ongoing_value_type, "
                 "ongoing_current, ongoing_duration, auto_remove, default_button_index, timeout, text_input_max_length, event_flag "
@@ -1985,10 +1989,11 @@ static int _template_query_create(notification_h noti, char *template_name, char
                "b_service_responding, b_service_single_launch, b_service_multi_launch, "
                "b_event_handler_click_on_button_1, b_event_handler_click_on_button_2, b_event_handler_click_on_button_3, "
                "b_event_handler_click_on_button_4, b_event_handler_click_on_button_5, b_event_handler_click_on_button_6, "
-               "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
+               "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, b_event_handler_click_on_text_input_button, "
                "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
-               "flags_for_property, flag_simmode, display_applist, progress_size, progress_percentage, ongoing_flag, ongoing_value_type, "
-               "ongoing_current, ongoing_duration, auto_remove, default_button_index, timeout, text_input_max_length, "
+               "flags_for_property, flag_simmode, display_applist, progress_size, progress_percentage, "
+               "ongoing_flag, ongoing_value_type, ongoing_current, ongoing_duration, "
+               "auto_remove, default_button_index, timeout, text_input_max_length, "
                "event_flag, uid, template_name) values ("
                "%d, "
                "%d, "
@@ -2004,11 +2009,12 @@ static int _template_query_create(notification_h noti, char *template_name, char
                "'%s', '%s', '%s', "
                "'%s', '%s', '%s', "
                "'%s', '%s', '%s', "
-               "'%s', '%s', "
+               "'%s', '%s', '%s', "
                "%d, '%s', %d, '%s', %d, %d, %d, %d, "
-               "%d, %d, %d, "
-               "$progress_size, $progress_percentage, "
-               "%d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')",
+               "%d, %d, %d, $progress_size, $progress_percentage, "
+               "%d, %d, %d, %d, "
+               "%d, %d, %d, %d, "
+               "%d, %d, '%s')",
                noti->type,
                noti->layout,
                NOTIFICATION_CHECK_STR(noti->caller_pkgname),
@@ -2033,6 +2039,7 @@ static int _template_query_create(notification_h noti, char *template_name, char
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_BUTTON_6]),
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_ICON]),
                NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_THUMBNAIL]),
+               NOTIFICATION_CHECK_STR(b_event_handler[NOTIFICATION_EVENT_TYPE_CLICK_ON_TEXT_INPUT_BUTTON]),
                noti->sound_type, NOTIFICATION_CHECK_STR(noti->sound_path),
                noti->vibration_type,
                NOTIFICATION_CHECK_STR(noti->vibration_path),
@@ -2212,7 +2219,7 @@ EXPORT_API int notification_noti_get_package_template(notification_h noti, char
                "b_execute_option, b_service_responding, b_service_single_launch, b_service_multi_launch, "
                "b_event_handler_click_on_button_1, b_event_handler_click_on_button_2, b_event_handler_click_on_button_3, "
                "b_event_handler_click_on_button_4, b_event_handler_click_on_button_5, b_event_handler_click_on_button_6, "
-               "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
+               "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, b_event_handler_click_on_text_input_button, "
                "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
                "flags_for_property, display_applist, progress_size, progress_percentage, ongoing_flag, ongoing_value_type, "
                "ongoing_current, ongoing_duration, auto_remove, default_button_index, timeout, text_input_max_length, event_flag "