From 10a1f2965ad89781c710508d3f708334c5434d43 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 24 Sep 2020 18:01:46 +0900 Subject: [PATCH 01/16] Rename function names Change-Id: I1cfc3c0c90d339e31e9a22e783b1f15249aae09e Signed-off-by: Jihoon Kim --- receiver/src/ft.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp index d0e0b7f..f797447 100644 --- a/receiver/src/ft.cpp +++ b/receiver/src/ft.cpp @@ -93,6 +93,8 @@ static int sync_success_cnt = 0; static gboolean job_progress = FALSE; static int sync_complete_flags = 0; +static void sticker_service_quit(); + static void save_last_sync_time() { // save last sync time in preference @@ -629,10 +631,10 @@ static void _on_transfer_file_cb(sap_peer_agent_h peer_agent_h, accept_file(); } -void conn_terminated(sap_peer_agent_h peer_agent, - sap_socket_h socket, - sap_service_connection_terminated_reason_e result, - void *user_data) +static void _on_connection_terminated(sap_peer_agent_h peer_agent, + sap_socket_h socket, + sap_service_connection_terminated_reason_e result, + void *user_data) { sap_info_s *priv = NULL; priv = (sap_info_s *)user_data; @@ -658,13 +660,14 @@ void conn_terminated(sap_peer_agent_h peer_agent, set_sync_progressing(FALSE); send_message("sync_stop_result", "cancel"); - service_app_exit(); + sticker_service_quit(); } -static void quit() +static void sticker_service_quit() { job_progress = FALSE; send_disconnect_message(); + STLOGI("Terminate sticker service"); service_app_exit(); } @@ -801,7 +804,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in #endif if (!process_request_queue()) { - quit(); + sticker_service_quit(); } } else if (msg_id == STICKER_SYNC_START_RSP) { STLOGD("msg : %s", msg_id.c_str()); @@ -858,7 +861,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in set_sync_progressing(FALSE); save_last_sync_time(); - quit(); + sticker_service_quit(); } } } else if (msg_id == STICKER_SEND_START_REQ) { @@ -995,7 +998,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in if (!process_request_queue()) { sync_success_cnt = 0; - quit(); + sticker_service_quit(); } } else STLOGW("unknown msg id : %s", msg_id.c_str()); @@ -1019,7 +1022,7 @@ static void on_conn_req(sap_peer_agent_h peer_agent, STLOGI("Connection success"); priv_data.socket = socket; sap_peer_agent_accept_service_connection(peer_agent); - sap_peer_agent_set_service_connection_terminated_cb(peer_agent, conn_terminated, &priv_data); + sap_peer_agent_set_service_connection_terminated_cb(peer_agent, _on_connection_terminated, &priv_data); sap_socket_set_data_received_cb(socket, on_data_received, peer_agent); break; case SAP_CONNECTION_ALREADY_EXIST: @@ -1062,7 +1065,7 @@ _on_service_connection_created(sap_peer_agent_h peer_agent, { case SAP_CONNECTION_SUCCESS: sap_peer_agent_set_service_connection_terminated_cb(priv->peer_agent, - conn_terminated, + _on_connection_terminated, priv); sap_socket_set_data_received_cb(socket, on_data_received, peer_agent); -- 2.7.4 From de3b67b664320f1955350612e3fb5ede43ce5eee Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Sat, 10 Oct 2020 13:00:45 +0900 Subject: [PATCH 02/16] Destroy receiver when launching in case that BT is not connected Change-Id: I5413d0a17683d7b189b331d0a65c269e87366515 Signed-off-by: Jihoon Kim --- receiver/src/ft.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp index f797447..4467722 100644 --- a/receiver/src/ft.cpp +++ b/receiver/src/ft.cpp @@ -655,7 +655,9 @@ static void _on_connection_terminated(sap_peer_agent_h peer_agent, break; } - sap_socket_destroy(priv->socket); + if (priv->socket) + sap_socket_destroy(priv->socket); + priv->socket = NULL; set_sync_progressing(FALSE); @@ -1222,6 +1224,7 @@ static void _on_device_status_changed(sap_device_status_e status, sap_transport_type_e transport_type, void *user_data) { + bool unknown_transport_type = false; STLOGD("%s, status :%d", __func__, status); switch (transport_type) { @@ -1242,12 +1245,13 @@ static void _on_device_status_changed(sap_device_status_e status, break; default: STLOGE("unknown transport_type (%d)", transport_type); + unknown_transport_type = true; break; } switch (status) { case SAP_DEVICE_STATUS_DETACHED: - STLOGD("device is not connected."); + STLOGD("device is detached."); send_message("sync_stop_result", "cancel"); break; case SAP_DEVICE_STATUS_ATTACHED: @@ -1258,6 +1262,9 @@ static void _on_device_status_changed(sap_device_status_e status, STLOGE("unknown status (%d)", status); break; } + + if (unknown_transport_type && status == SAP_DEVICE_STATUS_DETACHED) + sticker_service_quit(); } gboolean agent_initialize() -- 2.7.4 From 20bb66aa2c1c8df0a32d52861288a54039688374 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Sat, 10 Oct 2020 13:40:49 +0900 Subject: [PATCH 03/16] Support to request sticker sync when BT connects after disconnecting Change-Id: I9d0b876024eab482fbe3ac38c73f4dbcfcab07dd Signed-off-by: Jihoon Kim --- receiver/src/ft.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp index 4467722..9a684cb 100644 --- a/receiver/src/ft.cpp +++ b/receiver/src/ft.cpp @@ -449,16 +449,13 @@ static bool process_request_queue() case REQUEST_TYPE_FEATURE_REQ: STLOGD("[Request feature exchange]"); request_sticker_feature(); - ReqQueue.pop(); break; case REQUEST_TYPE_SYNC: - STLOGD("[Request to sync sticker] mode: %s, category: %s, type : %s", request.mode.c_str(), + STLOGD("[Request to sync sticker] mode: %s, category: %s, type: %s", request.mode.c_str(), request.category.c_str(), request.type.c_str()); - if (request_sticker_data(request.mode.c_str(), request.category.c_str(), request.type.c_str())) - ReqQueue.pop(); - + request_sticker_data(request.mode.c_str(), request.category.c_str(), request.type.c_str()); break; case REQUEST_TYPE_SHOW_NOTIFICATION: STLOGD("[Request to show notification]"); @@ -662,7 +659,6 @@ static void _on_connection_terminated(sap_peer_agent_h peer_agent, set_sync_progressing(FALSE); send_message("sync_stop_result", "cancel"); - sticker_service_quit(); } static void sticker_service_quit() @@ -745,6 +741,19 @@ static void send_sync_start_response(int result_code) #endif } +static void pop_sticker_request(request_type req_type) +{ + if (ReqQueue.empty()) + return; + + StickerRequest request = ReqQueue.front(); + STLOGD ("request type : %d", request.req_type); + if (request.req_type == req_type) { + STLOGD ("pop sync request"); + ReqQueue.pop(); + } +} + void on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned int payload_length, void *buffer, void *user_data) /* message exchange on_receive callback (sap_agent_data_received_cb) */ @@ -805,6 +814,8 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in STLOGW("No vconf supported feature"); #endif + pop_sticker_request(REQUEST_TYPE_FEATURE_REQ); + if (!process_request_queue()) { sticker_service_quit(); } @@ -865,6 +876,8 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in sticker_service_quit(); } + + pop_sticker_request(REQUEST_TYPE_SYNC); } } else if (msg_id == STICKER_SEND_START_REQ) { STLOGD("msg : %s", msg_id.c_str()); -- 2.7.4 From bed9e5b6117d870d182b5c1367951f9aed396720 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Sat, 10 Oct 2020 14:07:05 +0900 Subject: [PATCH 04/16] Revert "Fix to request sticker feature only once" Sticker sync feature can be changed after synchronization. This reverts commit 3eab9e95c212ccf8887363781d8d0deda1eafce3. Change-Id: I3bb0e0bcd1216ea2e0b15b06a8a69e06e10e9aa4 --- receiver/inc/ft.h | 2 -- receiver/inc/receiver_preference.h | 1 - receiver/src/ft.cpp | 22 ---------------------- receiver/src/main.cpp | 16 +--------------- 4 files changed, 1 insertion(+), 40 deletions(-) diff --git a/receiver/inc/ft.h b/receiver/inc/ft.h index 55a4ffa..afab92e 100644 --- a/receiver/inc/ft.h +++ b/receiver/inc/ft.h @@ -40,6 +40,4 @@ void request_show_sync_notification(); bool get_job_progress(); -bool get_receive_sticker_feature(); - #endif /* __FT_H__ */ diff --git a/receiver/inc/receiver_preference.h b/receiver/inc/receiver_preference.h index aae2c88..02fc7e3 100644 --- a/receiver/inc/receiver_preference.h +++ b/receiver/inc/receiver_preference.h @@ -19,6 +19,5 @@ #define LAST_SYNC_TIME "LastSyncTime" #define LAST_LOG_FILE_INDEX "LastLogFileIndex" -#define RECEIVED_STICKER_FEATURE "ReceivedStickerFeature" #endif /* __RECEIVER_PREFERENCE_H__ */ diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp index 9a684cb..26883b3 100644 --- a/receiver/src/ft.cpp +++ b/receiver/src/ft.cpp @@ -107,27 +107,6 @@ static void save_last_sync_time() } } -static void save_receive_sticker_feature(bool received) -{ - // received sticker feature or not - if (preference_set_boolean(RECEIVED_STICKER_FEATURE, received) == PREFERENCE_ERROR_NONE) { - STLOGI("Succeed to set the flag of receive sticker feature : %d", received); - } - else { - STLOGW("Failed to set the flag of receive sticker feature"); - } -} - -bool get_receive_sticker_feature() -{ - bool result = false; - if (preference_get_boolean(RECEIVED_STICKER_FEATURE, &result) != PREFERENCE_ERROR_NONE) { - STLOGW("Failed to get receive sticker feature"); - } - - return result; -} - static void set_sync_first_complete() { int complete_flags = 0; @@ -792,7 +771,6 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in request_all_sticker_data("manual", "input"); } else if (msg_id == STICKER_SYNC_FEATURE_RSP) { STLOGD("msg : %s", msg_id.c_str()); - save_receive_sticker_feature(true); #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"); diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp index aeefd28..aa196e1 100644 --- a/receiver/src/main.cpp +++ b/receiver/src/main.cpp @@ -209,13 +209,7 @@ static void process_auto_sync() if (check_battery_condition()) { STLOGD("Starting auto synchronization"); initialize_sap(); - if (get_receive_sticker_feature()) { - STLOGI("Already sticker feature is received"); - } - else { - request_sticker_feature(); - } - + request_sticker_feature(); request_auto_sync(); } else { @@ -236,14 +230,6 @@ static void process_auto_sync() static void get_sticker_feature() { - if (get_receive_sticker_feature()) { - STLOGI("Already sticker feature is received"); - if (!is_init_sap()) - service_app_exit(); - - return; - } - #ifdef VCONFKEY_STICKER_SUPPORTED_FEATURE // Check whether oobe has been done int feature_flag = 0; -- 2.7.4 From 45906621bc3d16b6ba02ff159775b573a9e6c9dc Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Sat, 10 Oct 2020 14:45:50 +0900 Subject: [PATCH 05/16] Update package version to 0.1.64 Change-Id: Iae5d517d45a996cf1934abed18e39a53a4423c84 Signed-off-by: Jihoon Kim --- 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 e5f5d4a..8b4618e 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.63 +Version: 0.1.64 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index b8c75ad..e1ecb31 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From 43029bd2900c771165f6f6e94d0a7791fedd96ba Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 24 Sep 2020 17:21:47 +0900 Subject: [PATCH 06/16] Rename from whitelist to allowlist Change-Id: Ia7b03469aeddf9972a0a5087ba73f6ee8ce2d8e7 Signed-off-by: Jihoon Kim --- sticker-parser/sticker-parser.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sticker-parser/sticker-parser.c b/sticker-parser/sticker-parser.c index a54e9ab..1dc1a48 100644 --- a/sticker-parser/sticker-parser.c +++ b/sticker-parser/sticker-parser.c @@ -506,7 +506,7 @@ static void __insert_sticker_keyword_info(const char *keyword) return; } -static void __insert_sticker_whitelist_info(const char *provider, const char *consumer) { +static void __insert_sticker_allowlist_info(const char *provider, const char *consumer) { int ret; sqlite3 *db = NULL; sqlite3_stmt *stmt = NULL; @@ -532,7 +532,7 @@ static void __insert_sticker_whitelist_info(const char *provider, const char *co sqlite3_finalize(stmt); sqlite3_close(db); } else { - LOGE("fail to insert sticker whiltelist : %s", sqlite3_errmsg(db)); + LOGE("fail to insert sticker allowlist : %s", sqlite3_errmsg(db)); sqlite3_finalize(stmt); sqlite3_close(db); } @@ -574,10 +574,10 @@ static int __get_sticker_info_from_json(const char *appid, const char *file_path goto cleanup; } - JsonArray *whitelist_arr = json_object_get_array_member(root_obj, "whitelist"); - if (whitelist_arr != NULL) { - for (int i = 0; i < json_array_get_length(whitelist_arr); i++) { - __insert_sticker_whitelist_info(appid, json_array_get_string_element(whitelist_arr, i)); + JsonArray *allowlist_arr = json_object_get_array_member(root_obj, "whitelist"); + if (allowlist_arr != NULL) { + for (int i = 0; i < json_array_get_length(allowlist_arr); i++) { + __insert_sticker_allowlist_info(appid, json_array_get_string_element(allowlist_arr, i)); } } @@ -706,7 +706,7 @@ cleanup: return ret; } -static void __delete_sticker_whitelist(const char *db_path, const char *app_id) +static void __delete_sticker_allowlist(const char *db_path, const char *app_id) { int ret; sqlite3 *db = NULL; @@ -718,7 +718,7 @@ static void __delete_sticker_whitelist(const char *db_path, const char *app_id) ret = sqlite3_prepare_v2(db, "DELETE FROM sticker_whitelist_info WHERE provider_id = ?", -1, &stmt, NULL); if (ret != SQLITE_OK) { - LOGE("failed to delete sticker whitelist : %s", sqlite3_errmsg(db)); + LOGE("failed to delete sticker allowlist : %s", sqlite3_errmsg(db)); sqlite3_finalize(stmt); sqlite3_close(db); goto cleanup; @@ -931,7 +931,7 @@ int PKGMGR_MDPARSER_PLUGIN_UNINSTALL(const char *pkgid, const char *appid, GList sqlite3_close(db); } - __delete_sticker_whitelist(db_path, appid); + __delete_sticker_allowlist(db_path, appid); return 0; } -- 2.7.4 From 087aac2ab6d6d9e3a76a7818ebea9f075bd21766 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Thu, 29 Oct 2020 10:28:04 +0900 Subject: [PATCH 07/16] Fixed issue regarding not able to check for the existence of the sticker Change-Id: Id684199f552d04e6d3c865eeafe5f49089d533fd --- client/sticker_defs.h | 1 + provider/sticker_provider.c | 29 +++++++++++++++++++++++------ server/stickerd_data_manager.c | 1 - 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/client/sticker_defs.h b/client/sticker_defs.h index 69167ec..f00e7da 100644 --- a/client/sticker_defs.h +++ b/client/sticker_defs.h @@ -49,6 +49,7 @@ extern "C" { } \ } \ } while (0) +#define STICKER_DIRECTORY "/opt/usr/share/sticker-data" typedef enum { STICKER_CLIENT_LIB_NONE, diff --git a/provider/sticker_provider.c b/provider/sticker_provider.c index 82e32c8..8b5ef32 100644 --- a/provider/sticker_provider.c +++ b/provider/sticker_provider.c @@ -136,26 +136,43 @@ EXPORT_API int sticker_provider_insert_data(sticker_provider_h provider_handle, 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); + int len = strlen(STICKER_DIRECTORY) + strlen(data_handle->app_id) + strlen(data_handle->uri) + 3; + char *new_path = (char *)calloc(len, sizeof(char)); + + if (data_handle->uri[0] == '/') + snprintf(new_path, len, "%s/%s%s",STICKER_DIRECTORY, data_handle->app_id, data_handle->uri); + else + snprintf(new_path, len, "%s/%s/%s",STICKER_DIRECTORY, data_handle->app_id, data_handle->uri); + + ret = sticker_dbus_check_file_exists(provider_handle->gdbus_connection, new_path, &is_exist); if (ret != STICKER_ERROR_NONE) { LOGE("Failed to check file exists : %d", ret); - return STICKER_ERROR_OPERATION_FAILED; + ret = STICKER_ERROR_OPERATION_FAILED; + goto cleanup; } if (is_exist) { LOGE("Sticker already exists"); - return STICKER_ERROR_FILE_EXISTS; + ret = STICKER_ERROR_FILE_EXISTS; + goto cleanup; } 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_NO_SUCH_FILE) - return STICKER_ERROR_NO_SUCH_FILE; + ret = STICKER_ERROR_NO_SUCH_FILE; else - return STICKER_ERROR_OPERATION_FAILED; + ret = STICKER_ERROR_OPERATION_FAILED; } - return STICKER_ERROR_NONE; + +cleanup: + if (new_path) { + free(new_path); + new_path = NULL; + } + + return ret; } EXPORT_API int sticker_provider_insert_data_by_json_file(sticker_provider_h provider_handle, const char *json_path, sticker_provider_insert_finished_cb callback, void *user_data) diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c index 1be9971..c9b8f8b 100644 --- a/server/stickerd_data_manager.c +++ b/server/stickerd_data_manager.c @@ -39,7 +39,6 @@ #endif #define LOG_TAG "STICKERD_DATA_MANAGER" -#define STICKER_DIRECTORY "/opt/usr/share/sticker-data" #define MAX_ERROR_BUFFER 256 static GHashTable *_monitoring_hash = NULL; -- 2.7.4 From 6f27f39935b01d05de6beefe0c13d68102398bee Mon Sep 17 00:00:00 2001 From: InHong Han Date: Thu, 29 Oct 2020 10:07:11 +0900 Subject: [PATCH 08/16] Update package version to 0.1.65 Change-Id: Ic26ef97758bd7436f773aab5fe60ad46c570cc6b --- 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 8b4618e..ff54d1a 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.64 +Version: 0.1.65 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index e1ecb31..d6ffeb2 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From 04f498b5312540cb744eebe27546f9c8f8c3fc8f Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 13 Nov 2020 17:35:30 +0900 Subject: [PATCH 09/16] Fix defect detected by static analysis tool Change-Id: I2c85677795cf9157f825d51440119fa031060b40 Signed-off-by: Jihoon Kim --- provider/sticker_provider.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/provider/sticker_provider.c b/provider/sticker_provider.c index 8b5ef32..bbac999 100644 --- a/provider/sticker_provider.c +++ b/provider/sticker_provider.c @@ -138,6 +138,9 @@ EXPORT_API int sticker_provider_insert_data(sticker_provider_h provider_handle, int len = strlen(STICKER_DIRECTORY) + strlen(data_handle->app_id) + strlen(data_handle->uri) + 3; char *new_path = (char *)calloc(len, sizeof(char)); + if (!new_path) { + return STICKER_ERROR_OUT_OF_MEMORY; + } if (data_handle->uri[0] == '/') snprintf(new_path, len, "%s/%s%s",STICKER_DIRECTORY, data_handle->app_id, data_handle->uri); @@ -416,4 +419,4 @@ EXPORT_API int sticker_provider_delete_data_by_uri(sticker_provider_h provider_h } return STICKER_ERROR_NONE; -} \ No newline at end of file +} -- 2.7.4 From 770a3ba32e0563ecb6f826315a35a68e4214d101 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 13 Nov 2020 17:44:20 +0900 Subject: [PATCH 10/16] Update package version to 0.1.66 Change-Id: Ic0d7d6f17690a7c0012b5514e563ffea6cf6a1e4 Signed-off-by: Jihoon Kim --- 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 ff54d1a..a3827dc 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.65 +Version: 0.1.66 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index d6ffeb2..38098cf 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From f93aa924e82e2a1db93bd73e43b3102314844e9e Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 11 Dec 2020 14:08:31 +0900 Subject: [PATCH 11/16] Reorganize directory structure Change-Id: I7f66fb73b28a7172b1284b1abe2ecb9723bdc563 --- CMakeLists.txt | 13 +- client/CMakeLists.txt | 33 ++++ {consumer => client/inc}/sticker_consumer_main.h | 0 client/{ => inc}/sticker_data_main.h | 0 client/{ => inc}/sticker_defs.h | 0 {provider => client/inc}/sticker_provider_main.h | 0 {consumer => client/src}/sticker_consumer.c | 197 +++++------------------ client/{ => src}/sticker_data.c | 46 +----- client/{ => src}/sticker_dbus.c | 46 +----- client/{ => src}/sticker_dbus.h | 0 {provider => client/src}/sticker_provider.c | 45 +----- consumer/CMakeLists.txt | 23 --- provider/CMakeLists.txt | 23 --- tests/CMakeLists.txt | 2 +- 14 files changed, 80 insertions(+), 348 deletions(-) create mode 100644 client/CMakeLists.txt rename {consumer => client/inc}/sticker_consumer_main.h (100%) rename client/{ => inc}/sticker_data_main.h (100%) rename client/{ => inc}/sticker_defs.h (100%) rename {provider => client/inc}/sticker_provider_main.h (100%) rename {consumer => client/src}/sticker_consumer.c (71%) rename client/{ => src}/sticker_data.c (93%) rename client/{ => src}/sticker_dbus.c (97%) rename client/{ => src}/sticker_dbus.h (100%) rename {provider => client/src}/sticker_provider.c (92%) delete mode 100644 consumer/CMakeLists.txt delete mode 100644 provider/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index b36454f..2c8aa49 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,7 @@ ADD_DEFINITIONS("-Werror") ## Include common directory ## INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/client") -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/provider") -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/consumer") +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/client/inc") ## Dependent packages ## INCLUDE(FindPkgConfig) @@ -35,15 +33,12 @@ pkg_check_modules(pkgs REQUIRED ## API ## ADD_SUBDIRECTORY(include) +## Sticker client ## +ADD_SUBDIRECTORY(client) + ## Sticker server ## ADD_SUBDIRECTORY(server) -## Sticker provider library ## -ADD_SUBDIRECTORY(provider) - -## Sticker consumer library ## -ADD_SUBDIRECTORY(consumer) - ## Sticker parser ## ADD_SUBDIRECTORY(sticker-parser) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt new file mode 100644 index 0000000..be848fc --- /dev/null +++ b/client/CMakeLists.txt @@ -0,0 +1,33 @@ +SET(CONSUMER_SRCS + src/sticker_consumer.c + src/sticker_data.c + src/sticker_dbus.c +) + +SET(PROVIDER_SRCS + src/sticker_provider.c + src/sticker_data.c + src/sticker_dbus.c +) + +INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/client/inc) + +FOREACH(flag ${pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall") + +## Add definitions ## +ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") + +## sticker consumer library ## +ADD_LIBRARY(${PROJECT_NAME}-consumer SHARED ${CONSUMER_SRCS}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME}-consumer ${pkgs_LDFLAGS}) + +## sticker provider library ## +ADD_LIBRARY(${PROJECT_NAME}-provider SHARED ${PROVIDER_SRCS}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME}-provider ${pkgs_LDFLAGS}) + +## Install library files ## +INSTALL(TARGETS ${PROJECT_NAME}-consumer DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME}-provider DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries) \ No newline at end of file diff --git a/consumer/sticker_consumer_main.h b/client/inc/sticker_consumer_main.h similarity index 100% rename from consumer/sticker_consumer_main.h rename to client/inc/sticker_consumer_main.h diff --git a/client/sticker_data_main.h b/client/inc/sticker_data_main.h similarity index 100% rename from client/sticker_data_main.h rename to client/inc/sticker_data_main.h diff --git a/client/sticker_defs.h b/client/inc/sticker_defs.h similarity index 100% rename from client/sticker_defs.h rename to client/inc/sticker_defs.h diff --git a/provider/sticker_provider_main.h b/client/inc/sticker_provider_main.h similarity index 100% rename from provider/sticker_provider_main.h rename to client/inc/sticker_provider_main.h diff --git a/consumer/sticker_consumer.c b/client/src/sticker_consumer.c similarity index 71% rename from consumer/sticker_consumer.c rename to client/src/sticker_consumer.c index 4f51fb5..39297bf 100644 --- a/consumer/sticker_consumer.c +++ b/client/src/sticker_consumer.c @@ -33,47 +33,6 @@ static cynara *p_cynara = NULL; -static void _free_sticker_data(sticker_data_h sticker_data) -{ - if (sticker_data->app_id) { - free(sticker_data->app_id); - sticker_data->app_id = NULL; - } - - if (sticker_data->uri) { - free(sticker_data->uri); - sticker_data->uri = NULL; - } - - if (sticker_data->thumbnail) { - free(sticker_data->thumbnail); - sticker_data->thumbnail = NULL; - } - - if (sticker_data->keyword) { - g_list_free_full(sticker_data->keyword, free); - sticker_data->keyword = NULL; - } - - if (sticker_data->group) { - free(sticker_data->group); - sticker_data->group = NULL; - } - - if (sticker_data->description) { - free(sticker_data->description); - sticker_data->description = NULL; - } - - if (sticker_data->date) { - free(sticker_data->date); - sticker_data->date = NULL; - } - - free(sticker_data); - sticker_data = NULL; -} - static int _cynara_initialize() { int ret = cynara_initialize(&p_cynara, NULL); @@ -143,6 +102,30 @@ static int _sticker_check_privilege() { return ret; } +static int _call_sticker_data_foreach_cb(sticker_consumer_h consumer_handle, GVariantIter *id_iter, sticker_consumer_data_foreach_cb callback, void *user_data) +{ + int ret; + int info_id; + int count = 0; + + if (!id_iter) return count; + + 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) + continue; + + ret = sticker_dbus_get_sticker_info_by_record_id(consumer_handle->gdbus_connection, sticker_data, info_id); + if (ret == STICKER_ERROR_NONE) { + count++; + callback(sticker_data, user_data); + } + sticker_data_destroy(sticker_data); + } + + return count; +} + EXPORT_API int sticker_consumer_create(sticker_consumer_h *consumer_handle) { CHECK_STICKER_FEATURE(); @@ -220,7 +203,6 @@ EXPORT_API int sticker_consumer_data_foreach_all(sticker_consumer_h consumer_han CHECK_STICKER_FEATURE(); int ret; - int info_id; int sticker_count = 0; GVariantIter *id_iter = NULL; @@ -234,25 +216,8 @@ EXPORT_API int sticker_consumer_data_foreach_all(sticker_consumer_h consumer_han 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; - } - } - } + if (id_iter) + sticker_count = _call_sticker_data_foreach_cb(consumer_handle, id_iter, callback, user_data); *result = sticker_count; @@ -268,7 +233,6 @@ EXPORT_API int sticker_consumer_data_foreach_by_keyword(sticker_consumer_h consu CHECK_STICKER_FEATURE(); int ret; - int info_id; int sticker_count = 0; GVariantIter *id_iter = NULL; @@ -282,25 +246,8 @@ EXPORT_API int sticker_consumer_data_foreach_by_keyword(sticker_consumer_h consu 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; - } - } - } + if (id_iter) + sticker_count = _call_sticker_data_foreach_cb(consumer_handle, id_iter, callback, user_data); *result = sticker_count; @@ -316,7 +263,6 @@ EXPORT_API int sticker_consumer_data_foreach_by_group(sticker_consumer_h consume CHECK_STICKER_FEATURE(); int ret; - int info_id; int sticker_count = 0; GVariantIter *id_iter = NULL; @@ -330,25 +276,8 @@ EXPORT_API int sticker_consumer_data_foreach_by_group(sticker_consumer_h consume 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; - } - } - } + if (id_iter) + sticker_count = _call_sticker_data_foreach_cb(consumer_handle, id_iter, callback, user_data); *result = sticker_count; @@ -364,7 +293,6 @@ EXPORT_API int sticker_consumer_data_foreach_by_type(sticker_consumer_h consumer CHECK_STICKER_FEATURE(); int ret; - int info_id; int sticker_count = 0; GVariantIter *id_iter = NULL; @@ -378,25 +306,8 @@ EXPORT_API int sticker_consumer_data_foreach_by_type(sticker_consumer_h consumer 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; - } - } - } + if (id_iter) + sticker_count = _call_sticker_data_foreach_cb(consumer_handle, id_iter, callback, user_data); *result = sticker_count; @@ -468,7 +379,6 @@ EXPORT_API int sticker_consumer_data_foreach_by_display_type(sticker_consumer_h CHECK_STICKER_FEATURE(); int ret; - int info_id; int sticker_count = 0; GVariantIter *id_iter = NULL; @@ -482,25 +392,8 @@ EXPORT_API int sticker_consumer_data_foreach_by_display_type(sticker_consumer_h 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; - } - } - } + if (id_iter) + sticker_count = _call_sticker_data_foreach_cb(consumer_handle, id_iter, callback, user_data); *result = sticker_count; @@ -562,7 +455,6 @@ EXPORT_API int sticker_consumer_get_recent_data_list(sticker_consumer_h consumer CHECK_STICKER_FEATURE(); int ret; - int info_id; int sticker_count = 0; GVariantIter *id_iter = NULL; @@ -576,25 +468,8 @@ EXPORT_API int sticker_consumer_get_recent_data_list(sticker_consumer_h consumer 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; - } - } - } + if (id_iter) + sticker_count = _call_sticker_data_foreach_cb(consumer_handle, id_iter, callback, user_data); *result = sticker_count; diff --git a/client/sticker_data.c b/client/src/sticker_data.c similarity index 93% rename from client/sticker_data.c rename to client/src/sticker_data.c index c0a5869..85d407e 100644 --- a/client/sticker_data.c +++ b/client/src/sticker_data.c @@ -93,50 +93,6 @@ cleanup: return NULL; } -static void _free_sticker_data(sticker_data_h sticker_data) -{ - if (!sticker_data) - return; - - if (sticker_data->app_id) { - free(sticker_data->app_id); - sticker_data->app_id = NULL; - } - - if (sticker_data->uri) { - free(sticker_data->uri); - sticker_data->uri = NULL; - } - - if (sticker_data->thumbnail) { - free(sticker_data->thumbnail); - sticker_data->thumbnail = NULL; - } - - if (sticker_data->keyword) { - g_list_free_full(sticker_data->keyword, free); - sticker_data->keyword = NULL; - } - - if (sticker_data->group) { - free(sticker_data->group); - sticker_data->group = NULL; - } - - if (sticker_data->description) { - free(sticker_data->description); - sticker_data->description = NULL; - } - - if (sticker_data->date) { - free(sticker_data->date); - sticker_data->date = NULL; - } - - free(sticker_data); - sticker_data = NULL; -} - EXPORT_API int sticker_data_create(sticker_data_h *data_handle) { CHECK_STICKER_FEATURE(); @@ -317,7 +273,7 @@ EXPORT_API int sticker_data_get_handle(const char* uri, sticker_data_h *data_han cleanup: if (handle) - _free_sticker_data(handle); + sticker_data_destroy(handle); if (gdbus_connection) { int ret_err = sticker_dbus_shutdown(gdbus_connection, &server_watcher_id, &server_monitor_id, &monitor_id, STICKER_CLIENT_LIB_PROVIDER); diff --git a/client/sticker_dbus.c b/client/src/sticker_dbus.c similarity index 97% rename from client/sticker_dbus.c rename to client/src/sticker_dbus.c index 9189de2..985f7e2 100644 --- a/client/sticker_dbus.c +++ b/client/src/sticker_dbus.c @@ -133,47 +133,6 @@ static void _get_sticker_info_from_gvariant(GVariantIter *info_iter, GVariantIte g_variant_iter_free(keyword_iter); } -static void _free_sticker_data(sticker_data_h sticker_data) -{ - if (sticker_data->app_id) { - free(sticker_data->app_id); - sticker_data->app_id = NULL; - } - - if (sticker_data->uri) { - free(sticker_data->uri); - sticker_data->uri = NULL; - } - - if (sticker_data->thumbnail) { - free(sticker_data->thumbnail); - sticker_data->thumbnail = NULL; - } - - if (sticker_data->keyword) { - g_list_free_full(sticker_data->keyword, free); - sticker_data->keyword = NULL; - } - - if (sticker_data->group) { - free(sticker_data->group); - sticker_data->group = NULL; - } - - if (sticker_data->description) { - free(sticker_data->description); - sticker_data->description = NULL; - } - - if (sticker_data->date) { - free(sticker_data->date); - sticker_data->date = NULL; - } - - free(sticker_data); - sticker_data = NULL; -} - static void _call_insert_finished_cb(sticker_provider_h provider_handle, GVariant *body) { int ret; @@ -196,6 +155,7 @@ static void _handle_sticker_consumer_cb(GDBusConnection *connection, gpointer user_data) { LOGD("own_name : %s, signal_name : %s", g_dbus_connection_get_unique_name(connection), signal_name); + sticker_consumer_h consumer_handle = (sticker_consumer_h)user_data; if (consumer_handle == NULL) { @@ -226,7 +186,7 @@ static void _handle_sticker_consumer_cb(GDBusConnection *connection, if (keyword_iter) g_variant_iter_free(keyword_iter); - _free_sticker_data(sticker_data); + sticker_data_destroy(sticker_data); } } } @@ -857,7 +817,7 @@ int sticker_dbus_update_sticker_info(GDBusConnection *gdbus_connection, sticker_ ret = _send_sync_message(gdbus_connection, g_variant_new("(i)", sticker_data->sticker_info_id), &reply, "send_update_event"); cleanup: - _free_sticker_data(origin_data); + sticker_data_destroy(origin_data); if (reply_body) g_variant_unref(reply_body); diff --git a/client/sticker_dbus.h b/client/src/sticker_dbus.h similarity index 100% rename from client/sticker_dbus.h rename to client/src/sticker_dbus.h diff --git a/provider/sticker_provider.c b/client/src/sticker_provider.c similarity index 92% rename from provider/sticker_provider.c rename to client/src/sticker_provider.c index bbac999..18181c9 100644 --- a/provider/sticker_provider.c +++ b/client/src/sticker_provider.c @@ -30,47 +30,6 @@ #endif #define LOG_TAG "STICKER_PROVIDER" -static void _free_sticker_data(sticker_data_h sticker_data) -{ - if (sticker_data->app_id) { - free(sticker_data->app_id); - sticker_data->app_id = NULL; - } - - if (sticker_data->uri) { - free(sticker_data->uri); - sticker_data->uri = NULL; - } - - if (sticker_data->thumbnail) { - free(sticker_data->thumbnail); - sticker_data->thumbnail = NULL; - } - - if (sticker_data->keyword) { - g_list_free_full(sticker_data->keyword, free); - sticker_data->keyword = NULL; - } - - if (sticker_data->group) { - free(sticker_data->group); - sticker_data->group = NULL; - } - - if (sticker_data->description) { - free(sticker_data->description); - sticker_data->description = NULL; - } - - if (sticker_data->date) { - free(sticker_data->date); - sticker_data->date = NULL; - } - - free(sticker_data); - sticker_data = NULL; -} - EXPORT_API int sticker_provider_create(sticker_provider_h *provider_handle) { CHECK_STICKER_FEATURE(); @@ -371,9 +330,9 @@ EXPORT_API int sticker_provider_data_foreach_all(sticker_provider_h provider_han if (ret == STICKER_ERROR_NONE) { sticker_count++; callback(sticker_data, user_data); - _free_sticker_data(sticker_data); + sticker_data_destroy(sticker_data); } else { - _free_sticker_data(sticker_data); + sticker_data_destroy(sticker_data); goto cleanup; } } diff --git a/consumer/CMakeLists.txt b/consumer/CMakeLists.txt deleted file mode 100644 index f98cc42..0000000 --- a/consumer/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -SET(SRCS - sticker_consumer.c - ../client/sticker_data.c - ../client/sticker_dbus.c -) - -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include) - -FOREACH(flag ${pkgs_CFLAGS}) - SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") -ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall") - -## Add definitions ## -ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") - -## sticker consumer library ## -ADD_LIBRARY(${PROJECT_NAME}-consumer SHARED ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME}-consumer ${pkgs_LDFLAGS}) - -## Install library files ## -INSTALL(TARGETS ${PROJECT_NAME}-consumer DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries) diff --git a/provider/CMakeLists.txt b/provider/CMakeLists.txt deleted file mode 100644 index ea3c48a..0000000 --- a/provider/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -SET(SRCS - sticker_provider.c - ../client/sticker_data.c - ../client/sticker_dbus.c -) - -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include) - -FOREACH(flag ${pkgs_CFLAGS}) - SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") -ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall") - -## Add definitions ## -ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") - -## sticker provider library ## -ADD_LIBRARY(${PROJECT_NAME}-provider SHARED ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME}-provider ${pkgs_LDFLAGS}) - -## Install library files ## -INSTALL(TARGETS ${PROJECT_NAME}-provider DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f28995b..032be6a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mock) AUX_SOURCE_DIRECTORY(src SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../common STICKER_COMMON_SOURCES) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../client STICKER_CLIENT_SOURCES) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../client/src STICKER_CLIENT_SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../consumer STICKER_CONSUMER_SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../provider STICKER_PROVIDER_SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock MOCK_SRCS) -- 2.7.4 From 63cd70ffc353c86702a1f3b79edda3f292f00867 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 7 Dec 2020 15:08:16 +0900 Subject: [PATCH 12/16] Remove unused code Change-Id: Ic4a1660edf15884c97906086187fef9003827019 Signed-off-by: Jihoon Kim --- client/src/sticker_dbus.c | 67 +------------------------------------- server/stickerd_data_manager.c | 74 +----------------------------------------- 2 files changed, 2 insertions(+), 139 deletions(-) diff --git a/client/src/sticker_dbus.c b/client/src/sticker_dbus.c index 985f7e2..a9f5635 100644 --- a/client/src/sticker_dbus.c +++ b/client/src/sticker_dbus.c @@ -190,51 +190,6 @@ static void _handle_sticker_consumer_cb(GDBusConnection *connection, } } } - - #if 0 // Receive the sticker information by asynchronous communication. - if (g_strcmp0(signal_name, "send_group_list") == 0) { - if (consumer_handle->group_foreach_cb != NULL) - _call_sticker_list_cb(consumer_handle, parameters, signal_name); - return; - } else if (g_strcmp0(signal_name, "send_keyword_list") == 0) { - if (consumer_handle->keyword_foreach_cb != NULL) - _call_sticker_list_cb(consumer_handle, parameters, signal_name); - return; - } - - sticker_data_h sticker_data = (sticker_data_h)calloc(1, sizeof(struct sticker_data_s)); - - if (!sticker_data) { - LOGE("failed to allocate memory"); - return; - } - - _get_sticker_info_from_gvariant(parameters, sticker_data); - - if (g_strcmp0(signal_name, "send_all_sticker_info") == 0) { - if (consumer_handle->data_foreach_cb != NULL) - consumer_handle->data_foreach_cb(sticker_data, consumer_handle->data_foreach_cb_user_data); - else - LOGW("No registered callback function"); - } else if (g_strcmp0(signal_name, "send_sticker_info_by_keyword") == 0) { - if (consumer_handle->data_foreach_by_keyword_cb != NULL) - consumer_handle->data_foreach_by_keyword_cb(sticker_data, consumer_handle->data_foreach_by_keyword_cb_user_data); - else - LOGW("No registered callback function"); - } else if (g_strcmp0(signal_name, "send_sticker_info_by_group") == 0) { - if (consumer_handle->data_foreach_by_group_cb != NULL) - consumer_handle->data_foreach_by_group_cb(sticker_data, consumer_handle->data_foreach_by_group_cb_user_data); - else - LOGW("No registered callback function"); - } else if (g_strcmp0(signal_name, "send_sticker_info_by_type") == 0) { - if (consumer_handle->data_foreach_by_type_cb != NULL) - consumer_handle->data_foreach_by_type_cb(sticker_data, consumer_handle->data_foreach_by_type_cb_user_data); - else - LOGW("No registered callback function"); - } - - _free_sticker_data(sticker_data); - #endif } //LCOV_EXCL_STOP @@ -263,26 +218,6 @@ static void _handle_sticker_provider_cb(GDBusConnection *connection, if (provider_handle->insert_finished_cb != NULL) _call_insert_finished_cb(provider_handle, parameters); } - - #if 0 // Receive the sticker information by asynchronous communication. - sticker_data_h sticker_data = (sticker_data_h)calloc(1, sizeof(struct sticker_data_s)); - - if (!sticker_data) { - LOGE("failed to allocate memory"); - return; - } - - _get_sticker_info_from_gvariant(parameters, sticker_data); - - if (g_strcmp0(signal_name, "send_sticker_info_by_appid") == 0) { - if (provider_handle->data_foreach_cb != NULL) - provider_handle->data_foreach_cb(sticker_data, provider_handle->data_foreach_cb_user_data); - else - LOGW("No registered callback function"); - } - - _free_sticker_data(sticker_data); - #endif } static int _dbus_signal_init(GDBusConnection *gdbus_connection, int *monitor_id, CLIENT_LIB lib, void *data) @@ -1209,4 +1144,4 @@ int sticker_dbus_get_sticker_info_by_uri(GDBusConnection *gdbus_connection, stic g_object_unref(reply); return ret; -} \ No newline at end of file +} diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c index dd506c7..d19dbdd 100644 --- a/server/stickerd_data_manager.c +++ b/server/stickerd_data_manager.c @@ -1335,78 +1335,6 @@ int stickerd_get_sticker_count(GVariant *parameters, GVariant **reply_body) return ret; } -#if 0 -// Send the sticker information by asynchronous communication. -static int send_sticker_info_async(int record_id, sticker_info_db_type type, const char *sender) -{ - int ret; - char *cmd = NULL; - - sticker_info_db *sticker_info = (sticker_info_db *)calloc(1, sizeof(sticker_info_db)); - - if (!sticker_info) - return STICKERD_SERVER_ERROR_OUT_OF_MEMORY; - - ret = stickerd_db_get_sticker_info_by_record_id(record_id, sticker_info); - if (ret != STICKERD_SERVER_ERROR_NONE) { - LOGE("Failed to get sticker info"); - free(sticker_info); - return STICKERD_SERVER_ERROR_OPERATION_FAILED; - } - - switch (type) { - case STICKER_DB_STICKER_ALL: - cmd = "send_all_sticker_info"; - break; - case STICKER_DB_STICKER_APPID: - cmd = "send_sticker_info_by_appid"; - break; - case STICKER_DB_STICKER_TYPE: - cmd = "send_sticker_info_by_type"; - break; - case STICKER_DB_STICKER_GROUP: - cmd = "send_sticker_info_by_group"; - break; - case STICKER_DB_STICKER_KEYWORD: - cmd = "send_sticker_info_by_keyword"; - break; - default: - cmd = ""; - break; - } - - GVariantBuilder *info_builder; - GVariantBuilder *keyword_builder; - - info_builder = g_variant_builder_new(G_VARIANT_TYPE("a{iv}")); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_INFO_ID, g_variant_new_int32(record_id)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_APP_ID, g_variant_new_string((const gchar *)sticker_info->app_id)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_URI_TYPE, g_variant_new_int32(sticker_info->type)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_URI, g_variant_new_string((const gchar *)sticker_info->uri)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_THUMBNAIL, g_variant_new_string((const gchar *)sticker_info->thumbnail)); - 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)); - - keyword_builder = g_variant_builder_new(G_VARIANT_TYPE("a(s)")); - g_list_foreach(sticker_info->keyword, (GFunc) _set_keyword_builder, keyword_builder); - - GVariant *body = g_variant_new("(a{iv}a(s))", info_builder, keyword_builder); - g_variant_builder_unref(info_builder); - g_variant_builder_unref(keyword_builder); - - ret = stickerd_send_dbus_message(body, sender, cmd); - if (ret != STICKERD_SERVER_ERROR_NONE) { - LOGE("Failed to send sticker info to client"); - free(sticker_info); - return STICKERD_SERVER_ERROR_OPERATION_FAILED; - } - - free(sticker_info); - return ret; -} -#endif - static void _set_id_builder(char *id, GVariantBuilder *id_builder) { if (!id) { @@ -1843,4 +1771,4 @@ cleanup: } return ret; -} \ No newline at end of file +} -- 2.7.4 From ea00e8e988443d6e5c9d76031613429e8152dc17 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Tue, 15 Dec 2020 19:10:58 +0900 Subject: [PATCH 13/16] Add a build option for enabling or disabling unittest --define "_ctest_enable true" Change-Id: I113abf03964403ccdd2a4643edb11d8c12d40103 --- CMakeLists.txt | 10 +++++++--- packaging/capi-ui-sticker.spec | 15 ++++++++++++++- tests/CMakeLists.txt | 6 ------ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c8aa49..916ce15 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,11 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}") SET(VERSION 0.2.56) +IF("${TEST_ENABLE}" STREQUAL "true") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_ENABLE=${TEST_ENABLE}") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_ENABLE=${TEST_ENABLE}") +ENDIF() + ADD_DEFINITIONS("-Werror") ## Include common directory ## @@ -48,14 +53,13 @@ ADD_SUBDIRECTORY(receiver) ENDIF() ## Test -IF(NOT DEFINED MINIMUM_BUILD) +IF("${TEST_ENABLE}" STREQUAL "true") ENABLE_TESTING() SET(UTC_STICKER sticker_unittests) ADD_TEST(NAME ${UTC_STICKER} COMMAND ${UTC_STICKER} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) - ADD_SUBDIRECTORY(tests) -ENDIF(NOT DEFINED MINIMUM_BUILD) +ENDIF() ## config ## INSTALL(FILES ${CMAKE_SOURCE_DIR}/capi-ui-sticker.info DESTINATION ${TZ_SYS_RO_SHARE}/parser-plugins) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 1acfa91..c1203a1 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -85,6 +85,7 @@ Group: Graphics & UI Framework/Input Sticker client library and daemon (gcov) %endif +%if %{defined _ctest_enable} %package unittests Summary: Sticker tests Group: Development/Libraries @@ -92,6 +93,7 @@ Requires: %{name} = %{version}-%{release} %description unittests GTest for sticker +%endif %prep %setup -q -n %{name}-%{version} @@ -115,7 +117,13 @@ export FFLAGS+=" -DTIZEN_DEBUG_ENABLE -fvisibility=hidden" %endif -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \ -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN -DTZ_USER_SHARE=%TZ_USER_SHARE \ - -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES + -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \ +%if %{defined _ctest_enable} + -DTEST_ENABLE="%{_ctest_enable}" \ +%else + -DTEST_ENABLE="false" \ +%endif + make %{?jobs:-j%jobs} %if 0%{?gcov:1} @@ -152,7 +160,10 @@ tar xf %{name}-gcov.tar -C %{buildroot}%{_datadir}/gcov/obj %endif %check +%if "%{_ctest_enable}" == "true" ctest --output-on-failure %{?_smp_mflags} +%endif + %if 0%{?gcov:1} lcov -c --ignore-errors graph --no-external -q -d . -o gcov.info genhtml gcov.info @@ -203,8 +214,10 @@ chsmack -a "User::App::Shared" /opt/usr/share/sticker-data %{TZ_SYS_RO_APP}/%{_companion_app_name}/* %endif +%if %{defined _ctest_enable} %files unittests %{_bindir}/* +%endif %if 0%{?gcov:1} %files gcov diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 032be6a..eea11f2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -16,19 +16,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mock) AUX_SOURCE_DIRECTORY(src SOURCES) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../common STICKER_COMMON_SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../client/src STICKER_CLIENT_SOURCES) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../consumer STICKER_CONSUMER_SOURCES) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../provider STICKER_PROVIDER_SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock MOCK_SRCS) ADD_DEFINITIONS("-DFULLVER=\"${FULLVER}\"") ADD_EXECUTABLE(${UTC_STICKER} - ${STICKER_COMMON_SOURCES} ${STICKER_CLIENT_SOURCES} - ${STICKER_CONSUMER_SOURCES} - ${STICKER_PROVIDER_SOURCES} ${MOCK_SRCS} ${SOURCES} ) -- 2.7.4 From 2e446c6cd8be3a4954230168cb3360a0df4aa6ee Mon Sep 17 00:00:00 2001 From: InHong Han Date: Tue, 15 Dec 2020 19:15:17 +0900 Subject: [PATCH 14/16] Update package version to 0.1.67 Change-Id: I208a926f8e0e8e59b788a3118451b740a7bb1b60 --- 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 c1203a1..c4d8fe9 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.66 +Version: 0.1.67 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index 38098cf..55240db 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From 69e3705646729e9f06f274cacdc8dd62d4d17054 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Mon, 4 Jan 2021 18:29:23 +0900 Subject: [PATCH 15/16] Fix issue that fail to insert stickers when using json file Change-Id: I158c0b78195aba31b8e53c712a8f1ac211d192f2 --- sticker-parser/sticker-parser.c | 48 +++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/sticker-parser/sticker-parser.c b/sticker-parser/sticker-parser.c index 1dc1a48..063aa87 100644 --- a/sticker-parser/sticker-parser.c +++ b/sticker-parser/sticker-parser.c @@ -30,6 +30,7 @@ #include #include #include +#include #ifndef EXPORT_API #define EXPORT_API __attribute__((visibility("default"))) @@ -364,12 +365,21 @@ cleanup: static char* __convert_sticker_uri(char *uri, const char *appid, const char *app_path) { int ret; + char *copy_uri = (char *)calloc(PATH_MAX, sizeof(char)); + if (copy_uri == NULL) { + LOGE("failed to allocate memory"); + return NULL; + } + strncpy(copy_uri, uri, PATH_MAX - 1); __remove_app_path(uri, app_path); int len = strlen(STICKER_DIRECTORY) + strlen(appid) + strlen(uri) + 2; char *new_path = (char *)calloc(len, sizeof(char)); - if (new_path == NULL) - return NULL; + if (new_path == NULL) { + LOGE("failed to allocate memory"); + ret = -1; + goto cleanup; + } snprintf(new_path, len, "%s/%s%s",STICKER_DIRECTORY, appid, uri); @@ -385,14 +395,14 @@ static char* __convert_sticker_uri(char *uri, const char *appid, const char *app goto cleanup; } - if (__file_copy(uri, new_path) == -1) { + if (__file_copy(copy_uri, new_path) == -1) { strerror_r(errno, error_buffer, MAX_ERROR_BUFFER); LOGE("failed to copy sticker file : %s", error_buffer); ret = -1; goto cleanup; } - ret = unlink(uri); + ret = unlink(copy_uri); if (ret != 0) { strerror_r(errno, error_buffer, MAX_ERROR_BUFFER); LOGE("failed to remove sticker file : %s", error_buffer); @@ -402,11 +412,16 @@ static char* __convert_sticker_uri(char *uri, const char *appid, const char *app LOGE("failed to change ownership"); cleanup: + free(copy_uri); + copy_uri = NULL; + if (ret == 0) { return new_path; } else { - free(new_path); - new_path = NULL; + if (new_path) { + free(new_path); + new_path = NULL; + } return NULL; } } @@ -605,10 +620,25 @@ static int __get_sticker_info_from_json(const char *appid, const char *file_path goto free_memory; char *rel_thumbnail = __get_string_from_object(info_object, "thumbnail"); - if (rel_thumbnail) { - if (rel_thumbnail[0] != '\0') + if (rel_thumbnail && rel_thumbnail[0] != '\0') { + if (access(rel_thumbnail, F_OK) == 0) { thumbnail_path = __convert_sticker_uri(rel_thumbnail, appid, app_path); - + } else { + int len = strlen(app_path) + strlen(rel_thumbnail) + 2; + char *new_thumbnail_path = (char *)calloc(len, sizeof(char)); + if (new_thumbnail_path) { + if (rel_thumbnail[0] == '/') + snprintf(new_thumbnail_path, len, "%s%s",app_path, rel_thumbnail); + else + snprintf(new_thumbnail_path, len, "%s%s%s",app_path, "/", rel_thumbnail); + + if (access(new_thumbnail_path, F_OK) == 0) + thumbnail_path = __convert_sticker_uri(new_thumbnail_path, appid, app_path); + + free(new_thumbnail_path); + new_thumbnail_path = NULL; + } + } free(rel_thumbnail); } -- 2.7.4 From 42a3bcb3647ea7b72652b43345b23f9623d10b70 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Mon, 4 Jan 2021 18:43:14 +0900 Subject: [PATCH 16/16] Update package version to 0.1.68 Change-Id: I00f484767d41d5ad51d3205a0ab4cb112d6a0600 --- 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 c4d8fe9..e833da7 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.67 +Version: 0.1.68 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index 55240db..55273cc 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4