Merge from private master branch

Change-Id: I087da860f62fcf8f5a7d7dd32660b9d65ecec265
Signed-off-by: hyun lee <hyunn.lee@samsung.com>

diff --git a/src/notification.c b/src/notification.c
index d525b6f..1ec0a8e 100755 (executable)
--- a/src/notification.c
+++ b/src/notification.c
@@ -819,6 +819,98 @@ EXPORT_API int notification_get_text(notification_h noti,
                                                temp_str++;
 
                                                num_args++;
+                                       } else if (*(temp_str + 1) >= '1' && *(temp_str + 1) <= '9') {
+                                               if (*(temp_str + 3) == 'd') {
+                                                       /* Get var Type */
+                                                       ret_variable_int = 0;
+
+                                                       snprintf(buf_key,
+                                                                sizeof(buf_key),
+                                                                "%dtype%d", check_type,
+                                                                num_args + *(temp_str + 1) - 49);
+                                                       ret_val =
+                                                           bundle_get_val(b, buf_key);
+                                                       ret_var_type = atoi(ret_val);
+                                                       if (ret_var_type ==
+                                                           NOTIFICATION_VARIABLE_TYPE_COUNT)
+                                                       {
+                                                               /* Get notification count */
+                                                               notification_noti_get_count
+                                                                   (noti->type,
+                                                                    noti->caller_pkgname,
+                                                                    noti->group_id,
+                                                                    noti->priv_id,
+                                                                    &ret_variable_int);
+                                                       } else {
+                                                               /* Get var Value */
+                                                               snprintf(buf_key,
+                                                                        sizeof
+                                                                        (buf_key),
+                                                                        "%dvalue%d",
+                                                                        check_type,
+                                                                        num_args + *(temp_str + 1) - 49);
+                                                               ret_val =
+                                                                   bundle_get_val(b,
+                                                                                  buf_key);
+                                                               ret_variable_int =
+                                                                   atoi(ret_val);
+                                                       }
+
+                                                       snprintf(buf_str,
+                                                                sizeof(buf_str), "%d",
+                                                                ret_variable_int);
+
+                                                       int src_len = strlen(result_str);
+                                                       int max_len = NOTI_TEXT_RESULT_LEN - src_len - 1;
+
+                                                       strncat(result_str, buf_str,
+                                                                       max_len);
+
+                                                       temp_str += 3;
+                                               } else if (*(temp_str + 3) == 's') {
+                                                       /* Get var Value */
+                                                       snprintf(buf_key,
+                                                                sizeof(buf_key),
+                                                                "%dvalue%d",
+                                                                check_type, num_args + *(temp_str + 1) - 49);
+                                                       ret_val =
+                                                           bundle_get_val(b, buf_key);
+
+                                                       snprintf(buf_str,
+                                                                sizeof(buf_str), "%s",
+                                                                ret_val);
+
+                                                       int src_len = strlen(result_str);
+                                                       int max_len = NOTI_TEXT_RESULT_LEN - src_len - 1;
+
+                                                       strncat(result_str, buf_str,
+                                                                       max_len);
+
+                                                       temp_str += 3;
+                                               } else if (*(temp_str + 3) == 'f') {
+                                                       /* Get var Value */
+                                                       snprintf(buf_key,
+                                                                sizeof(buf_key),
+                                                                "%dvalue%d",
+                                                                check_type, num_args + *(temp_str + 1) - 49);
+                                                       ret_val =
+                                                           bundle_get_val(b, buf_key);
+                                                       ret_variable_double =
+                                                           atof(ret_val);
+
+                                                       snprintf(buf_str,
+                                                                sizeof(buf_str),
+                                                                "%.2f",
+                                                                ret_variable_double);
+
+                                                       int src_len = strlen(result_str);
+                                                       int max_len = NOTI_TEXT_RESULT_LEN - src_len - 1;
+
+                                                       strncat(result_str, buf_str,
+                                                                       max_len);
+
+                                                       temp_str += 3;
+                                               }
                                        }
                                }
 
