From ad2fc40b24e573ccad6100eadda380686210b63b Mon Sep 17 00:00:00 2001 From: InHong Han Date: Wed, 1 Apr 2020 20:07:16 +0900 Subject: [PATCH] Add a new message to notify disconnection Change-Id: Ia65b927b18b0722f74b555039f8eea70b3cc973a --- receiver/inc/ft.h | 1 + receiver/src/ft.cpp | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/receiver/inc/ft.h b/receiver/inc/ft.h index 0a022a6..c20f0af 100644 --- a/receiver/inc/ft.h +++ b/receiver/inc/ft.h @@ -32,5 +32,6 @@ void deinitialize_sap(void); bool request_sticker_data(const char *mode, const char *category, const char *type); void request_sticker_feature(); +void send_disconnect_message(); #endif /* __FT_H__ */ diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp index bd8ae56..3e78566 100644 --- a/receiver/src/ft.cpp +++ b/receiver/src/ft.cpp @@ -53,6 +53,7 @@ #define STICKER_SEND_FACE_DATA "sticker-send-face-data" #define STICKER_SEND_STOP_REQ "sticker-send-stop-req" #define STICKER_SEND_STOP_RSP "sticker-send-stop-rsp" +#define STICKER_SEND_DISCONNECT_REQ "sticker-send-disconnect-req" #ifndef VCONFKEY_STICKER_SYNC_COMPLETE_DONE #define VCONFKEY_STICKER_SYNC_COMPLETE_DONE 0x1 @@ -413,6 +414,25 @@ void request_sticker_feature() LOGE("Failed to create thumbnail directory"); } +void send_disconnect_message() +{ + JsonObject *j_object = NULL; + j_object = json_object_new(); + if (j_object == NULL) { + LOGE("json object create error"); + return; + } + + json_object_set_string_member(j_object, "msgId", STICKER_SEND_DISCONNECT_REQ); + json_object_set_int_member(j_object, "tID", t_id); + + if (_send_json_data(j_object) == FALSE) { + LOGE("Failed to send STICKER_SEND_DISCONNECT_REQ"); + } + + json_object_unref(j_object); +} + void reject_file() { int ret = sap_file_transfer_reject(priv_data.file_socket); @@ -556,6 +576,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in #endif if (!process_request_queue()) { + send_disconnect_message(); service_app_exit(); } } else if (msg_id == STICKER_SYNC_START_RSP) { @@ -583,6 +604,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in if (result_code != SYNC_START_RSP_SUCCESS) { set_sync_progressing(FALSE); if (!process_request_queue()) { + send_disconnect_message(); service_app_exit(); } } @@ -706,6 +728,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in sync_success_cnt = 0; + send_disconnect_message(); service_app_exit(); } -- 2.7.4