From 1103a02281292296c671363d44fc13fffd9003c8 Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Wed, 18 Mar 2020 09:43:06 +0900
Subject: [PATCH 01/16] Revert "Add vconf define temporarily"

This reverts commit dfd48fd5ee154781ce88b2c1e3f575a40ff8b89b.

Change-Id: Ifd945d7e422ea73ffeaed176d44c5177d3aa962b
---
 receiver/src/ft.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp
index 9d42623..3f56506 100644
--- a/receiver/src/ft.cpp
+++ b/receiver/src/ft.cpp
@@ -51,16 +51,6 @@
 #define STICKER_SEND_STOP_REQ  "sticker-send-stop-req"
 #define STICKER_SEND_STOP_RSP  "sticker-send-stop-rsp"
 
-#ifndef VCONFKEY_STICKER_SUPPORTED_FEATURE
-#define VCONFKEY_STICKER_SUPPORTED_FEATURE  "db/sticker/supported_feature"
-
-enum {
-    VCONFKEY_STICKER_FEATURE_NONE = 0x00,
-    VCONFKEY_STICKER_FEATURE_AREMOJI = 0x01,
-    VCONFKEY_STICKER_FEATURE_BITMOJI = 0x02
-};
-#endif
-
 using namespace std;
 
 typedef enum {
-- 
2.7.4


From 9416b763017a9617c334efd5f0e11a32ef920b47 Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Wed, 18 Mar 2020 09:52:12 +0900
Subject: [PATCH 02/16] Avoid build error due to vconf key

Change-Id: I496e4a871fa9bf571b10fd9cd233e2e7b8b16637
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
---
 receiver/src/ft.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp
index 3f56506..61afdc0 100644
--- a/receiver/src/ft.cpp
+++ b/receiver/src/ft.cpp
@@ -438,6 +438,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in
     msg_id = string(json_msgid ? json_msgid : "");
     if (msg_id == STICKER_SYNC_FEATURE_RSP) {
         LOGD("msg : %s", msg_id.c_str());
+#ifdef VCONFKEY_STICKER_SUPPORTED_FEATURE
         const char *json_aremoji = json_object_get_string_member(root_obj, "arEmoji");
         const char *json_bitmoji = json_object_get_string_member(root_obj, "bitmoji");
         string support_aremoji = string(json_aremoji ? json_aremoji : "");
@@ -454,6 +455,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in
             LOGD("Succeed to set supported feature");
         else
             LOGW("Fail to set supported feature");
+#endif
 
         service_app_exit();
     } else if (msg_id == STICKER_SYNC_START_RSP) {
-- 
2.7.4


From 050335661a4f1c10681d66c895b8219817057699 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Fri, 13 Mar 2020 09:52:19 +0900
Subject: [PATCH 03/16] Support display_type

Change-Id: I84a9ee0230c8d0da38236edde726eb74abcd66a8
---
 client/sticker_data.c           | 26 ++++++++++++++++++++++++++
 client/sticker_data_main.h      |  1 +
 client/sticker_dbus.c           |  4 ++++
 client/sticker_defs.h           |  1 +
 include/sticker_data.h          | 37 +++++++++++++++++++++++++++++++++++++
 include/sticker_provider.h      | 10 ++++++----
 server/stickerd_data_manager.c  |  5 +++++
 server/stickerd_db_manager.c    | 17 ++++++++++-------
 server/stickerd_db_manager.h    |  1 +
 sticker-parser/sticker-parser.c | 14 ++++++++------
 10 files changed, 99 insertions(+), 17 deletions(-)

diff --git a/client/sticker_data.c b/client/sticker_data.c
index decbfe3..b76e7a8 100644
--- a/client/sticker_data.c
+++ b/client/sticker_data.c
@@ -208,6 +208,8 @@ EXPORT_API int sticker_data_clone(sticker_data_h origin_handle, sticker_data_h *
     if (origin_handle->date)
         handle->date = strdup(origin_handle->date);
 
+    handle->disp_type = origin_handle->disp_type;
+
     *target_handle = handle;
 
     return STICKER_ERROR_NONE;
@@ -444,3 +446,27 @@ EXPORT_API int sticker_data_get_date(sticker_data_h data_handle, char **date)
 
     return STICKER_ERROR_NONE;
 }
+
+EXPORT_API int sticker_data_set_display_type(sticker_data_h data_handle, sticker_data_display_type_e type)
+{
+    CHECK_STICKER_FEATURE();
+
+    if (!data_handle || !type || type < STICKER_DATA_DISP_EMOJI || type > STICKER_DATA_DISP_WALLPAPER)
+        return STICKER_ERROR_INVALID_PARAMETER;
+
+    data_handle->disp_type = type;
+
+    return STICKER_ERROR_NONE;
+}
+
+EXPORT_API int sticker_data_get_display_type(sticker_data_h data_handle, sticker_data_display_type_e *type)
+{
+    CHECK_STICKER_FEATURE();
+
+    if (!data_handle || !type)
+        return STICKER_ERROR_INVALID_PARAMETER;
+
+    *type = data_handle->disp_type;
+
+    return STICKER_ERROR_NONE;
+}
\ No newline at end of file
diff --git a/client/sticker_data_main.h b/client/sticker_data_main.h
index 058de9c..463216e 100644
--- a/client/sticker_data_main.h
+++ b/client/sticker_data_main.h
@@ -39,6 +39,7 @@ struct sticker_data_s{
     char *group;
     char *description;
     char *date;
+    sticker_data_display_type_e disp_type;
 };
 
 #ifdef __cplusplus
diff --git a/client/sticker_dbus.c b/client/sticker_dbus.c
index debfc5f..7bf48bf 100644
--- a/client/sticker_dbus.c
+++ b/client/sticker_dbus.c
@@ -110,6 +110,9 @@ static void _get_sticker_info_from_gvariant(GVariant *body, sticker_data_h stick
             case STICKER_DATA_TYPE_DATE:
             sticker_data->date = g_variant_dup_string(value, NULL);
             break;
+            case STICKER_DATA_TYPE_DISP_TYPE:
+            sticker_data->disp_type = g_variant_get_int32(value);
+            break;
             default:
             break;
         }
@@ -585,6 +588,7 @@ int sticker_dbus_insert_sticker_info(GDBusConnection *gdbus_connection, sticker_
     if (sticker_data->description)
         g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_DESCRIPTION, g_variant_new_string((const gchar *)sticker_data->description));
     g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_GROUP, g_variant_new_string((const gchar *)sticker_data->group));
+    g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_DISP_TYPE, g_variant_new_int32(sticker_data->disp_type));
 
     keyword_builder = g_variant_builder_new(G_VARIANT_TYPE("a(s)"));
     g_list_foreach(sticker_data->keyword, (GFunc) _set_keyword_builder, keyword_builder);
diff --git a/client/sticker_defs.h b/client/sticker_defs.h
index ce56260..01cae60 100644
--- a/client/sticker_defs.h
+++ b/client/sticker_defs.h
@@ -66,6 +66,7 @@ typedef enum {
     STICKER_DATA_TYPE_GROUP,
     STICKER_DATA_TYPE_KEYWORD,
     STICKER_DATA_TYPE_DATE,
+    STICKER_DATA_TYPE_DISP_TYPE,
 } STICKER_DAT_TYPE;
 
 #ifdef __cplusplus
diff --git a/include/sticker_data.h b/include/sticker_data.h
index 16c8753..fc1f8c3 100644
--- a/include/sticker_data.h
+++ b/include/sticker_data.h
@@ -44,6 +44,16 @@ typedef enum {
 } sticker_data_uri_type_e;
 
 /**
+ * @brief Enumeration for sticker display type.
+ *
+ * @since_tizen 5.5
+ */
+typedef enum {
+    STICKER_DATA_DISP_EMOJI = 1, /**< Emoji type */
+    STICKER_DATA_DISP_WALLPAPER, /**< Wallpaper type */
+} sticker_data_display_type_e;
+
+/**
  * @brief The sticker data handle.
  * @since_tizen 5.5
  */
@@ -304,6 +314,33 @@ int sticker_data_get_description(sticker_data_h data_handle, char **description)
 int sticker_data_get_date(sticker_data_h data_handle, char **date);
 
 /**
+ * @brief Sets the display type of the sticker.
+ * @since_tizen 5.5
+ * @param[in] data_handle The sticker data handle
+ * @param[in] type The display type to be saved
+ * @return 0 on success, otherwise a negative error value
+ * @retval #STICKER_ERROR_NONE Successful
+ * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
+ * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
+ * @see sticker_data_get_display_type()
+ */
+int sticker_data_set_display_type(sticker_data_h data_handle, sticker_data_display_type_e type);
+
+/**
+ * @brief Gets the display type from sticker data handle.
+ * @details If the display type is empty, the result will be a zero.
+ * @since_tizen 5.5
+ * @param[in] data_handle The sticker data handle
+ * @param[out] type The display type of the sticker
+ * @return 0 on success, otherwise a negative error value
+ * @retval #STICKER_ERROR_NONE Successful
+ * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
+ * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
+ * @see sticker_data_set_display_type()
+ */
+int sticker_data_get_display_type(sticker_data_h data_handle, sticker_data_display_type_e *type);
+
+/**
  * @}
  */
 
diff --git a/include/sticker_provider.h b/include/sticker_provider.h
index 8ab7758..6ea0234 100644
--- a/include/sticker_provider.h
+++ b/include/sticker_provider.h
@@ -97,7 +97,7 @@ int sticker_provider_destroy(sticker_provider_h provider_handle);
 /**
  * @brief Inserts a sticker data to the sticker database.
  * @since_tizen 5.5
- * @remarks All data except thumbnail and description must be set in the @a data_handle to insert the sticker data.
+ * @remarks All data except thumbnail, description, display_type must be set in the @a data_handle to insert the sticker data.
  *          If the uri type is #STICKER_DATA_URI_LOCAL_PATH, the sticker file is copied to a sticker directory.
  *          It is recommended to delete your sticker file after inserting a sticker data.
  * @param[in] provider_handle The sticker provider handle
@@ -116,7 +116,7 @@ int sticker_provider_insert_data(sticker_provider_h provider_handle, sticker_dat
  * @brief Inserts a sticker data using json file.
  * @details @a json_path must be a relative path like '/data/message_sticker.json'.
  * @since_tizen 5.5
- * @remarks All data except thumbnail and description must be set in the json file to insert the sticker data.
+ * @remarks All data except thumbnail, description, display_type must be set in the json file to insert the sticker data.
  *          @a json_path must have a non-null value and must be an existing file. If not, the error as invalid parameter will be returned.
  *          If the uri type is #STICKER_DATA_URI_LOCAL_PATH, the sticker file is copied to a sticker directory.
  *          It is recommended to delete your sticker files after inserting a sticker data.
@@ -143,7 +143,8 @@ int sticker_provider_insert_data(sticker_provider_h provider_handle, sticker_dat
             "keyword" : ["heart eyes", "love", "cute"],
             "group" : "face",
             "thumbnail" : "/res/face/thumbnail/heart_eyes.png",
-            "description" : "Smiling face with heart eyes emoji."
+            "description" : "Smiling face with heart eyes emoji.",
+            "display_type" : 1
         },
         {
             "type" : 2,
@@ -151,7 +152,8 @@ int sticker_provider_insert_data(sticker_provider_h provider_handle, sticker_dat
             "keyword" : ["smile", "high five"],
             "group" : "face",
             "thumbnail" : "",
-            "description" : "Smiling face with high five emoji."
+            "description" : "Smiling face with high five emoji.",
+            "display_type" : null
         },
             .....
         {
diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c
index f0dc8d2..07f667a 100644
--- a/server/stickerd_data_manager.c
+++ b/server/stickerd_data_manager.c
@@ -531,6 +531,8 @@ int stickerd_insert_sticker_info(GVariant *parameters, GVariant **reply_body)
             case STICKER_DATA_TYPE_GROUP:
             sticker_info->group = (char *) g_variant_get_string(value, NULL);
             break;
+            case STICKER_DATA_TYPE_DISP_TYPE:
+            sticker_info->display_type = g_variant_get_int32(value);
             default:
             break;
         }
@@ -701,6 +703,8 @@ int stickerd_insert_sticker_info_by_json(GVariant *parameters, GVariant **reply_
 
             sticker_info->description = _get_string_from_object(info_object, "description");
 
+            sticker_info->display_type = _get_int_from_object(info_object, "display_type");
+
             JsonArray *keyword_arr = json_object_get_array_member(info_object, "keyword");
             int keyword_arr_len = json_array_get_length(keyword_arr);
             if (keyword_arr_len < 1)
@@ -986,6 +990,7 @@ int stickerd_get_sticker_info(GVariant *parameters, GVariant **reply_body)
     g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_DESCRIPTION, g_variant_new_string((const gchar *)sticker_info->description));
     g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_GROUP, g_variant_new_string((const gchar *)sticker_info->group));
     g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_DATE, g_variant_new_string((const gchar *)sticker_info->date));
+    g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_DISP_TYPE, g_variant_new_int32(sticker_info->display_type));
 
     keyword_builder = g_variant_builder_new(G_VARIANT_TYPE("a(s)"));
     g_list_foreach(sticker_info->keyword, (GFunc) _set_keyword_builder, keyword_builder);
diff --git a/server/stickerd_db_manager.c b/server/stickerd_db_manager.c
index ab68092..e0d1a1b 100644
--- a/server/stickerd_db_manager.c
+++ b/server/stickerd_db_manager.c
@@ -31,11 +31,11 @@
  * Table Information
  *
  * sticker_info
- * +-----------------+--------+------+------+-----------+-------------+------------+------+
- * | INT             | TEXT   | INT  | TEXT | TEXT      | TEXT        | TEXT       | TEXT |
- * +-----------------+--------+------+------+-----------+-------------+------------+------+
- * | sticker_info_id | app_id | type | uri  | thumbnail | description | group_name | date |
- * +-----------------+--------+------+------+-----------+-------------+------------+------+
+ * +-----------------+--------+------+------+-----------+-------------+------------+------+--------------+
+ * | INT             | TEXT   | INT  | TEXT | TEXT      | TEXT        | TEXT       | TEXT | INT          |
+ * +-----------------+--------+------+------+-----------+-------------+------------+------+--------------+
+ * | sticker_info_id | app_id | type | uri  | thumbnail | description | group_name | date | display_type |
+ * +-----------------+--------+------+------+-----------+-------------+------------+------+--------------+
  *
  * sticker_keyword_info
  * +------------+-----------------+---------+
@@ -54,11 +54,11 @@
  */
 
 #define STICKER_DB_PATH tzplatform_mkpath(TZ_SYS_DB, ".sticker_info.db")