@@ -2705,7 +2797,7 @@ EXPORT_API int notification_op_get_data(notification_op *noti_op, notification_o
 void notification_call_changed_cb(notification_op *op_list, int op_num)
 {
        notification_cb_list_s *noti_cb_list = NULL;
-
+       notification_type_e type = 0;
 
        if (g_notification_cb_list == NULL) {
                return;
@@ -2721,14 +2813,16 @@ void notification_call_changed_cb(notification_op *op_list, int op_num)
                return ;
        }
 
+       notification_get_type(op_list->noti, &type);
+
        while (noti_cb_list != NULL) {
                if (noti_cb_list->cb_type == NOTIFICATION_CB_NORMAL && noti_cb_list->changed_cb) {
                        noti_cb_list->changed_cb(noti_cb_list->data,
-                                                NOTIFICATION_TYPE_NOTI);
+                                                type);
                }
                if (noti_cb_list->cb_type == NOTIFICATION_CB_DETAILED && noti_cb_list->detailed_changed_cb) {
                        noti_cb_list->detailed_changed_cb(noti_cb_list->data,
-                                                NOTIFICATION_TYPE_NOTI, op_list, op_num);
+                                               type, op_list, op_num);
                }
 
                noti_cb_list = noti_cb_list->next;

diff --git a/src/notification_noti.c b/src/notification_noti.c
index 50ee494..877808d 100755 (executable)
--- a/src/notification_noti.c
+++ b/src/notification_noti.c
@@ -274,7 +274,7 @@ static int _insertion_query_create(notification_h noti, char **query)
                 "'%s', "
                 "%d, %d, %d, "
                 "$title_key, "
-                "'%s', '%s', '%s', '%s', %d, "
+                "'%s', '%s', $tag, '%s', %d, "
                 "'%s', '%s', "
                 "%d, %d, "
                 "'%s', '%s', "
@@ -290,7 +290,6 @@ static int _insertion_query_create(notification_h noti, char **query)
                 NOTIFICATION_CHECK_STR(b_image_path), noti->group_id,
                 noti->internal_group_id, noti->priv_id,
                 NOTIFICATION_CHECK_STR(b_text), NOTIFICATION_CHECK_STR(b_key),
-                NOTIFICATION_CHECK_STR(noti->tag),
                 NOTIFICATION_CHECK_STR(b_format_args), noti->num_format_args,
                 NOTIFICATION_CHECK_STR(noti->domain),
                 NOTIFICATION_CHECK_STR(noti->dir), (int)noti->time,
@@ -424,7 +423,7 @@ static int _update_query_create(notification_h noti, char **query)
                 "layout = %d, "
                 "launch_pkgname = '%s', "
                 "image_path = '%s', "
-                "b_text = '%s', b_key = '%s', tag = '%s', "
+                "b_text = '%s', b_key = '%s', tag = $tag, "
                 "b_format_args = '%s', num_format_args = %d, "
                 "text_domain = '%s', text_dir = '%s', "
                 "time = %d, insert_time = %d, "
@@ -446,7 +445,6 @@ static int _update_query_create(notification_h noti, char **query)
                 NOTIFICATION_CHECK_STR(noti->launch_pkgname),
                 NOTIFICATION_CHECK_STR(b_image_path),
                 NOTIFICATION_CHECK_STR(b_text), NOTIFICATION_CHECK_STR(b_key),
-                NOTIFICATION_CHECK_STR(noti->tag),
                 NOTIFICATION_CHECK_STR(b_format_args), noti->num_format_args,
                 NOTIFICATION_CHECK_STR(noti->domain),
                 NOTIFICATION_CHECK_STR(noti->dir),
@@ -718,6 +716,11 @@ EXPORT_API int notification_noti_insert(notification_h noti)
        }
 
        /* Bind query */
+       ret = _notification_noti_bind_query_text(stmt, "$tag", noti->tag);
+       if (ret != NOTIFICATION_ERROR_NONE) {
+               NOTIFICATION_ERR("Bind error : %s", sqlite3_errmsg(db));
+               goto err;
+       }
        ret = _notification_noti_bind_query_text(stmt, "$title_key", title_key);
        if (ret != NOTIFICATION_ERROR_NONE) {
                NOTIFICATION_ERR("Bind error : %s", sqlite3_errmsg(db));
@@ -857,6 +860,52 @@ EXPORT_API int notification_noti_get_by_tag(notification_h noti, char *pkgname,
                return get_last_result();
        }
 
+       if (pkgname != NULL) {
+               ret = sqlite3_prepare_v2(db, "select "
+                        "type, layout, caller_pkgname, launch_pkgname, image_path, group_id, priv_id, "
+                        "tag, b_text, b_key, b_format_args, num_format_args, "
+                        "text_domain, text_dir, time, insert_time, args, group_args, "
+                        "b_execute_option, b_service_responding, b_service_single_launch, b_service_multi_launch, "
+                        "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 "
+                        "from noti_list where caller_pkgname = ? and tag = ?", -1, &stmt, NULL);
+               if (ret != SQLITE_OK) {
+                       NOTIFICATION_ERR("Error: %s\n", sqlite3_errmsg(db));
+                       return NOTIFICATION_ERROR_OUT_OF_MEMORY;
+               }
+
+               ret = sqlite3_bind_text(stmt, 1, pkgname, -1, SQLITE_TRANSIENT);
+               if (ret != SQLITE_OK) {
+                       NOTIFICATION_ERR("Error: %s\n", sqlite3_errmsg(db));
+                       goto err;
+               }
+
+               ret = sqlite3_bind_text(stmt, 2,  tag, -1, SQLITE_TRANSIENT);
+               if (ret != SQLITE_OK) {
+                       NOTIFICATION_ERR("Error: %s\n", sqlite3_errmsg(db));
+                       goto err;
+               } 
+       } else {
+               ret = sqlite3_prepare_v2(db, "select "
+                        "type, layout, caller_pkgname, launch_pkgname, image_path, group_id, priv_id, "
+                        "tag, b_text, b_key, b_format_args, num_format_args, "
+                        "text_domain, text_dir, time, insert_time, args, group_args, "
+                        "b_execute_option, b_service_responding, b_service_single_launch, b_service_multi_launch, "
+                        "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 "
+                        "from noti_list where  tag = ?", -1, &stmt, NULL);
+               if (ret != SQLITE_OK) {
+                       NOTIFICATION_ERR("Error: %s\n", sqlite3_errmsg(db));
+                       return NOTIFICATION_ERROR_OUT_OF_MEMORY;
+               }
+
+               ret = sqlite3_bind_text(stmt, 1, tag, -1, SQLITE_TRANSIENT);
+               if (ret != SQLITE_OK) {
+                       NOTIFICATION_ERR("Error: %s\n", sqlite3_errmsg(db));
+                       goto err;
+               }
+       }
+/*
        char *base_query = "select "
                         "type, layout, caller_pkgname, launch_pkgname, image_path, group_id, priv_id, "
                         "tag, b_text, b_key, b_format_args, num_format_args, "
@@ -885,7 +934,7 @@ EXPORT_API int notification_noti_get_by_tag(notification_h noti, char *pkgname,
                ret = NOTIFICATION_ERROR_FROM_DB;
                goto err;
        }
-
+*/
        ret = sqlite3_step(stmt);
        if (ret == SQLITE_ROW) {
                _notification_noti_populate_from_stmt(stmt, noti);
@@ -945,6 +994,11 @@ EXPORT_API int notification_noti_update(notification_h noti)
                goto err;
        }
 
+       ret = _notification_noti_bind_query_text(stmt, "$tag", noti->tag);
+       if (ret != NOTIFICATION_ERROR_NONE) {
+               NOTIFICATION_ERR("Bind error : %s", sqlite3_errmsg(db));
+               goto err;
+       }
        ret = _notification_noti_bind_query_double(stmt, "$progress_size",noti->progress_size);
        if (ret != NOTIFICATION_ERROR_NONE) {
                NOTIFICATION_ERR("Bind error : %s", sqlite3_errmsg(db));
@@ -1702,6 +1756,25 @@ EXPORT_API int notification_noti_check_tag(notification_h noti)
                return get_last_result();
        }
 
+       ret = sqlite3_prepare_v2(db, "SELECT priv_id FROM noti_list WHERE caller_pkgname = ? and tag = ?", -1, &stmt, NULL);
+       if (ret != SQLITE_OK) {
+               NOTIFICATION_ERR("Error: %s\n", sqlite3_errmsg(db));
+               return NOTIFICATION_ERROR_OUT_OF_MEMORY;
+       }
+
+       ret = sqlite3_bind_text(stmt, 1, noti->caller_pkgname, -1, SQLITE_TRANSIENT);
+       if (ret != SQLITE_OK) {
+               NOTIFICATION_ERR("Error: %s\n", sqlite3_errmsg(db));
+               goto err;
+       }
+
+       ret = sqlite3_bind_text(stmt, 2, noti->tag, -1, SQLITE_TRANSIENT);
+       if (ret != SQLITE_OK) {
+               NOTIFICATION_ERR("Error: %s\n", sqlite3_errmsg(db));
+               goto err;
+       }
+
+/*
        query = sqlite3_mprintf("select priv_id from noti_list where caller_pkgname = '%s' and tag = '%s'",
                 noti->caller_pkgname, noti->tag);
        if (query == NULL) {
@@ -1716,7 +1789,7 @@ EXPORT_API int notification_noti_check_tag(notification_h noti)
                ret = NOTIFICATION_ERROR_FROM_DB;
                goto err;
        }
-
+*/
        ret = sqlite3_step(stmt);
        if (ret == SQLITE_ROW) {
                result = sqlite3_column_int(stmt, 0);