-#define STICKER_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_info(sticker_info_id INTEGER PRIMARY KEY AUTOINCREMENT, app_id TEXT NOT NULL, type INTEGER NOT NULL, uri TEXT NOT NULL, thumbnail TEXT, description TEXT, group_name TEXT NOT NULL, date TEXT NOT NULL)"
+#define STICKER_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_info(sticker_info_id INTEGER PRIMARY KEY AUTOINCREMENT, app_id TEXT NOT NULL, type INTEGER NOT NULL, uri TEXT NOT NULL, thumbnail TEXT, description TEXT, group_name TEXT NOT NULL, date TEXT NOT NULL, display_type INTEGER)"
 #define STICKER_KEYWORD_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_keyword_info(keyword_id INTEGER PRIMARY KEY AUTOINCREMENT, sticker_info_id INTEGER, keyword TEXT NOT NULL, FOREIGN KEY (sticker_info_id) REFERENCES sticker_info(sticker_info_id) ON DELETE CASCADE)"
 #define STICKER_WHITELIST_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_whitelist_info(whitelist_id INTEGER PRIMARY KEY AUTOINCREMENT, provider_id TEXT NOT NULL, consumer_id TEXT NOT NULL)"
 
-#define STICKER_DB_INSERT_STICKER_INFO "INSERT INTO sticker_info (app_id, type, uri, thumbnail, description, group_name, date) VALUES (?, ?, ?, ?, ?, ?, DateTime('now','localtime'))"
+#define STICKER_DB_INSERT_STICKER_INFO "INSERT INTO sticker_info (app_id, type, uri, thumbnail, description, group_name, date, display_type) VALUES (?, ?, ?, ?, ?, ?, DateTime('now','localtime'), ?)"
 #define STICKER_DB_INSERT_STICKER_KEYWORD_INFO "INSERT INTO sticker_keyword_info (sticker_info_id, keyword) VALUES (?, ?)"
 
 #define STICKER_DB_DELETE_STICKER_INFO "DELETE FROM sticker_info WHERE sticker_info_id = ?"
@@ -311,6 +311,7 @@ int stickerd_db_insert_sticker_info(int *record_id, sticker_info_db *sticker_inf
     sqlite3_bind_text(stmt, 4, sticker_info->thumbnail, -1, SQLITE_TRANSIENT);
     sqlite3_bind_text(stmt, 5, sticker_info->description, -1, SQLITE_TRANSIENT);
     sqlite3_bind_text(stmt, 6, sticker_info->group, -1, SQLITE_TRANSIENT);
+    sqlite3_bind_int(stmt, 7, sticker_info->display_type);
 
     ret = sqlite3_step(stmt);
     if (ret != SQLITE_OK && ret != SQLITE_DONE) {
@@ -541,6 +542,8 @@ int stickerd_db_get_sticker_info_by_record_id(int record_id, sticker_info_db *st
     if (tmp_date)
         sticker_info->date = strdup((const char *)tmp_date);
 
+    sticker_info->display_type = sqlite3_column_int(stmt, 8);
+
     sqlite3_finalize(stmt);
     stmt = NULL;
 
diff --git a/server/stickerd_db_manager.h b/server/stickerd_db_manager.h
index b2ff9bb..9b87f81 100644
--- a/server/stickerd_db_manager.h
+++ b/server/stickerd_db_manager.h
@@ -44,6 +44,7 @@ typedef struct {
     char *group;
     GList *keyword;
     char *date;
+    int  display_type;
 } sticker_info_db;
 
 int stickerd_db_init(void);
diff --git a/sticker-parser/sticker-parser.c b/sticker-parser/sticker-parser.c
index 11e7e91..6910d6b 100644
--- a/sticker-parser/sticker-parser.c
+++ b/sticker-parser/sticker-parser.c
@@ -41,7 +41,7 @@
 #define LOG_TAG "STICKER_PARSER"
 
 #define STICKER_DIRECTORY tzplatform_mkpath(TZ_SYS_SHARE, "sticker-data")
-#define STICKER_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_info(sticker_info_id INTEGER PRIMARY KEY AUTOINCREMENT, app_id TEXT NOT NULL, type INTEGER NOT NULL, uri TEXT NOT NULL, thumbnail TEXT, description TEXT, group_name TEXT NOT NULL, date TEXT NOT NULL)"
+#define STICKER_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_info(sticker_info_id INTEGER PRIMARY KEY AUTOINCREMENT, app_id TEXT NOT NULL, type INTEGER NOT NULL, uri TEXT NOT NULL, thumbnail TEXT, description TEXT, group_name TEXT NOT NULL, date TEXT NOT NULL, display_type INTEGER)"
 #define STICKER_KEYWORD_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_keyword_info(keyword_id INTEGER PRIMARY KEY AUTOINCREMENT, sticker_info_id INTEGER, keyword TEXT NOT NULL, FOREIGN KEY (sticker_info_id) REFERENCES sticker_info(sticker_info_id) ON DELETE CASCADE)"
 #define STICKER_WHITELIST_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_whitelist_info(whitelist_id INTEGER PRIMARY KEY AUTOINCREMENT, provider_id TEXT NOT NULL, consumer_id TEXT NOT NULL)"
 #define UIFW_ID           502
@@ -405,7 +405,7 @@ cleanup:
     }
 }
 
-static void __insert_sticker_info(const char *app_id, int type, const char *uri, const char *group, const char *thumbnail, const char *description)
+static void __insert_sticker_info(const char *app_id, int type, const char *uri, const char *group, const char *thumbnail, const char *description, int disp_type)
 {
     int ret;
     sqlite3 *db = NULL;
@@ -417,7 +417,7 @@ static void __insert_sticker_info(const char *app_id, int type, const char *uri,
     if (!db)
         return;
 
-    ret = sqlite3_prepare_v2(db, "INSERT INTO sticker_info (app_id, type, uri, thumbnail, description, group_name, date) VALUES (?, ?, ?, ?, ?, ?, DateTime('now','localtime'))",-1, &stmt, NULL);
+    ret = sqlite3_prepare_v2(db, "INSERT INTO sticker_info (app_id, type, uri, thumbnail, description, group_name, date, display_type) VALUES (?, ?, ?, ?, ?, ?, DateTime('now','localtime'), ?)",-1, &stmt, NULL);
     if (ret == SQLITE_OK) {
         sqlite3_bind_text(stmt, 1, app_id, -1, SQLITE_TRANSIENT);
         sqlite3_bind_int(stmt, 2, type);
@@ -425,6 +425,7 @@ static void __insert_sticker_info(const char *app_id, int type, const char *uri,
         sqlite3_bind_text(stmt, 4, thumbnail, -1, SQLITE_TRANSIENT);
         sqlite3_bind_text(stmt, 5, description, -1, SQLITE_TRANSIENT);
         sqlite3_bind_text(stmt, 6, group, -1, SQLITE_TRANSIENT);
+        sqlite3_bind_int(stmt, 7, disp_type);
 
         ret = sqlite3_step(stmt);
         if (ret != SQLITE_OK && ret != SQLITE_DONE)
@@ -599,6 +600,7 @@ static int __get_sticker_info_from_json(const char *appid, const char *file_path
 
             thumbnail = __get_string_from_object(info_object, "thumbnail");
             description = __get_string_from_object(info_object, "description");
+            int disp_type = __get_int_from_object(info_object, "display_type");
 
             JsonArray *keyword_arr = json_object_get_array_member(info_object, "keyword");
             int keyword_arr_len = json_array_get_length(keyword_arr);
@@ -610,7 +612,7 @@ static int __get_sticker_info_from_json(const char *appid, const char *file_path
                     char *new_uri = __convert_sticker_uri(uri, appid, app_path);
                     if (!new_uri)
                         goto free_memory;
-                    __insert_sticker_info(appid, type, new_uri, group, thumbnail, description);
+                    __insert_sticker_info(appid, type, new_uri, group, thumbnail, description, disp_type);
 
                     if (new_uri) {
                         free(new_uri);
@@ -636,7 +638,7 @@ static int __get_sticker_info_from_json(const char *appid, const char *file_path
                             uri_path = NULL;
                             goto free_memory;
                         }
-                        __insert_sticker_info(appid, type, new_uri, group, thumbnail, description);
+                        __insert_sticker_info(appid, type, new_uri, group, thumbnail, description, disp_type);
 
                         free(new_uri);
                         new_uri = NULL;
@@ -651,7 +653,7 @@ static int __get_sticker_info_from_json(const char *appid, const char *file_path
                     }
                 }
             } else {
-                __insert_sticker_info(appid, type, uri, group, thumbnail, description);
+                __insert_sticker_info(appid, type, uri, group, thumbnail, description, disp_type);
             }
 
             for (int j = 0; j < keyword_arr_len; j++) {
-- 
2.7.4


From d91a4a4056f29be1c68762203ccc488396adf1a4 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Mon, 16 Mar 2020 14:17:17 +0900
Subject: [PATCH 04/16] Add a new API for retrieving stickers using display
 type

Change-Id: I05445d437cd89fc134da3063681fe09425937cd4
---
 client/sticker_dbus.c          | 21 ++++++++++++++++++
 client/sticker_dbus.h          |  1 +
 consumer/sticker_consumer.c    | 50 +++++++++++++++++++++++++++++++++++++++++-
 include/sticker_consumer.h     | 23 +++++++++++++++++++
 server/stickerd_data_manager.c | 46 ++++++++++++++++++++++++++++++++++++++
 server/stickerd_data_manager.h |  1 +
 server/stickerd_db_manager.c   |  6 ++++-
 server/stickerd_db_manager.h   |  1 +
 8 files changed, 147 insertions(+), 2 deletions(-)

diff --git a/client/sticker_dbus.c b/client/sticker_dbus.c
index 7bf48bf..a5190f6 100644
--- a/client/sticker_dbus.c
+++ b/client/sticker_dbus.c
@@ -947,4 +947,25 @@ int sticker_dbus_get_sticker_info_by_keyword(GDBusConnection *gdbus_connection,
         g_object_unref(reply);
 
     return ret;
+}
+
+int sticker_dbus_get_sticker_info_by_display_type(GDBusConnection *gdbus_connection, const char *app_id, sticker_data_display_type_e type, int offset, int count, GVariantIter **id_iter)
+{
+    int ret;
+    GDBusMessage *reply = NULL;
+    GVariant *reply_body = NULL;
+
+    ret = _send_sync_message(gdbus_connection, g_variant_new("(siii)", app_id, (int)type, offset, count), &reply, "get_sticker_info_by_disp_type");
+    if (ret == STICKER_CLIENT_ERROR_NONE) {
+        reply_body = g_dbus_message_get_body(reply);
+        g_variant_get(reply_body, "(a(i))", &(*id_iter));
+    }
+
+    if (reply_body)
+        g_variant_unref(reply_body);
+
+    if (reply)
+        g_object_unref(reply);
+
+    return ret;
 }
\ No newline at end of file
diff --git a/client/sticker_dbus.h b/client/sticker_dbus.h
index 52dcd02..f29d8ea 100644
--- a/client/sticker_dbus.h
+++ b/client/sticker_dbus.h
@@ -58,6 +58,7 @@ int sticker_dbus_get_sticker_info_by_appid(GDBusConnection *gdbus_connection, co
 int sticker_dbus_get_sticker_info_by_type(GDBusConnection *gdbus_connection, const char *app_id, sticker_data_uri_type_e type, int offset, int count, GVariantIter **id_iter);
 int sticker_dbus_get_sticker_info_by_group(GDBusConnection *gdbus_connection, const char *app_id, const char *group, int offset, int count, GVariantIter **id_iter);
 int sticker_dbus_get_sticker_info_by_keyword(GDBusConnection *gdbus_connection, const char *app_id, const char *keyword, int offset, int count, GVariantIter **id_iter);
+int sticker_dbus_get_sticker_info_by_display_type(GDBusConnection *gdbus_connection, const char *app_id, sticker_data_display_type_e type, int offset, int count, GVariantIter **id_iter);
 
 #ifdef __cplusplus
 }
diff --git a/consumer/sticker_consumer.c b/consumer/sticker_consumer.c
index aa760de..0734de1 100644
--- a/consumer/sticker_consumer.c
+++ b/consumer/sticker_consumer.c
@@ -367,7 +367,7 @@ EXPORT_API int sticker_consumer_data_foreach_by_type(sticker_consumer_h consumer
 
     ret = sticker_dbus_get_sticker_info_by_type(consumer_handle->gdbus_connection, consumer_handle->app_id, type, offset, count, &id_iter);
     if (ret != STICKER_ERROR_NONE) {
-        LOGE("Failed to get sticker information by group : %d", ret);
+        LOGE("Failed to get sticker information by uri type : %d", ret);
         ret = STICKER_ERROR_OPERATION_FAILED;
         goto cleanup;
     }
@@ -456,3 +456,51 @@ cleanup:
 
     return ret;
 }
+
+EXPORT_API int sticker_consumer_data_foreach_by_display_type(sticker_consumer_h consumer_handle, int offset, int count, int *result, sticker_data_display_type_e type, sticker_consumer_data_foreach_cb callback, void *user_data)
+{
+    CHECK_STICKER_FEATURE();
+
+    int ret;
+    int info_id;
+    int sticker_count = 0;
+    GVariantIter *id_iter = NULL;
+
+    if (!consumer_handle || (offset < 0) || (count <= 0) || !result || (type < 1) || !callback)
+        return STICKER_ERROR_INVALID_PARAMETER;
+
+    ret = sticker_dbus_get_sticker_info_by_display_type(consumer_handle->gdbus_connection, consumer_handle->app_id, type, offset, count, &id_iter);
+    if (ret != STICKER_ERROR_NONE) {
+        LOGE("Failed to get sticker information by display type : %d", ret);
+        ret = STICKER_ERROR_OPERATION_FAILED;
+        goto cleanup;
+    }
+
+    if (id_iter) {
+        while (g_variant_iter_loop (id_iter, "(i)", &info_id)) {
+            sticker_data_h sticker_data = (sticker_data_h)calloc(1, sizeof(struct sticker_data_s));
+            if (!sticker_data) {
+                ret = STICKER_ERROR_OUT_OF_MEMORY;
+                goto cleanup;
+            }
+
+            ret = sticker_dbus_get_sticker_info_by_record_id(consumer_handle->gdbus_connection, sticker_data, info_id);
+            if (ret == STICKER_ERROR_NONE) {
+                sticker_count++;
+                callback(sticker_data, user_data);
+                _free_sticker_data(sticker_data);
+            } else {
+                _free_sticker_data(sticker_data);
+                goto cleanup;
+            }
+        }
+    }
+
+    *result = sticker_count;
+
+cleanup:
+    if (id_iter)
+        g_variant_iter_free(id_iter);
+
+    return ret;
+}
\ No newline at end of file
diff --git a/include/sticker_consumer.h b/include/sticker_consumer.h
index 5b55d7d..f7d7533 100644
--- a/include/sticker_consumer.h
+++ b/include/sticker_consumer.h
@@ -239,6 +239,29 @@ int sticker_consumer_group_list_foreach_all(sticker_consumer_h consumer_handle,
 int sticker_consumer_keyword_list_foreach_all(sticker_consumer_h consumer_handle, sticker_consumer_keyword_list_foreach_cb callback, void *user_data);
 
 /**
+ * @brief Retrieves all sticker data in the sticker database using display type.
+ * @details If you set the @a offset as @c 10 and @a count as @c 10, then only retrieved data from @c 10 to @c 19 will be invoked.
+ * @since_tizen 5.5
+ * @remarks It is not an error if @a result is smaller than @a count.
+ * @param[in] consumer_handle The sticker consumer handle
+ * @param[in] offset The start position (Starting from zero)
+ * @param[in] count The number of stickers to be retrieved with respect to the offset
+ * @param[out] result The number of stickers retrieved (zero indicates that no data was found)
+ * @param[in] type The display type of the sticker for getting sticker data
+ * @param[in] callback The callback function to invoke
+ * @param[in] user_data The user data to be passed to the callback function
+ * @return 0 on success, otherwise a negative error value
+ * @retval #STICKER_ERROR_NONE Successful
+ * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
+ * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #STICKER_ERROR_OUT_OF_MEMORY Out of memory
+ * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @post This function invokes sticker_consumer_data_foreach_cb() repeatedly for getting data.
+ * @see sticker_consumer_data_foreach_cb()
+ */
+int sticker_consumer_data_foreach_by_display_type(sticker_consumer_h consumer_handle, int offset, int count, int *result, sticker_data_display_type_e type, sticker_consumer_data_foreach_cb callback, void *user_data);
+
+/**
  * @}
  */
 
diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c
index 07f667a..4b1e479 100644
--- a/server/stickerd_data_manager.c
+++ b/server/stickerd_data_manager.c
@@ -139,6 +139,8 @@ static void _stickerd_client_dbus_method_call_handler(GDBusConnection *conn, con
         ret = stickerd_get_sticker_info_by_group(parameters, &reply_body);
     } else if (g_strcmp0(method_name, "get_sticker_info_by_keyword") == 0) {
         ret = stickerd_get_sticker_info_by_keyword(parameters, &reply_body);
+    } else if (g_strcmp0(method_name, "get_sticker_info_by_disp_type") == 0) {
+        ret = stickerd_get_sticker_info_by_display_type(parameters, &reply_body);
     }
 
     if (ret == STICKERD_SERVER_ERROR_NONE) {
@@ -276,6 +278,14 @@ int stickerd_register_dbus_interface(void)
             "          <arg type='i' name='count' direction='in'/>"
             "          <arg type='a(i)' name='id_list' direction='out'/>"
             "        </method>"
+
+            "        <method name='get_sticker_info_by_disp_type'>"
+            "          <arg type='s' name='app_id' direction='in'/>"
+            "          <arg type='i' name='type' direction='in'/>"
+            "          <arg type='i' name='offset' direction='in'/>"
+            "          <arg type='i' name='count' direction='in'/>"
+            "          <arg type='a(i)' name='id_list' direction='out'/>"
+            "        </method>"
             "  </interface>"
             "  </node>";
 
@@ -1351,3 +1361,39 @@ int stickerd_get_sticker_info_by_keyword(GVariant *parameters, GVariant **reply_
 
     return ret;
 }
+
+int stickerd_get_sticker_info_by_display_type(GVariant *parameters, GVariant **reply_body)
+{
+    int ret;
+    GList *id_list = NULL;
+    char *app_id = NULL;
+    int type, offset, count;
+    GVariantBuilder *id_builder = NULL;
+
+    g_variant_get(parameters, "(&siii)", &app_id, &type, &offset, &count);
+
+    ret = stickerd_db_get_record_id(STICKER_DB_STICKER_DISP_TYPE, &id_list, &type, app_id, offset, count);
+    if (ret != STICKERD_SERVER_ERROR_NONE) {
+        LOGE("Failed to get all sticker id");
+        if(id_list)
+            g_list_free_full(id_list, free);
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    id_builder = g_variant_builder_new(G_VARIANT_TYPE("a(i)"));
+    g_list_foreach(id_list, (GFunc) _set_id_builder, id_builder);
+
+    *reply_body = g_variant_new("(a(i))", id_builder);
+    if (*reply_body == NULL) {
+        LOGE("Failed to create reply_body");
+        ret = STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    if (id_list)
+        g_list_free_full(id_list, free);
+
+    if (id_builder)
+        g_variant_builder_unref(id_builder);
+
+    return ret;
+}
\ No newline at end of file
diff --git a/server/stickerd_data_manager.h b/server/stickerd_data_manager.h
index 8086dcb..246d616 100644
--- a/server/stickerd_data_manager.h
+++ b/server/stickerd_data_manager.h
@@ -43,6 +43,7 @@ int stickerd_get_sticker_info_by_app_id(GVariant *parameters, GVariant **reply_b
 int stickerd_get_sticker_info_by_type(GVariant *parameters, GVariant **reply_body);
 int stickerd_get_sticker_info_by_group(GVariant *parameters, GVariant **reply_body);
 int stickerd_get_sticker_info_by_keyword(GVariant *parameters, GVariant **reply_body);
+int stickerd_get_sticker_info_by_display_type(GVariant *parameters, GVariant **reply_body);
 
 #ifdef __cplusplus
 }
diff --git a/server/stickerd_db_manager.c b/server/stickerd_db_manager.c
index e0d1a1b..dcbf279 100644
--- a/server/stickerd_db_manager.c
+++ b/server/stickerd_db_manager.c
@@ -81,6 +81,7 @@
 #define STICKER_DB_GET_RECORD_ID_BY_TYPE "SELECT sticker_info_id FROM sticker_info WHERE type = ? AND app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
 #define STICKER_DB_GET_RECORD_ID_BY_GROUP "SELECT sticker_info_id from sticker_info WHERE group_name = ? AND app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
 #define STICKER_DB_GET_RECORD_ID_BY_KEYWORD "SELECT sticker_info_id FROM sticker_keyword_info WHERE keyword = ? INTERSECT SELECT sticker_info_id from sticker_info WHERE app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
+#define STICKER_DB_GET_RECORD_ID_BY_DISP_TYPE "SELECT sticker_info_id FROM sticker_info WHERE display_type = ? AND app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
 
 typedef enum
 {
@@ -135,6 +136,9 @@ static const char *_db_get_query(sticker_info_db_type sticker_type, command_type
             case STICKER_DB_STICKER_KEYWORD:
             query = STICKER_DB_GET_RECORD_ID_BY_KEYWORD;
             break;
+            case STICKER_DB_STICKER_DISP_TYPE:
+            query = STICKER_DB_GET_RECORD_ID_BY_DISP_TYPE;
+            break;
             default :
             query = "";
             break;
@@ -705,7 +709,7 @@ int stickerd_db_get_record_id(sticker_info_db_type type, GList **id_list, void *
         sqlite3_bind_int(stmt, 2, offset);
         sqlite3_bind_int(stmt, 3, count);
     } else {
-        if (type == STICKER_DB_STICKER_TYPE)
+        if (type == STICKER_DB_STICKER_TYPE || type == STICKER_DB_STICKER_DISP_TYPE)
             sqlite3_bind_int(stmt, 1, *(int *)data);
         else
             sqlite3_bind_text(stmt, 1, (char *)data, -1, SQLITE_TRANSIENT);
diff --git a/server/stickerd_db_manager.h b/server/stickerd_db_manager.h
index 9b87f81..51953bb 100644
--- a/server/stickerd_db_manager.h
+++ b/server/stickerd_db_manager.h
@@ -33,6 +33,7 @@ typedef enum {
     STICKER_DB_STICKER_DESCRIPTION,
     STICKER_DB_STICKER_GROUP,
     STICKER_DB_STICKER_KEYWORD,
+    STICKER_DB_STICKER_DISP_TYPE,
 } sticker_info_db_type;
 
 typedef struct {
-- 
2.7.4


From f5c7d980281eef0eb91c1f3ba5b9991e848e19fa Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Mon, 16 Mar 2020 17:15:11 +0900
Subject: [PATCH 05/16] Add a new API for retrieving group list using display
 type

Change-Id: Ib6f92eff0014daad1b427e4e8a194dc4d9a54cf7
---
 client/sticker_dbus.c          | 39 +++++++++++++++++++++++++++++++++++++++
 client/sticker_dbus.h          |  1 +
 consumer/sticker_consumer.c    | 28 ++++++++++++++++++++++++++++
 include/sticker_consumer.h     | 17 +++++++++++++++++
 server/stickerd_data_manager.c | 36 ++++++++++++++++++++++++++++++++++++
 server/stickerd_data_manager.h |  1 +
 server/stickerd_db_manager.c   | 38 ++++++++++++++++++++++++++++++++++++++
 server/stickerd_db_manager.h   |  1 +
 8 files changed, 161 insertions(+)

diff --git a/client/sticker_dbus.c b/client/sticker_dbus.c
index a5190f6..cef8b8c 100644
--- a/client/sticker_dbus.c
+++ b/client/sticker_dbus.c
@@ -968,4 +968,43 @@ int sticker_dbus_get_sticker_info_by_display_type(GDBusConnection *gdbus_connect
         g_object_unref(reply);
 
     return ret;
+}
+
+int sticker_dbus_get_group_list_by_display_type(GDBusConnection *gdbus_connection, const char *app_id, sticker_data_display_type_e type, GList **group_list)
+{
+    int ret;
+    GDBusMessage *reply = NULL;
+    GVariantIter *iter = NULL;
+    GVariant *reply_body = NULL;
+    char *group = NULL;
+
+    if (group_list == NULL) {
+        LOGE("group_list is invalid");
+        return STICKER_CLIENT_ERROR_INVALID_PARAMETER;
+    }
+
+    ret = _send_sync_message(gdbus_connection, g_variant_new("(si)", app_id, (int)type), &reply, "get_group_list_by_disp_type");
+    if (ret == STICKER_CLIENT_ERROR_NONE) {
+        reply_body = g_dbus_message_get_body(reply);
+        g_variant_get(reply_body, "(a(s))", &iter);
+
+        if (!iter) {
+            LOGD("failed to get iter");
+            return STICKER_CLIENT_ERROR_OPERATION_FAILED;
+        }
+
+        while (g_variant_iter_loop (iter, "(s)", &group)) {
+            *group_list = g_list_append(*group_list, strdup((const char *)group));
+        }
+
+        g_variant_iter_free(iter);
+    }
+
+    if (reply_body)
+        g_variant_unref(reply_body);
+
+    if (reply)
+        g_object_unref(reply);
+
+    return ret;
 }
\ No newline at end of file
diff --git a/client/sticker_dbus.h b/client/sticker_dbus.h
index f29d8ea..4ef7234 100644
--- a/client/sticker_dbus.h
+++ b/client/sticker_dbus.h
@@ -59,6 +59,7 @@ int sticker_dbus_get_sticker_info_by_type(GDBusConnection *gdbus_connection, con
 int sticker_dbus_get_sticker_info_by_group(GDBusConnection *gdbus_connection, const char *app_id, const char *group, int offset, int count, GVariantIter **id_iter);
 int sticker_dbus_get_sticker_info_by_keyword(GDBusConnection *gdbus_connection, const char *app_id, const char *keyword, int offset, int count, GVariantIter **id_iter);
 int sticker_dbus_get_sticker_info_by_display_type(GDBusConnection *gdbus_connection, const char *app_id, sticker_data_display_type_e type, int offset, int count, GVariantIter **id_iter);
+int sticker_dbus_get_group_list_by_display_type(GDBusConnection *gdbus_connection, const char *app_id, sticker_data_display_type_e type, GList **group_list);
 
 #ifdef __cplusplus
 }
diff --git a/consumer/sticker_consumer.c b/consumer/sticker_consumer.c
index 0734de1..5211f36 100644
--- a/consumer/sticker_consumer.c
+++ b/consumer/sticker_consumer.c
@@ -503,4 +503,32 @@ cleanup:
         g_variant_iter_free(id_iter);
 
     return ret;
+}
+
+EXPORT_API int sticker_consumer_group_list_foreach_by_display_type(sticker_consumer_h consumer_handle, sticker_data_display_type_e type, sticker_consumer_group_list_foreach_cb callback, void *user_data)
+{
+    CHECK_STICKER_FEATURE();
+
+    int ret;
+    GList *list = NULL;
+
+    if (!consumer_handle || (type < 1) || !callback)
+        return STICKER_ERROR_INVALID_PARAMETER;
+
+    ret = sticker_dbus_get_group_list_by_display_type(consumer_handle->gdbus_connection, consumer_handle->app_id, type, &list);
+    if (ret != STICKER_ERROR_NONE) {
+        LOGE("Failed to get group list : %d", ret);
+        ret = STICKER_ERROR_OPERATION_FAILED;
+        goto cleanup;
+    }
+
+    for(GList *tmp = g_list_first(list); tmp != NULL; tmp=tmp->next) {
+        callback((const char *)tmp->data, user_data);
+    }
+
+cleanup:
+    if (list)
+        g_list_free_full(list, free);
+
+    return ret;
 }
\ No newline at end of file
diff --git a/include/sticker_consumer.h b/include/sticker_consumer.h
index f7d7533..ac2428e 100644
--- a/include/sticker_consumer.h
+++ b/include/sticker_consumer.h
@@ -262,6 +262,23 @@ int sticker_consumer_keyword_list_foreach_all(sticker_consumer_h consumer_handle
 int sticker_consumer_data_foreach_by_display_type(sticker_consumer_h consumer_handle, int offset, int count, int *result, sticker_data_display_type_e type, sticker_consumer_data_foreach_cb callback, void *user_data);
 
 /**
+ * @brief Retrieves all group name in the sticker database using display type.
+ * @since_tizen 5.5
+ * @param[in] consumer_handle The sticker consumer handle
+ * @param[in] type The display type of the sticker for getting sticker data
+ * @param[in] callback The callback function to invoke
+ * @param[in] user_data The user data to be passed to the callback function
+ * @return 0 on success, otherwise a negative error value
+ * @retval #STICKER_ERROR_NONE Successful
+ * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
+ * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @post This function invokes sticker_consumer_group_list_foreach_cb() repeatedly for getting data.
+ * @see sticker_consumer_group_list_foreach_cb()
+ */
+int sticker_consumer_group_list_foreach_by_display_type(sticker_consumer_h consumer_handle, sticker_data_display_type_e type, sticker_consumer_group_list_foreach_cb callback, void *user_data);
+
+/**
  * @}
  */
 
diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c
index 4b1e479..9b344d4 100644
--- a/server/stickerd_data_manager.c
+++ b/server/stickerd_data_manager.c
@@ -141,6 +141,8 @@ static void _stickerd_client_dbus_method_call_handler(GDBusConnection *conn, con
         ret = stickerd_get_sticker_info_by_keyword(parameters, &reply_body);
     } else if (g_strcmp0(method_name, "get_sticker_info_by_disp_type") == 0) {
         ret = stickerd_get_sticker_info_by_display_type(parameters, &reply_body);
+    } else if (g_strcmp0(method_name, "get_group_list_by_disp_type") == 0) {
+        ret = stickerd_get_group_list_by_disp_type(parameters, &reply_body);
     }
 
     if (ret == STICKERD_SERVER_ERROR_NONE) {
@@ -286,6 +288,12 @@ int stickerd_register_dbus_interface(void)
             "          <arg type='i' name='count' direction='in'/>"
             "          <arg type='a(i)' name='id_list' direction='out'/>"
             "        </method>"
+
+            "        <method name='get_group_list_by_disp_type'>"
+            "          <arg type='s' name='app_id' direction='in'/>"
+            "          <arg type='i' name='disp_type' direction='in'/>"
+            "          <arg type='a(s)' name='group_list' direction='out'/>"
+            "        </method>"
             "  </interface>"
             "  </node>";
 
@@ -1396,4 +1404,32 @@ int stickerd_get_sticker_info_by_display_type(GVariant *parameters, GVariant **r
         g_variant_builder_unref(id_builder);
 
     return ret;
+}
+
+int stickerd_get_group_list_by_disp_type(GVariant *parameters, GVariant **reply_body)
+{
+    int ret;
+    GVariantBuilder *builder = NULL;
+    char *app_id = NULL;
+    int disp_type;
+
+    g_variant_get(parameters, "(&si)", &app_id, &disp_type);
+
+    builder = g_variant_builder_new(G_VARIANT_TYPE("a(s)"));
+    ret = stickerd_db_get_group_list_by_display_type(builder, app_id, disp_type);
+    if (ret != STICKERD_SERVER_ERROR_NONE) {
+        LOGE("Failed to get sticker group list");
+        g_variant_builder_unref(builder);
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    *reply_body = g_variant_new("(a(s))", builder);
+    g_variant_builder_unref(builder);
+
+    if (*reply_body == NULL) {
+        LOGE("Failed to create reply_body");
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    return ret;
 }
\ No newline at end of file
diff --git a/server/stickerd_data_manager.h b/server/stickerd_data_manager.h
index 246d616..0c4c979 100644
--- a/server/stickerd_data_manager.h
+++ b/server/stickerd_data_manager.h
@@ -44,6 +44,7 @@ int stickerd_get_sticker_info_by_type(GVariant *parameters, GVariant **reply_bod
 int stickerd_get_sticker_info_by_group(GVariant *parameters, GVariant **reply_body);
 int stickerd_get_sticker_info_by_keyword(GVariant *parameters, GVariant **reply_body);
 int stickerd_get_sticker_info_by_display_type(GVariant *parameters, GVariant **reply_body);
+int stickerd_get_group_list_by_disp_type(GVariant *parameters, GVariant **reply_body);
 
 #ifdef __cplusplus
 }
diff --git a/server/stickerd_db_manager.c b/server/stickerd_db_manager.c
index dcbf279..bc172e2 100644
--- a/server/stickerd_db_manager.c
+++ b/server/stickerd_db_manager.c
@@ -82,6 +82,7 @@
 #define STICKER_DB_GET_RECORD_ID_BY_GROUP "SELECT sticker_info_id from sticker_info WHERE group_name = ? AND app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
 #define STICKER_DB_GET_RECORD_ID_BY_KEYWORD "SELECT sticker_info_id FROM sticker_keyword_info WHERE keyword = ? INTERSECT SELECT sticker_info_id from sticker_info WHERE app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
 #define STICKER_DB_GET_RECORD_ID_BY_DISP_TYPE "SELECT sticker_info_id FROM sticker_info WHERE display_type = ? AND app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
+#define STICKER_DB_GET_GROUP_LIST_BY_DISP_TYPE "SELECT DISTINCT group_name FROM sticker_info WHERE display_type = ? AND app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?))"
 
 typedef enum
 {
@@ -735,4 +736,41 @@ cleanup:
     sqlite3_close(db);
 
     return STICKERD_SERVER_ERROR_DB_FAILED;
+}
+
+int stickerd_db_get_group_list_by_display_type(GVariantBuilder *builder, char *app_id, int disp_type)
+{
+    int ret;
+    sqlite3 *db = NULL;
+    sqlite3_stmt *stmt = NULL;
+
+    db = _db_open();
+    if (!db)
+        return STICKERD_SERVER_ERROR_DB_FAILED;
+
+    ret = sqlite3_prepare_v2(db, STICKER_DB_GET_GROUP_LIST_BY_DISP_TYPE, -1, &stmt, NULL);
+    if (ret != SQLITE_OK) {
+        LOGE("fail to get group list : %s", sqlite3_errmsg(db));
+        goto cleanup;
+    }
+
+    sqlite3_bind_int(stmt, 1, disp_type);
+    sqlite3_bind_text(stmt, 2, app_id, -1, SQLITE_TRANSIENT);
+
+    while (sqlite3_step(stmt) == SQLITE_ROW) {
+        const unsigned char *group = sqlite3_column_text(stmt, 0);
+        if (group)
+            g_variant_builder_add(builder, "(s)", strdup((const char *)group));
+    }
+
+    sqlite3_finalize(stmt);
+    sqlite3_close(db);
+
+    return STICKERD_SERVER_ERROR_NONE;
+
+cleanup:
+    sqlite3_finalize(stmt);
+    sqlite3_close(db);
+
+    return STICKERD_SERVER_ERROR_DB_FAILED;
 }
\ No newline at end of file
diff --git a/server/stickerd_db_manager.h b/server/stickerd_db_manager.h
index 51953bb..2ef2fd5 100644
--- a/server/stickerd_db_manager.h
+++ b/server/stickerd_db_manager.h
@@ -57,6 +57,7 @@ int stickerd_db_get_group_list(GVariantBuilder *builder, char *app_id);
 int stickerd_db_get_keyword_list(GVariantBuilder *builder, char *app_id);
 int stickerd_db_get_sticker_count(int *count, char *app_id);
 int stickerd_db_get_record_id(sticker_info_db_type type, GList **id_list, void *data, char *app_id, int offset, int count);
+int stickerd_db_get_group_list_by_display_type(GVariantBuilder *builder, char *app_id, int disp_type);
 
 #ifdef __cplusplus
 }
-- 
2.7.4


From 41ef7c1f28f248b4cb015c7df6f32104b8408c75 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Mon, 16 Mar 2020 19:29:11 +0900
Subject: [PATCH 06/16] Add interface to update sticker display type

Change-Id: I34f96920bc8acb6aab9c76395732dfa084297e8c
---
 client/sticker_dbus.c          |  7 +++++++
 server/stickerd_data_manager.c | 30 ++++++++++++++++++++++++++++++
 server/stickerd_data_manager.h |  1 +
 server/stickerd_db_manager.c   |  6 +++++-
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/client/sticker_dbus.c b/client/sticker_dbus.c
index cef8b8c..242e978 100644
--- a/client/sticker_dbus.c
+++ b/client/sticker_dbus.c
@@ -702,6 +702,13 @@ int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_
             LOGE("failed to update sticker group");
     }
 
+    if (sticker_data->disp_type != 0 && sticker_data->disp_type != origin_data->disp_type) {
+        LOGD("origin_disp_type : %d, new_disp_type : %d", origin_data->disp_type, sticker_data->disp_type);
+        ret = _send_sync_message(gdbus_connection, g_variant_new("(ii)", sticker_data->sticker_info_id, sticker_data->disp_type), &reply, "update_sticker_disp_type");
+        if (ret != STICKER_CLIENT_ERROR_NONE)
+            LOGE("failed to update sticker display type");
+    }
+
     if (sticker_data->keyword) {
         GVariantBuilder *keyword_builder;
         keyword_builder = g_variant_builder_new(G_VARIANT_TYPE("a(s)"));
diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c
index 9b344d4..414fc12 100644
--- a/server/stickerd_data_manager.c
+++ b/server/stickerd_data_manager.c
@@ -143,6 +143,8 @@ static void _stickerd_client_dbus_method_call_handler(GDBusConnection *conn, con
         ret = stickerd_get_sticker_info_by_display_type(parameters, &reply_body);
     } else if (g_strcmp0(method_name, "get_group_list_by_disp_type") == 0) {
         ret = stickerd_get_group_list_by_disp_type(parameters, &reply_body);
+    } else if (g_strcmp0(method_name, "update_sticker_disp_type") == 0) {
+        ret = stickerd_update_sticker_disp_type(parameters, &reply_body);
     }
 
     if (ret == STICKERD_SERVER_ERROR_NONE) {
@@ -294,6 +296,11 @@ int stickerd_register_dbus_interface(void)
             "          <arg type='i' name='disp_type' direction='in'/>"
             "          <arg type='a(s)' name='group_list' direction='out'/>"
             "        </method>"
+
+            "        <method name='update_sticker_disp_type'>"
+            "          <arg type='i' name='record_id' direction='in'/>"
+            "          <arg type='i' name='disp_type' direction='in'/>"
+            "        </method>"
             "  </interface>"
             "  </node>";
 
@@ -1432,4 +1439,27 @@ int stickerd_get_group_list_by_disp_type(GVariant *parameters, GVariant **reply_
     }
 
     return ret;
+}
+
+int stickerd_update_sticker_disp_type(GVariant *parameters, GVariant **reply_body)
+{
+    int ret;
+    int record_id;
+    int disp_type;
+
+    *reply_body = g_variant_new("()");
+    if (*reply_body == NULL) {
+        LOGE("Failed to create reply_body");
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    g_variant_get(parameters, "(ii)", &record_id, &disp_type);
+
+    ret = stickerd_db_update_sticker_info(record_id, STICKER_DB_STICKER_DISP_TYPE, &disp_type);
+    if (ret != STICKERD_SERVER_ERROR_NONE) {
+        LOGE("Failed to update sticker disp_type");
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    return ret;
 }
\ No newline at end of file
diff --git a/server/stickerd_data_manager.h b/server/stickerd_data_manager.h
index 0c4c979..e8e3a9e 100644
--- a/server/stickerd_data_manager.h
+++ b/server/stickerd_data_manager.h
@@ -45,6 +45,7 @@ int stickerd_get_sticker_info_by_group(GVariant *parameters, GVariant **reply_bo
 int stickerd_get_sticker_info_by_keyword(GVariant *parameters, GVariant **reply_body);
 int stickerd_get_sticker_info_by_display_type(GVariant *parameters, GVariant **reply_body);
 int stickerd_get_group_list_by_disp_type(GVariant *parameters, GVariant **reply_body);
+int stickerd_update_sticker_disp_type(GVariant *parameters, GVariant **reply_body);
 
 #ifdef __cplusplus
 }
diff --git a/server/stickerd_db_manager.c b/server/stickerd_db_manager.c
index bc172e2..3b54fb4 100644
--- a/server/stickerd_db_manager.c
+++ b/server/stickerd_db_manager.c
@@ -69,6 +69,7 @@
 #define STICKER_DB_UPDATE_STICKER_THUMBNAIL "UPDATE sticker_info SET thumbnail = ?, date = DateTime('now','localtime') WHERE sticker_info_id = ?"
 #define STICKER_DB_UPDATE_STICKER_DESCRIPTION "UPDATE sticker_info SET description = ?, date = DateTime('now','localtime') WHERE sticker_info_id = ?"
 #define STICKER_DB_UPDATE_STICKER_GROUP "UPDATE sticker_info SET group_name = ?, date = DateTime('now','localtime') WHERE sticker_info_id = ?"
+#define STICKER_DB_UPDATE_STICKER_DISP_TYPE "UPDATE sticker_info SET display_type = ?, date = DateTime('now','localtime') WHERE sticker_info_id = ?"
 
 #define STICKER_DB_GET_LATEST_RECORD_ID "SELECT sticker_info_id FROM sticker_info ORDER BY sticker_info_id DESC LIMIT 1"
 #define STICKER_DB_GET_STICKER_INFO_BY_RECORD_ID "SELECT * FROM sticker_info WHERE sticker_info_id = ?"
@@ -116,6 +117,9 @@ static const char *_db_get_query(sticker_info_db_type sticker_type, command_type
             case STICKER_DB_STICKER_KEYWORD:
             query = STICKER_DB_DELETE_STICKER_KEYWORD_INFO;
             break;
+            case STICKER_DB_STICKER_DISP_TYPE:
+            query = STICKER_DB_UPDATE_STICKER_DISP_TYPE;
+            break;
             default :
             query = "";
             break;
@@ -438,7 +442,7 @@ int stickerd_db_update_sticker_info(int record_id, sticker_info_db_type type, vo
         goto cleanup;
     }
 
-    if (type == STICKER_DB_STICKER_TYPE) {
+    if (type == STICKER_DB_STICKER_TYPE || type == STICKER_DB_STICKER_DISP_TYPE) {
         sqlite3_bind_int(stmt, 1, *(int *)data);
     } else if (type == STICKER_DB_STICKER_KEYWORD) {
         sqlite3_bind_int(stmt, 1, record_id);
-- 
2.7.4


From b6a60aea32fb77a347eeee9be430b444f2c2a8f5 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Mon, 16 Mar 2020 19:53:59 +0900
Subject: [PATCH 07/16] Add error codes

Change-Id: Ibdde0b8c7ed6f1068bc80ccb950e05e3b0925d50
---
 client/sticker_data.c          | 10 +++++-----
 client/sticker_dbus.c          | 37 +++++++++++++++++++++++++------------
 client/sticker_dbus.h          |  3 +++
 include/sticker_data.h         | 11 +++++------
 include/sticker_error.h        |  3 +++
 include/sticker_provider.h     |  4 ++++
 provider/sticker_provider.c    | 14 ++++++++++++--
 server/stickerd_data_manager.c | 10 +++++++---
 server/stickerd_error.h        |  4 +++-
 9 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/client/sticker_data.c b/client/sticker_data.c
index b76e7a8..555a23a 100644
--- a/client/sticker_data.c
+++ b/client/sticker_data.c
@@ -223,7 +223,7 @@ EXPORT_API int sticker_data_get_app_id(sticker_data_h data_handle, char **app_id
         return STICKER_ERROR_INVALID_PARAMETER;
 
     if (!data_handle->app_id)
-        return STICKER_ERROR_OPERATION_FAILED;
+        return STICKER_ERROR_NO_DATA;
 
     *app_id = strdup(data_handle->app_id);
 
@@ -268,7 +268,7 @@ EXPORT_API int sticker_data_get_uri(sticker_data_h data_handle, sticker_data_uri
         return STICKER_ERROR_INVALID_PARAMETER;
 
     if (!data_handle->type || !data_handle->uri)
-        return STICKER_ERROR_OPERATION_FAILED;
+        return STICKER_ERROR_NO_DATA;
 
     *type = data_handle->type;
     *uri = strdup(data_handle->uri);
@@ -284,7 +284,7 @@ EXPORT_API int sticker_data_foreach_keyword(sticker_data_h data_handle, sticker_
         return STICKER_ERROR_INVALID_PARAMETER;
 
     if (!data_handle->keyword)
-        return STICKER_ERROR_OPERATION_FAILED;
+        return STICKER_ERROR_NO_DATA;
 
     GList *list = NULL;
     for(list = g_list_first(data_handle->keyword); list != NULL; list=list->next) {
@@ -357,7 +357,7 @@ EXPORT_API int sticker_data_get_group_name(sticker_data_h data_handle, char **gr
         return STICKER_ERROR_INVALID_PARAMETER;
 
     if (!data_handle->group)
-        return STICKER_ERROR_OPERATION_FAILED;
+        return STICKER_ERROR_NO_DATA;
 
     *group = strdup(data_handle->group);
 
@@ -440,7 +440,7 @@ EXPORT_API int sticker_data_get_date(sticker_data_h data_handle, char **date)
         return STICKER_ERROR_INVALID_PARAMETER;
 
     if (!data_handle->date)
-        return STICKER_ERROR_OPERATION_FAILED;
+        return STICKER_ERROR_NO_DATA;
 
     *date = strdup(data_handle->date);
 
diff --git a/client/sticker_dbus.c b/client/sticker_dbus.c
index 242e978..8902922 100644
--- a/client/sticker_dbus.c
+++ b/client/sticker_dbus.c
@@ -667,46 +667,58 @@ int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_
         return ret;
     }
 
-    if (sticker_data->type != 0 && sticker_data->type != origin_data->type) {
-        LOGD("origin_type : %d, new_type : %d", origin_data->type, sticker_data->type);
-        ret = _send_sync_message(gdbus_connection, g_variant_new("(ii)", sticker_data->sticker_info_id, sticker_data->type), &reply, "update_sticker_type");
-        if (ret != STICKER_CLIENT_ERROR_NONE)
-            LOGE("failed to update sticker type");
-    }
-
     if (sticker_data->uri && strcmp(sticker_data->uri, origin_data->uri) != 0) {
         LOGD("origin_uri : %s, new_uri : %s", origin_data->uri, sticker_data->uri);
         ret = _send_sync_message(gdbus_connection, g_variant_new("(isis)", sticker_data->sticker_info_id, sticker_data->app_id, sticker_data->type, sticker_data->uri), &reply, "update_sticker_uri");
-        if (ret != STICKER_CLIENT_ERROR_NONE)
+        if (ret != STICKER_CLIENT_ERROR_NONE) {
             LOGE("failed to update sticker uri");
+            goto cleanup;
+        }
+    }
+
+    if (sticker_data->type != 0 && sticker_data->type != origin_data->type) {
+        LOGD("origin_type : %d, new_type : %d", origin_data->type, sticker_data->type);
+        ret = _send_sync_message(gdbus_connection, g_variant_new("(ii)", sticker_data->sticker_info_id, sticker_data->type), &reply, "update_sticker_type");
+        if (ret != STICKER_CLIENT_ERROR_NONE) {
+            LOGE("failed to update sticker type");
+            goto cleanup;
+        }
     }
 
     if (sticker_data->thumbnail && strcmp(sticker_data->thumbnail, origin_data->thumbnail) != 0) {
         LOGD("origin_thumbnail : %s, new_thumbnail : %s", origin_data->thumbnail, sticker_data->thumbnail);
         ret = _send_sync_message(gdbus_connection, g_variant_new("(is)", sticker_data->sticker_info_id, sticker_data->thumbnail), &reply, "update_sticker_thumbnail");
-        if (ret != STICKER_CLIENT_ERROR_NONE)
+        if (ret != STICKER_CLIENT_ERROR_NONE) {
             LOGE("failed to update sticker thumbnail");
+            goto cleanup;
+        }
     }
 
     if (sticker_data->description && strcmp(sticker_data->description, origin_data->description) != 0) {
         LOGD("origin_description : %s, new_description : %s", origin_data->description, sticker_data->description);
         ret = _send_sync_message(gdbus_connection, g_variant_new("(is)", sticker_data->sticker_info_id, sticker_data->description), &reply, "update_sticker_description");
-        if (ret != STICKER_CLIENT_ERROR_NONE)
+        if (ret != STICKER_CLIENT_ERROR_NONE) {
             LOGE("failed to update sticker description");
+            goto cleanup;
+        }
     }
 
     if (sticker_data->group && strcmp(sticker_data->group, origin_data->group) != 0) {
         LOGD("origin_group : %s, new_group : %s", origin_data->group, sticker_data->group);
         ret = _send_sync_message(gdbus_connection, g_variant_new("(is)", sticker_data->sticker_info_id, sticker_data->group), &reply, "update_sticker_group");
-        if (ret != STICKER_CLIENT_ERROR_NONE)
+        if (ret != STICKER_CLIENT_ERROR_NONE) {
             LOGE("failed to update sticker group");
+            goto cleanup;
+        }
     }
 
     if (sticker_data->disp_type != 0 && sticker_data->disp_type != origin_data->disp_type) {
         LOGD("origin_disp_type : %d, new_disp_type : %d", origin_data->disp_type, sticker_data->disp_type);
         ret = _send_sync_message(gdbus_connection, g_variant_new("(ii)", sticker_data->sticker_info_id, sticker_data->disp_type), &reply, "update_sticker_disp_type");
-        if (ret != STICKER_CLIENT_ERROR_NONE)
+        if (ret != STICKER_CLIENT_ERROR_NONE) {
             LOGE("failed to update sticker display type");
+            goto cleanup;
+        }
     }
 
     if (sticker_data->keyword) {
@@ -719,6 +731,7 @@ int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_
         g_variant_builder_unref(keyword_builder);
     }
 
+cleanup:
     _free_sticker_data(origin_data);
 
     if (reply_body)
diff --git a/client/sticker_dbus.h b/client/sticker_dbus.h
index 4ef7234..7640435 100644
--- a/client/sticker_dbus.h
+++ b/client/sticker_dbus.h
@@ -40,6 +40,9 @@ enum sticker_client_error {
     STICKER_CLIENT_ERROR_SERVICE_NOT_READY,
     STICKER_CLIENT_ERROR_OPERATION_FAILED,
     STICKER_CLIENT_ERROR_IO_ERROR,
+    STICKER_CLIENT_ERROR_DB_FAILED,
+    STICKER_CLIENT_ERROR_FILE_EXISTS,
+    STICKER_CLIENT_ERROR_NO_SUCH_FILE,
 };
 
 int sticker_dbus_init(GDBusConnection **gdbus_connection, int *server_watcher_id,
diff --git a/include/sticker_data.h b/include/sticker_data.h
index fc1f8c3..e27197c 100644
--- a/include/sticker_data.h
+++ b/include/sticker_data.h
@@ -123,7 +123,7 @@ int sticker_data_clone(sticker_data_h origin_handle, sticker_data_h *target_hand
  * @retval #STICKER_ERROR_NONE Successful
  * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
  * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @retval #STICKER_ERROR_NO_DATA No data available
  */
 int sticker_data_get_app_id(sticker_data_h data_handle, char **app_id);
 
@@ -139,7 +139,6 @@ int sticker_data_get_app_id(sticker_data_h data_handle, char **app_id);
  * @retval #STICKER_ERROR_NONE Successful
  * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
  * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
  * @see sticker_data_get_uri()
  */
 int sticker_data_set_uri(sticker_data_h data_handle, sticker_data_uri_type_e type, const char *uri);
@@ -155,7 +154,7 @@ int sticker_data_set_uri(sticker_data_h data_handle, sticker_data_uri_type_e typ
  * @retval #STICKER_ERROR_NONE Successful
  * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
  * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @retval #STICKER_ERROR_NO_DATA No data available
  * @see sticker_data_set_uri()
  */
 int sticker_data_get_uri(sticker_data_h data_handle, sticker_data_uri_type_e *type, char **uri);
@@ -170,7 +169,7 @@ int sticker_data_get_uri(sticker_data_h data_handle, sticker_data_uri_type_e *ty
  * @retval #STICKER_ERROR_NONE Successful
  * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
  * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @retval #STICKER_ERROR_NO_DATA No data available
  * @post This function invokes sticker_data_keyword_foreach_cb() repeatedly for getting keywords.
  * @see sticker_data_keyword_foreach_cb()
  * @see sticker_data_add_keyword()
@@ -234,7 +233,7 @@ int sticker_data_set_group_name(sticker_data_h data_handle, const char *group);
  * @retval #STICKER_ERROR_NONE Successful
  * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
  * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @retval #STICKER_ERROR_NO_DATA No data available
  * @see sticker_data_set_group()
  */
 int sticker_data_get_group_name(sticker_data_h data_handle, char **group);
@@ -309,7 +308,7 @@ int sticker_data_get_description(sticker_data_h data_handle, char **description)
  * @retval #STICKER_ERROR_NONE Successful
  * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
  * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @retval #STICKER_ERROR_NO_DATA No data available
  */
 int sticker_data_get_date(sticker_data_h data_handle, char **date);
 
diff --git a/include/sticker_error.h b/include/sticker_error.h
index a38b9c6..fea1302 100644
--- a/include/sticker_error.h
+++ b/include/sticker_error.h
@@ -45,6 +45,9 @@ typedef enum {
     STICKER_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
     STICKER_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */
     STICKER_ERROR_OPERATION_FAILED = TIZEN_ERROR_STICKER | 0x0001, /**< Operation failed */
+    STICKER_ERROR_FILE_EXISTS = TIZEN_ERROR_FILE_EXISTS, /**< File exists */
+    STICKER_ERROR_NO_DATA = TIZEN_ERROR_NO_DATA, /**< No data available */
+    STICKER_ERROR_NO_SUCH_FILE = TIZEN_ERROR_FILE_EXISTS, /**< No such file */
 } sticker_error_e;
 
 /**
diff --git a/include/sticker_provider.h b/include/sticker_provider.h
index 6ea0234..e7367b3 100644
--- a/include/sticker_provider.h
+++ b/include/sticker_provider.h
@@ -107,6 +107,8 @@ int sticker_provider_destroy(sticker_provider_h provider_handle);
  * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
  * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @retval #STICKER_ERROR_FILE_EXISTS File exists
+ * @retval #STICKER_ERROR_NO_SUCH_FILE No such file
  * @see sticker_provider_update_data()
  * @see sticker_provider_delete_data()
  */
@@ -175,6 +177,8 @@ int sticker_provider_insert_data_by_json_file(sticker_provider_h provider_handle
  * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
  * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @retval #STICKER_ERROR_FILE_EXISTS File exists
+ * @retval #STICKER_ERROR_NO_SUCH_FILE No such file
  * @see sticker_provider_insert_data()
  * @see sticker_provider_delete_data()
  */
diff --git a/provider/sticker_provider.c b/provider/sticker_provider.c
index a271ca6..9ef5b60 100644
--- a/provider/sticker_provider.c
+++ b/provider/sticker_provider.c
@@ -133,7 +133,12 @@ EXPORT_API int sticker_provider_insert_data(sticker_provider_h provider_handle,
     ret = sticker_dbus_insert_sticker_info(provider_handle->gdbus_connection, data_handle);
     if (ret != STICKER_ERROR_NONE) {
         LOGE("Failed to insert sticker information : %d", ret);
-        return STICKER_ERROR_OPERATION_FAILED;
+        if (ret == STICKER_CLIENT_ERROR_FILE_EXISTS)
+            return STICKER_ERROR_FILE_EXISTS;
+        else if (ret == STICKER_CLIENT_ERROR_NO_SUCH_FILE)
+            return STICKER_ERROR_NO_SUCH_FILE;
+        else
+            return STICKER_ERROR_OPERATION_FAILED;
     }
 
     return STICKER_ERROR_NONE;
@@ -233,7 +238,12 @@ EXPORT_API int sticker_provider_update_data(sticker_provider_h provider_handle,
     ret = sticker_dbus_update_sticker_info(provider_handle->gdbus_connection, data_handle);
     if (ret != STICKER_ERROR_NONE) {
         LOGE("Failed to update sticker information : %d", ret);
-        return STICKER_ERROR_OPERATION_FAILED;
+        if (ret == STICKER_CLIENT_ERROR_FILE_EXISTS)
+            return STICKER_ERROR_FILE_EXISTS;
+        else if (ret == STICKER_CLIENT_ERROR_NO_SUCH_FILE)
+            return STICKER_ERROR_NO_SUCH_FILE;
+        else
+            return STICKER_ERROR_OPERATION_FAILED;
     }
 
     return STICKER_ERROR_NONE;
diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c
index 414fc12..f30cd8e 100644
--- a/server/stickerd_data_manager.c
+++ b/server/stickerd_data_manager.c
@@ -572,12 +572,12 @@ int stickerd_insert_sticker_info(GVariant *parameters, GVariant **reply_body)
             sticker_info->uri = _convert_sticker_uri(sticker_info->uri, sticker_info->app_id);
             if (!sticker_info->uri) {
                 LOGE("failed to copy sticker file");
-                ret = STICKERD_SERVER_ERROR_OPERATION_FAILED;
+                ret = STICKERD_SERVER_ERROR_FILE_EXISTS;
                 goto cleanup;
             }
         } else {
             LOGE("sticker file does not exist");
-            ret = STICKERD_SERVER_ERROR_OPERATION_FAILED;
+            ret = STICKERD_SERVER_ERROR_NO_SUCH_FILE;
             goto cleanup;
         }
     }
@@ -715,6 +715,8 @@ int stickerd_insert_sticker_info_by_json(GVariant *parameters, GVariant **reply_
                     sticker_info->uri = _convert_sticker_uri(sticker_info->uri, sticker_info->app_id);
                     if (!sticker_info->uri)
                         goto free_memory;
+                } else {
+                    goto free_memory;
                 }
             }
 
@@ -835,8 +837,10 @@ int stickerd_update_sticker_uri(GVariant *parameters, GVariant **reply_body)
             uri = _convert_sticker_uri(uri, app_id);
             if (!uri) {
                 LOGE("failed to copy sticker file");
-                return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+                return STICKERD_SERVER_ERROR_FILE_EXISTS;
             }
+        } else {
+            return STICKERD_SERVER_ERROR_NO_SUCH_FILE;
         }
     }
 
diff --git a/server/stickerd_error.h b/server/stickerd_error.h
index 2afea16..6d1b444 100644
--- a/server/stickerd_error.h
+++ b/server/stickerd_error.h
@@ -31,13 +31,15 @@ extern "C" {
  */
 enum stickerd_server_error {
     STICKERD_SERVER_ERROR_NONE,
-    STICKERD_SERVER_ERROR_IO_ERROR,
     STICKERD_SERVER_ERROR_INVALID_PARAMETER,
     STICKERD_SERVER_ERROR_PERMISSION_DENIED,
     STICKERD_SERVER_ERROR_OUT_OF_MEMORY,
     STICKERD_SERVER_ERROR_SERVICE_NOT_READY,
     STICKERD_SERVER_ERROR_OPERATION_FAILED,
+    STICKERD_SERVER_ERROR_IO_ERROR,
     STICKERD_SERVER_ERROR_DB_FAILED,
+    STICKERD_SERVER_ERROR_FILE_EXISTS,
+    STICKERD_SERVER_ERROR_NO_SUCH_FILE,
 };
 
 /**
-- 
2.7.4


From 002014050cc15255d4334685f94462c89d6b51d6 Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Wed, 18 Mar 2020 16:50:30 +0900
Subject: [PATCH 08/16] Split sticker data into another file

Change-Id: I3c23542e657757e0250fea67effb196677ae08c7
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
---
 receiver/CMakeLists.txt       |  1 +
 receiver/inc/sticker_data.h   | 37 +++++++++++++++++++++++++++++++++++++
 receiver/inc/sticker_info.h   |  2 +-
 receiver/src/ft.cpp           | 26 ++------------------------
 receiver/src/sticker_data.cpp | 36 ++++++++++++++++++++++++++++++++++++
 5 files changed, 77 insertions(+), 25 deletions(-)
 create mode 100644 receiver/inc/sticker_data.h
 create mode 100644 receiver/src/sticker_data.cpp

diff --git a/receiver/CMakeLists.txt b/receiver/CMakeLists.txt
index 73d4503..4a875d9 100644
--- a/receiver/CMakeLists.txt
+++ b/receiver/CMakeLists.txt
@@ -3,6 +3,7 @@ PROJECT(sticker-receiver CXX)
 
 SET(SRCS
 	src/main.cpp
+	src/sticker_data.cpp
 	src/ft.cpp
 	src/sticker_info.cpp
 	src/message.cpp
diff --git a/receiver/inc/sticker_data.h b/receiver/inc/sticker_data.h
new file mode 100644
index 0000000..97f82cc
--- /dev/null
+++ b/receiver/inc/sticker_data.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __STICKER_DATA_H__
+#define __STICKER_DATA_H__
+
+#include <string>
+
+using namespace std;
+
+struct sticker_info {
+    sticker_info();
+    ~sticker_info();
+
+    void reset();
+
+    string file_path;
+    string group;
+    string keyword;
+    string disp_type;
+    string description;
+};
+
+#endif /* __STICKER_DATA_H__ */
diff --git a/receiver/inc/sticker_info.h b/receiver/inc/sticker_info.h
index 86b6c88..8231585 100644
--- a/receiver/inc/sticker_info.h
+++ b/receiver/inc/sticker_info.h
@@ -21,4 +21,4 @@ int create_sticker_provider_handle(void);
 void destroy_sticker_provider_handle(void);
 void delete_sticker_data(const char *fileName);
 
-#endif /* __STICKER_INF_H__ */
+#endif /* __STICKER_INFO_H__ */
diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp
index 61afdc0..4a2ec79 100644
--- a/receiver/src/ft.cpp
+++ b/receiver/src/ft.cpp
@@ -35,6 +35,7 @@
 #include "ft.h"
 #include "log.h"
 #include "sticker_info.h"
+#include "../inc/sticker_data.h"
 #include "message.h"
 #include "sync_alarm.h"
 
@@ -77,21 +78,6 @@ struct request {
     string type;
 };
 
-static void _reset_sticker_data();
-
-struct sticker_info {
-    string file_path;
-    string group;
-    string keyword;
-    string disp_type;
-    string description;
-
-    sticker_info()
-    {
-        _reset_sticker_data();
-    }
-};
-
 static struct sap_info_s priv_data = { 0 };
 static struct sticker_info sticker_data;
 static struct request pending_request, current_request;
@@ -393,14 +379,6 @@ void conn_terminated(sap_peer_agent_h peer_agent,
     service_app_exit();
 }
 
-static void _reset_sticker_data()
-{
-    sticker_data.file_path.clear();
-    sticker_data.group.clear();
-    sticker_data.keyword.clear();
-    sticker_data.disp_type.clear();
-    sticker_data.description.clear();
-}
 
 void
 on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned int payload_length, void *buffer,
@@ -525,7 +503,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in
         json_object_unref(j_object);
     } else if (msg_id == STICKER_SEND_FACE_DATA) {
         LOGD("msg : %s", msg_id.c_str());
-        _reset_sticker_data();
+        sticker_data.reset();
 
         const char *type_data = json_object_get_string_member(root_obj, "type");
         if (type_data)
diff --git a/receiver/src/sticker_data.cpp b/receiver/src/sticker_data.cpp
new file mode 100644
index 0000000..bd94ee5
--- /dev/null
+++ b/receiver/src/sticker_data.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "../inc/sticker_data.h"
+
+sticker_info::sticker_info()
+{
+    reset();
+}
+
+sticker_info::~sticker_info()
+{
+
+}
+
+void sticker_info::reset()
+{
+    file_path.clear();
+    group.clear();
+    keyword.clear();
+    disp_type.clear();
+    description.clear();
+}
\ No newline at end of file
-- 
2.7.4


From d6b90adf54fef9e70ebccef6e74b6c80dad3ed31 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Thu, 19 Mar 2020 11:08:54 +0900
Subject: [PATCH 09/16] Add interface to check file exists

Change-Id: I6af83ab05e00efaf014c9cc52543b7e620306ce2
---
 client/sticker_dbus.c          | 37 +++++++++++++++++++++++++++++++++++++
 client/sticker_dbus.h          |  1 +
 provider/sticker_provider.c    | 19 +++++++++++++++----
 server/stickerd_data_manager.c | 30 ++++++++++++++++++++++++++++++
 server/stickerd_data_manager.h |  1 +
 server/stickerd_db_manager.c   | 39 +++++++++++++++++++++++++++++++++++++++
 server/stickerd_db_manager.h   |  1 +
 7 files changed, 124 insertions(+), 4 deletions(-)

diff --git a/client/sticker_dbus.c b/client/sticker_dbus.c
index 8902922..6af66b4 100644
--- a/client/sticker_dbus.c
+++ b/client/sticker_dbus.c
@@ -669,6 +669,22 @@ int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_
 
     if (sticker_data->uri && strcmp(sticker_data->uri, origin_data->uri) != 0) {
         LOGD("origin_uri : %s, new_uri : %s", origin_data->uri, sticker_data->uri);
+        int is_exist = 0;
+        ret = _send_sync_message(gdbus_connection, g_variant_new("(s)", sticker_data->uri), &reply, "check_file_exists");
+        if (ret == STICKER_CLIENT_ERROR_NONE) {
+            reply_body = g_dbus_message_get_body(reply);
+            g_variant_get(reply_body, "(i)", &is_exist);
+
+            if (is_exist) {
+                LOGE("file already exists");
+                ret = STICKER_CLIENT_ERROR_FILE_EXISTS;
+                goto cleanup;
+            }
+        } else {
+            LOGE("failed to check file exists");
+            goto cleanup;
+        }
+
         ret = _send_sync_message(gdbus_connection, g_variant_new("(isis)", sticker_data->sticker_info_id, sticker_data->app_id, sticker_data->type, sticker_data->uri), &reply, "update_sticker_uri");
         if (ret != STICKER_CLIENT_ERROR_NONE) {
             LOGE("failed to update sticker uri");
@@ -1027,4 +1043,25 @@ int sticker_dbus_get_group_list_by_display_type(GDBusConnection *gdbus_connectio
         g_object_unref(reply);
 
     return ret;
+}
+
+int sticker_dbus_check_file_exists(GDBusConnection *gdbus_connection, const char *uri, int *result)
+{
+    int ret;
+    GDBusMessage *reply = NULL;
+    GVariant *reply_body = NULL;
+
+    ret = _send_sync_message(gdbus_connection, g_variant_new("(s)", uri), &reply, "check_file_exists");
+    if (ret == STICKER_CLIENT_ERROR_NONE) {
+        reply_body = g_dbus_message_get_body(reply);
+        g_variant_get(reply_body, "(i)", result);
+    }
+
+    if (reply_body)
+        g_variant_unref(reply_body);
+
+    if (reply)
+        g_object_unref(reply);
+
+    return ret;
 }
\ No newline at end of file
diff --git a/client/sticker_dbus.h b/client/sticker_dbus.h
index 7640435..1982d46 100644
--- a/client/sticker_dbus.h
+++ b/client/sticker_dbus.h
@@ -63,6 +63,7 @@ int sticker_dbus_get_sticker_info_by_group(GDBusConnection *gdbus_connection, co
 int sticker_dbus_get_sticker_info_by_keyword(GDBusConnection *gdbus_connection, const char *app_id, const char *keyword, int offset, int count, GVariantIter **id_iter);
 int sticker_dbus_get_sticker_info_by_display_type(GDBusConnection *gdbus_connection, const char *app_id, sticker_data_display_type_e type, int offset, int count, GVariantIter **id_iter);
 int sticker_dbus_get_group_list_by_display_type(GDBusConnection *gdbus_connection, const char *app_id, sticker_data_display_type_e type, GList **group_list);
+int sticker_dbus_check_file_exists(GDBusConnection *gdbus_connection, const char *uri, int *result);
 
 #ifdef __cplusplus
 }
diff --git a/provider/sticker_provider.c b/provider/sticker_provider.c
index 9ef5b60..7dfca80 100644
--- a/provider/sticker_provider.c
+++ b/provider/sticker_provider.c
@@ -127,15 +127,26 @@ EXPORT_API int sticker_provider_insert_data(sticker_provider_h provider_handle,
     CHECK_STICKER_FEATURE();
 
     int ret;
-    if (!provider_handle || !data_handle || (data_handle->sticker_info_id > 0))
+    int is_exist = 0;
+
+    if (!provider_handle || !data_handle || (data_handle->sticker_info_id > 0) || !data_handle->uri)
         return STICKER_ERROR_INVALID_PARAMETER;
 
+    ret = sticker_dbus_check_file_exists(provider_handle->gdbus_connection, data_handle->uri, &is_exist);
+    if (ret != STICKER_ERROR_NONE) {
+        LOGE("Failed to check file exists : %d", ret);
+        return STICKER_ERROR_OPERATION_FAILED;
+    }
+
+    if (is_exist) {
+        LOGE("Sticker already exists");
+        return STICKER_ERROR_FILE_EXISTS;
+    }
+
     ret = sticker_dbus_insert_sticker_info(provider_handle->gdbus_connection, data_handle);
     if (ret != STICKER_ERROR_NONE) {
         LOGE("Failed to insert sticker information : %d", ret);
-        if (ret == STICKER_CLIENT_ERROR_FILE_EXISTS)
-            return STICKER_ERROR_FILE_EXISTS;
-        else if (ret == STICKER_CLIENT_ERROR_NO_SUCH_FILE)
+        if (ret == STICKER_CLIENT_ERROR_NO_SUCH_FILE)
             return STICKER_ERROR_NO_SUCH_FILE;
         else
             return STICKER_ERROR_OPERATION_FAILED;
diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c
index f30cd8e..8d0d604 100644
--- a/server/stickerd_data_manager.c
+++ b/server/stickerd_data_manager.c
@@ -145,6 +145,8 @@ static void _stickerd_client_dbus_method_call_handler(GDBusConnection *conn, con
         ret = stickerd_get_group_list_by_disp_type(parameters, &reply_body);
     } else if (g_strcmp0(method_name, "update_sticker_disp_type") == 0) {
         ret = stickerd_update_sticker_disp_type(parameters, &reply_body);
+    } else if (g_strcmp0(method_name, "check_file_exists") == 0) {
+        ret = stickerd_check_file_exists(parameters, &reply_body);
     }
 
     if (ret == STICKERD_SERVER_ERROR_NONE) {
@@ -301,6 +303,11 @@ int stickerd_register_dbus_interface(void)
             "          <arg type='i' name='record_id' direction='in'/>"
             "          <arg type='i' name='disp_type' direction='in'/>"
             "        </method>"
+
+            "        <method name='check_file_exists'>"
+            "          <arg type='s' name='uri' direction='in'/>"
+            "          <arg type='i' name='result' direction='out'/>"
+            "        </method>"
             "  </interface>"
             "  </node>";
 
@@ -1466,4 +1473,27 @@ int stickerd_update_sticker_disp_type(GVariant *parameters, GVariant **reply_bod
     }
 
     return ret;
+}
+
+int stickerd_check_file_exists(GVariant *parameters, GVariant **reply_body)
+{
+    int ret;
+    int result;
+    char *uri = NULL;
+
+    g_variant_get(parameters, "(&s)", &uri);
+
+    ret = stickerd_db_check_file_exists(&result, uri);
+    if (ret != STICKERD_SERVER_ERROR_NONE) {
+        LOGE("Failed to get sticker count");
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    *reply_body = g_variant_new("(i)", result);
+    if (*reply_body == NULL) {
+        LOGE("Failed to create reply_body");
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    return ret;
 }
\ No newline at end of file
diff --git a/server/stickerd_data_manager.h b/server/stickerd_data_manager.h
index e8e3a9e..d102573 100644
--- a/server/stickerd_data_manager.h
+++ b/server/stickerd_data_manager.h
@@ -46,6 +46,7 @@ int stickerd_get_sticker_info_by_keyword(GVariant *parameters, GVariant **reply_
 int stickerd_get_sticker_info_by_display_type(GVariant *parameters, GVariant **reply_body);
 int stickerd_get_group_list_by_disp_type(GVariant *parameters, GVariant **reply_body);
 int stickerd_update_sticker_disp_type(GVariant *parameters, GVariant **reply_body);
+int stickerd_check_file_exists(GVariant *parameters, GVariant **reply_body);
 
 #ifdef __cplusplus
 }
diff --git a/server/stickerd_db_manager.c b/server/stickerd_db_manager.c
index 3b54fb4..6680905 100644
--- a/server/stickerd_db_manager.c
+++ b/server/stickerd_db_manager.c
@@ -84,6 +84,7 @@
 #define STICKER_DB_GET_RECORD_ID_BY_KEYWORD "SELECT sticker_info_id FROM sticker_keyword_info WHERE keyword = ? INTERSECT SELECT sticker_info_id from sticker_info WHERE app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
 #define STICKER_DB_GET_RECORD_ID_BY_DISP_TYPE "SELECT sticker_info_id FROM sticker_info WHERE display_type = ? AND app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?)) LIMIT ?, ?"
 #define STICKER_DB_GET_GROUP_LIST_BY_DISP_TYPE "SELECT DISTINCT group_name FROM sticker_info WHERE display_type = ? AND app_id NOT IN (SELECT DISTINCT provider_id FROM sticker_whitelist_info WHERE provider_id NOT IN (SELECT provider_id FROM sticker_whitelist_info WHERE consumer_id = ?))"
+#define STICKER_DB_CHECK_FILE_EXISTS "SELECT EXISTS(SELECT 1 FROM sticker_info WHERE uri = ? LIMIT 1)"
 
 typedef enum
 {
@@ -777,4 +778,42 @@ cleanup:
     sqlite3_close(db);
 
     return STICKERD_SERVER_ERROR_DB_FAILED;
+}
+
+int stickerd_db_check_file_exists(int *result, char *uri)
+{
+    int ret;
+    sqlite3 *db = NULL;
+    sqlite3_stmt *stmt = NULL;
+
+    db = _db_open();
+    if (!db)
+        return STICKERD_SERVER_ERROR_DB_FAILED;
+
+    ret = sqlite3_prepare_v2(db, STICKER_DB_CHECK_FILE_EXISTS, -1, &stmt, NULL);
+    if (ret != SQLITE_OK) {
+        LOGE("fail to check file exists : %s", sqlite3_errmsg(db));
+        goto cleanup;
+    }
+
+    sqlite3_bind_text(stmt, 1, uri, -1, SQLITE_TRANSIENT);
+
+    ret = sqlite3_step(stmt);
+    if (ret == SQLITE_ERROR) {
+        LOGE("sqlite3_step() failed : ret(%d)", ret);
+        goto cleanup;
+    }
+
+    *result = sqlite3_column_int(stmt, 0);
+
+    sqlite3_finalize(stmt);
+    sqlite3_close(db);
+
+    return STICKERD_SERVER_ERROR_NONE;
+
+cleanup:
+    sqlite3_finalize(stmt);
+    sqlite3_close(db);
+
+    return STICKERD_SERVER_ERROR_DB_FAILED;
 }
\ No newline at end of file
diff --git a/server/stickerd_db_manager.h b/server/stickerd_db_manager.h
index 2ef2fd5..2c260f4 100644
--- a/server/stickerd_db_manager.h
+++ b/server/stickerd_db_manager.h
@@ -58,6 +58,7 @@ int stickerd_db_get_keyword_list(GVariantBuilder *builder, char *app_id);
 int stickerd_db_get_sticker_count(int *count, char *app_id);
 int stickerd_db_get_record_id(sticker_info_db_type type, GList **id_list, void *data, char *app_id, int offset, int count);
 int stickerd_db_get_group_list_by_display_type(GVariantBuilder *builder, char *app_id, int disp_type);
+int stickerd_db_check_file_exists(int *result, char *uri);
 
 #ifdef __cplusplus
 }
-- 
2.7.4


From d7a4f06eec2bd30fd450df1e063cbce05b2c3ef4 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Thu, 19 Mar 2020 11:09:27 +0900
Subject: [PATCH 10/16] Add a new API to delete sticker using URI

Change-Id: I16e910c6135199018da711c7684a699ea36d9b44
---
 client/sticker_dbus.c          | 15 +++++++++++++++
 client/sticker_dbus.h          |  1 +
 include/sticker_provider.h     | 16 ++++++++++++++++
 provider/sticker_provider.c    | 30 ++++++++++++++++++++++++++++++
 server/stickerd_data_manager.c | 28 ++++++++++++++++++++++++++++
 server/stickerd_data_manager.h |  1 +
 server/stickerd_db_manager.c   | 40 ++++++++++++++++++++++++++++++++++++++++
 server/stickerd_db_manager.h   |  1 +
 8 files changed, 132 insertions(+)

diff --git a/client/sticker_dbus.c b/client/sticker_dbus.c
index 6af66b4..13eef77 100644
--- a/client/sticker_dbus.c
+++ b/client/sticker_dbus.c
@@ -643,6 +643,21 @@ int sticker_dbus_delete_sticker_info(GDBusConnection *gdbus_connection, int reco
     return ret;
 }
 
+int sticker_dbus_delete_sticker_info_by_uri(GDBusConnection *gdbus_connection, const char *uri)
+{
+    int ret;
+    GDBusMessage *reply = NULL;
+
+    ret = _send_sync_message(gdbus_connection, g_variant_new("(s)", uri), &reply, "delete_sticker_info_by_uri");
+    if (ret != STICKER_CLIENT_ERROR_NONE)
+        LOGE("failed to delete sticker info");
+
+    if (reply)
+        g_object_unref(reply);
+
+    return ret;
+}
+
 int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_data_h sticker_data)
 {
     int ret;
diff --git a/client/sticker_dbus.h b/client/sticker_dbus.h
index 1982d46..610cfe1 100644
--- a/client/sticker_dbus.h
+++ b/client/sticker_dbus.h
@@ -51,6 +51,7 @@ int sticker_dbus_shutdown(GDBusConnection *gdbus_connection, int *server_watcher
 int sticker_dbus_insert_sticker_info(GDBusConnection *gdbus_connection, sticker_data_h sticker_data);
 int sticker_dbus_insert_sticker_info_by_json(GDBusConnection *gdbus_connection, const char *app_id, const char *json_path);
 int sticker_dbus_delete_sticker_info(GDBusConnection *gdbus_connection, int record_id);
+int sticker_dbus_delete_sticker_info_by_uri(GDBusConnection *gdbus_connection, const char *uri);
 int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_data_h sticker_data);
 int sticker_dbus_get_sticker_info_by_record_id(GDBusConnection *gdbus_connection, sticker_data_h sticker_data, int record_id);
 int sticker_dbus_get_group_list(GDBusConnection *gdbus_connection, const char *app_id, GList **group_list);
diff --git a/include/sticker_provider.h b/include/sticker_provider.h
index e7367b3..8271ad7 100644
--- a/include/sticker_provider.h
+++ b/include/sticker_provider.h
@@ -201,6 +201,22 @@ int sticker_provider_update_data(sticker_provider_h provider_handle, sticker_dat
 int sticker_provider_delete_data(sticker_provider_h provider_handle, sticker_data_h data_handle);
 
 /**
+ * @brief Deletes a sticker data in the sticker database using URI.
+ * @since_tizen 5.5
+ * @param[in] provider_handle The sticker provider handle
+ * @param[in] uri The URI of the sticker data to be deleted
+ * @return 0 on success, otherwise a negative error value
+ * @retval #STICKER_ERROR_NONE Successful
+ * @retval #STICKER_ERROR_NOT_SUPPORTED Not supported
+ * @retval #STICKER_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #STICKER_ERROR_OPERATION_FAILED Operation failed
+ * @retval #STICKER_ERROR_NO_SUCH_FILE No such file
+ * @see sticker_provider_insert_data()
+ * @see sticker_provider_delete_data()
+ */
+int sticker_provider_delete_data_by_uri(sticker_provider_h provider_handle, const char *uri);
+
+/**
  * @brief Gets the count of stickers stored by the provider application.
  * @since_tizen 5.5
  * @param[in] provider_handle The sticker provider handle
diff --git a/provider/sticker_provider.c b/provider/sticker_provider.c
index 7dfca80..98f1005 100644
--- a/provider/sticker_provider.c
+++ b/provider/sticker_provider.c
@@ -364,4 +364,34 @@ cleanup:
         g_variant_iter_free(id_iter);
 
     return ret;
+}
+
+EXPORT_API int sticker_provider_delete_data_by_uri(sticker_provider_h provider_handle, const char *uri)
+{
+    CHECK_STICKER_FEATURE();
+
+    int ret;
+    int is_exist = 0;
+
+    if (!provider_handle || !uri)
+        return STICKER_ERROR_INVALID_PARAMETER;
+
+    ret = sticker_dbus_check_file_exists(provider_handle->gdbus_connection, uri, &is_exist);
+    if (ret != STICKER_ERROR_NONE) {
+        LOGE("Failed to check file exists : %d", ret);
+        return STICKER_ERROR_OPERATION_FAILED;
+    }
+
+    if (!is_exist) {
+        LOGE("Sticker does not exist");
+        return STICKER_ERROR_NO_SUCH_FILE;
+    }
+
+    ret = sticker_dbus_delete_sticker_info_by_uri(provider_handle->gdbus_connection, uri);
+    if (ret != STICKER_ERROR_NONE) {
+        LOGE("Failed to delete sticker information : %d", ret);
+        return STICKER_ERROR_OPERATION_FAILED;
+    }
+
+    return STICKER_ERROR_NONE;
 }
\ No newline at end of file
diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c
index 8d0d604..4f0b5b2 100644
--- a/server/stickerd_data_manager.c
+++ b/server/stickerd_data_manager.c
@@ -109,6 +109,8 @@ static void _stickerd_client_dbus_method_call_handler(GDBusConnection *conn, con
         ret = stickerd_insert_sticker_info_by_json(parameters, &reply_body, sender);
     } else if (g_strcmp0(method_name, "delete_sticker_info") == 0) {
         ret = stickerd_del_sticker_info(parameters, &reply_body);
+    } else if (g_strcmp0(method_name, "delete_sticker_info_by_uri") == 0) {
+        ret = stickerd_del_sticker_info_by_uri(parameters, &reply_body);
     } else if (g_strcmp0(method_name, "update_sticker_type") == 0) {
         ret = stickerd_update_sticker_type(parameters, &reply_body);
     } else if (g_strcmp0(method_name, "update_sticker_uri") == 0) {
@@ -194,6 +196,10 @@ int stickerd_register_dbus_interface(void)
             "          <arg type='i' name='record_id' direction='in'/>"
             "        </method>"
 
+            "        <method name='delete_sticker_info_by_uri'>"
+            "          <arg type='s' name='uri' direction='in'/>"
+            "        </method>"
+
             "        <method name='update_sticker_type'>"
             "          <arg type='i' name='record_id' direction='in'/>"
             "          <arg type='i' name='type' direction='in'/>"
@@ -800,6 +806,28 @@ int stickerd_del_sticker_info(GVariant *parameters, GVariant **reply_body)
     return ret;
 }
 
+int stickerd_del_sticker_info_by_uri(GVariant *parameters, GVariant **reply_body)
+{
+    int ret;
+    char *uri = NULL;
+
+    *reply_body = g_variant_new("()");
+    if (*reply_body == NULL) {
+        LOGE("Failed to create reply_body");
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    g_variant_get(parameters, "(&s)", &uri);
+
+    ret = stickerd_db_delete_sticker_info_by_uri(uri);
+    if (ret != STICKERD_SERVER_ERROR_NONE) {
+        LOGE("Failed to delete sticker info");
+        return STICKERD_SERVER_ERROR_OPERATION_FAILED;
+    }
+
+    return ret;
+}
+
 int stickerd_update_sticker_type(GVariant *parameters, GVariant **reply_body)
 {
     int ret;
diff --git a/server/stickerd_data_manager.h b/server/stickerd_data_manager.h
index d102573..e09e91d 100644
--- a/server/stickerd_data_manager.h
+++ b/server/stickerd_data_manager.h
@@ -28,6 +28,7 @@ int stickerd_register_dbus_interface(void);
 int stickerd_insert_sticker_info(GVariant *parameters, GVariant **reply_body);
 int stickerd_insert_sticker_info_by_json(GVariant *parameters, GVariant **reply_body, const char *sender);
 int stickerd_del_sticker_info(GVariant *parameters, GVariant **reply_body);
+int stickerd_del_sticker_info_by_uri(GVariant *parameters, GVariant **reply_body);
 int stickerd_update_sticker_type(GVariant *parameters, GVariant **reply_body);
 int stickerd_update_sticker_uri(GVariant *parameters, GVariant **reply_body);
 int stickerd_update_sticker_thumbnail(GVariant *parameters, GVariant **reply_body);
diff --git a/server/stickerd_db_manager.c b/server/stickerd_db_manager.c
index 6680905..52a177c 100644
--- a/server/stickerd_db_manager.c
+++ b/server/stickerd_db_manager.c
@@ -63,6 +63,7 @@
 
 #define STICKER_DB_DELETE_STICKER_INFO "DELETE FROM sticker_info WHERE sticker_info_id = ?"
 #define STICKER_DB_DELETE_STICKER_KEYWORD_INFO "DELETE FROM sticker_keyword_info WHERE sticker_info_id = ?"
+#define STICKER_DB_DELETE_STICKER_INFO_BY_URI "DELETE FROM sticker_info WHERE uri = ?"
 
 #define STICKER_DB_UPDATE_STICKER_TYPE "UPDATE sticker_info SET type = ?, date = DateTime('now','localtime') WHERE sticker_info_id = ?"
 #define STICKER_DB_UPDATE_STICKER_URI "UPDATE sticker_info SET uri = ?, date = DateTime('now','localtime') WHERE sticker_info_id = ?"
@@ -426,6 +427,45 @@ cleanup:
     return STICKERD_SERVER_ERROR_DB_FAILED;
 }
 
+int stickerd_db_delete_sticker_info_by_uri(char *uri)
+{
+    int ret;
+    sqlite3 *db = NULL;
+    sqlite3_stmt *stmt = NULL;
+
+    db = _db_open();
+    if (!db)
+        return STICKERD_SERVER_ERROR_DB_FAILED;
+
+    ret = sqlite3_prepare_v2(db, STICKER_DB_DELETE_STICKER_INFO_BY_URI, -1, &stmt, NULL);
+    if (ret != SQLITE_OK) {
+        LOGE("fail to delete sticker information : %s", sqlite3_errmsg(db));
+        goto cleanup;
+    }
+
+    sqlite3_bind_text(stmt, 1, uri, -1, SQLITE_TRANSIENT);
+
+    ret = sqlite3_step(stmt);
+    if (ret != SQLITE_OK && ret != SQLITE_DONE) {
+        LOGE("sqlite3_step() failed : ret(%d)", ret);
+        goto cleanup;
+    } else if (sqlite3_changes(db) == 0) {
+        LOGE("No changes to DB");
+        goto cleanup;
+    }
+
+    sqlite3_finalize(stmt);
+    sqlite3_close(db);
+
+    return STICKERD_SERVER_ERROR_NONE;
+
+cleanup:
+    sqlite3_finalize(stmt);
+    sqlite3_close(db);
+
+    return STICKERD_SERVER_ERROR_DB_FAILED;
+}
+
 int stickerd_db_update_sticker_info(int record_id, sticker_info_db_type type, void *data)
 {
     int ret;
diff --git a/server/stickerd_db_manager.h b/server/stickerd_db_manager.h
index 2c260f4..4a14e50 100644
--- a/server/stickerd_db_manager.h
+++ b/server/stickerd_db_manager.h
@@ -51,6 +51,7 @@ typedef struct {
 int stickerd_db_init(void);
 int stickerd_db_insert_sticker_info(int *record_id, sticker_info_db *sticker_info);
 int stickerd_db_delete_sticker_info(int record_id);
+int stickerd_db_delete_sticker_info_by_uri(char *uri);
 int stickerd_db_update_sticker_info(int record_id, sticker_info_db_type type, void *data);
 int stickerd_db_get_sticker_info_by_record_id(int record_id, sticker_info_db *sticker_info);
 int stickerd_db_get_group_list(GVariantBuilder *builder, char *app_id);
-- 
2.7.4


From e8bc0cb40e08a9a6a8b32949909c7bbf1cf8c75f Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Thu, 19 Mar 2020 19:12:40 +0900
Subject: [PATCH 11/16] Modified to use the new API to delete sticker

Change-Id: I4867a69a865bc291b30ef6b867cbc88bd780f7a6
---
 receiver/src/sticker_info.cpp | 42 +++---------------------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/receiver/src/sticker_info.cpp b/receiver/src/sticker_info.cpp
index 89aedfb..b71c149 100644
--- a/receiver/src/sticker_info.cpp
+++ b/receiver/src/sticker_info.cpp
@@ -126,46 +126,10 @@ void destroy_sticker_provider_handle(void)
     sticker_provider = NULL;
 }
 
-static void _sticker_foreach_cb(sticker_data_h data_handle, void *user_data)
-{
-    int ret;
-    char *del_file = (char *)user_data;
-    sticker_data_uri_type_e type;
-    char *uri = NULL;
-
-    if (!need_to_retrive)
-        return;
-
-    ret = sticker_data_get_uri(data_handle, &type, &uri);
-    if (ret != STICKER_ERROR_NONE)
-        LOGE("Failed to get sticker uri");
-
-    int result = (string(uri)).find(del_file);
-    if (result >= 0) {
-        LOGI("Delete sticker (%s)", uri);
-        need_to_retrive = false;
-
-        ret = sticker_provider_delete_data(sticker_provider, data_handle);
-        if (ret != STICKER_ERROR_NONE)
-            LOGE("Failed to delete sticker");
-    }
-}
-
 void delete_sticker_data(const char *fileName)
 {
     int ret;
-    int offset = 0;
-    int count = 0;
-    int result = 0;
-    need_to_retrive = true;
-
-    while (result == count && need_to_retrive) {
-        count = 20;
-        ret = sticker_provider_data_foreach_all(sticker_provider, offset, count, &result, _sticker_foreach_cb, (void *)fileName);
-        offset += result;
-        if (ret != STICKER_ERROR_NONE) {
-            LOGE("Failed to retrieve sticker");
-            return;
-        }
-    }
+    ret = sticker_provider_delete_data_by_uri(sticker_provider, fileName);
+    if (ret != STICKER_ERROR_NONE)
+        LOGE("Failed to delete sticker. ret : %d", ret);
 }
\ No newline at end of file
-- 
2.7.4


From 4d7cec539fecfe222d9c89bb9faae02b0396ec55 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Thu, 19 Mar 2020 19:14:19 +0900
Subject: [PATCH 12/16] Update package version to 0.1.23

Change-Id: I0c9b9a4745bdf1bcf01b645d3762a42060339973
---
 packaging/capi-ui-sticker.spec | 2 +-
 receiver/tizen-manifest.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec
index d36c513..cc07b17 100644
--- a/packaging/capi-ui-sticker.spec
+++ b/packaging/capi-ui-sticker.spec
@@ -1,6 +1,6 @@
 Name:       capi-ui-sticker
 Summary:    Sticker client library and daemon
-Version:    0.1.22
+Version:    0.1.23
 Release:    1
 Group:      Graphics & UI Framework/Input
 License:    Apache-2.0
diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml
index 6726d6d..b01d8c2 100644
--- a/receiver/tizen-manifest.xml
+++ b/receiver/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.sticker-receiver" version="1.0.22">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.sticker-receiver" version="1.0.23">
         <profile name="wearable" />
         <service-application appid="org.tizen.sticker-receiver" exec="sticker-receiver" type="capp" multiple="false" taskmanage="false" nodisplay="true" launch_mode="single">
         <label>sticker-receiver</label>
-- 
2.7.4


From 58558b88fb7aebee2a03722378bbbf31ca9aead9 Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Fri, 20 Mar 2020 14:56:40 +0900
Subject: [PATCH 13/16] Remove unused variable

Change-Id: Iaa0a0b6744e091ab9c761363de5e1edcc21d27e0
---
 receiver/src/sticker_info.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/receiver/src/sticker_info.cpp b/receiver/src/sticker_info.cpp
index b71c149..57ace21 100644
--- a/receiver/src/sticker_info.cpp
+++ b/receiver/src/sticker_info.cpp
@@ -18,14 +18,10 @@
 #include <app_common.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream>
 
 #include "log.h"
 
-using namespace std;
-
 static sticker_provider_h sticker_provider = NULL;
-static bool need_to_retrive = false;
 
 sticker_data_h
 set_sticker_data(sticker_data_uri_type_e type, const char* uri, const char* keyword,
-- 
2.7.4


From c55a6705b7f6f38b46ec00a749d23484b99538df Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Fri, 20 Mar 2020 15:36:15 +0900
Subject: [PATCH 14/16] Check battery charging status for sync condition

Change-Id: I07450a60edef785e197bac03f85d3f13855465b8
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
---
 receiver/src/main.cpp | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp
index 9968b91..7a5e20d 100644
--- a/receiver/src/main.cpp
+++ b/receiver/src/main.cpp
@@ -48,6 +48,8 @@ static void app_control(app_control_h app_control, void *data)
     char* alarm_data = NULL;
 
     int res;
+    int battery_percentage = 0;
+    bool battery_charging = false;
 
     // operation
     int ret = app_control_get_operation(app_control, &operation);
@@ -63,20 +65,30 @@ static void app_control(app_control_h app_control, void *data)
 
             LOGD("alarm data : %s", alarm_data);
 
-            int battery_percentage = 0;
-            int ret = device_battery_get_percent(&battery_percentage);
-            if (ret == DEVICE_ERROR_NONE) {
-                LOGD("battery percent : %d", battery_percentage);
-                if (battery_percentage >= MINIMUM_BATTERY) {
-                    request_sticker_data("auto", "arsticker", "input");
-                    request_sticker_data("auto", "bitmoji", "input");
-                }
-                else {
-                    LOGD("No sync request due to insufficient battery");
-                }
+            int ret = device_battery_is_charging(&battery_charging);
+            if (ret != DEVICE_ERROR_NONE) {
+                LOGW("No sync. Can't get battery charging status");
+                goto cleanup;
+            }
+
+            if (!battery_charging) {
+                LOGI("No sync due to no battery charging status");
+                goto cleanup;
+            }
+
+            ret = device_battery_get_percent(&battery_percentage);
+            if (ret != DEVICE_ERROR_NONE) {
+                LOGW("No sync. Failed to get battery percent. error : %d", ret);
+                goto cleanup;
+            }
+
+            LOGI("battery percent : %d", battery_percentage);
+            if (battery_percentage >= MINIMUM_BATTERY) {
+                request_sticker_data("auto", "arsticker", "input");
+                request_sticker_data("auto", "bitmoji", "input");
             }
             else {
-               LOGW("Failed to get battery percent. error : %d", ret);
+                LOGI("No sync due to insufficient battery");
             }
 
             goto cleanup;
-- 
2.7.4


From cccab67025622346c9643bd1fe8e0205593def7a Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Fri, 20 Mar 2020 13:11:25 +0900
Subject: [PATCH 15/16] Fix wrong error value

Change-Id: If4d58982b791dc064cc3b05d7e35d84caf9c661f
---
 include/sticker_error.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/sticker_error.h b/include/sticker_error.h
index fea1302..2239809 100644
--- a/include/sticker_error.h
+++ b/include/sticker_error.h
@@ -47,7 +47,7 @@ typedef enum {
     STICKER_ERROR_OPERATION_FAILED = TIZEN_ERROR_STICKER | 0x0001, /**< Operation failed */
     STICKER_ERROR_FILE_EXISTS = TIZEN_ERROR_FILE_EXISTS, /**< File exists */
     STICKER_ERROR_NO_DATA = TIZEN_ERROR_NO_DATA, /**< No data available */
-    STICKER_ERROR_NO_SUCH_FILE = TIZEN_ERROR_FILE_EXISTS, /**< No such file */
+    STICKER_ERROR_NO_SUCH_FILE = TIZEN_ERROR_NO_SUCH_FILE, /**< No such file */
 } sticker_error_e;
 
 /**
-- 
2.7.4


From 80dc4d119819af92f77c49771f0dfe2e8e8c0ece Mon Sep 17 00:00:00 2001
From: InHong Han <inhong1.han@samsung.com>
Date: Tue, 24 Mar 2020 13:45:10 +0900
Subject: [PATCH 16/16] Update package version to 0.1.24

Change-Id: Ia2d82f6d9e7397b97dd7155c6f72f143d42fbb2d
---
 packaging/capi-ui-sticker.spec | 2 +-
 receiver/tizen-manifest.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec
index cc07b17..442c769 100644
--- a/packaging/capi-ui-sticker.spec
+++ b/packaging/capi-ui-sticker.spec
@@ -1,6 +1,6 @@
 Name:       capi-ui-sticker
 Summary:    Sticker client library and daemon
-Version:    0.1.23
+Version:    0.1.24
 Release:    1
 Group:      Graphics & UI Framework/Input
 License:    Apache-2.0
diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml
index b01d8c2..aeaa201 100644
--- a/receiver/tizen-manifest.xml
+++ b/receiver/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.sticker-receiver" version="1.0.23">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.sticker-receiver" version="1.0.24">
         <profile name="wearable" />
         <service-application appid="org.tizen.sticker-receiver" exec="sticker-receiver" type="capp" multiple="false" taskmanage="false" nodisplay="true" launch_mode="single">
         <label>sticker-receiver</label>
-- 
2.7.4