Remove MAP client implementation code 71/203971/2
authorDoHyun Pyun <dh79.pyun@samsung.com>
Thu, 18 Apr 2019 08:34:45 +0000 (17:34 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Thu, 18 Apr 2019 08:35:20 +0000 (17:35 +0900)
Change-Id: Ibc558a98ecf1cf331fdc7d308dccf818b4de7de7
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
src/bluetooth-common.c
src/bluetooth-map-client.c

index 763e5cda0a0bff3687b2e16b6ec3859f573536c7..b44e1c07fbfbd063c47495d4b07851e31cb95f61 100644 (file)
@@ -1731,78 +1731,29 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
 
        case BLUETOOTH_EVENT_MAP_CONNECTED:
                BT_INFO("bt_map_client_??????????_cb() will be called");
-               bd_addr = (bluetooth_device_address_t *)(param->param_data);
-               _bt_convert_address_to_string(&device_addr, bd_addr);
-
-               /* TODO: MAP, see above */
-
-               if (device_addr != NULL)
-                       free(device_addr);
                break;
 
        case BLUETOOTH_EVENT_MAP_DISCONNECTED:
                BT_INFO("bt_map_client_??????????_cb() will be called");
-               bd_addr = (bluetooth_device_address_t *)(param->param_data);
-               _bt_convert_address_to_string(&device_addr, bd_addr);
-
-               /* TODO: MAP, see above */
-
-               if (device_addr != NULL)
-                       free(device_addr);
                break;
        case BLUETOOTH_EVENT_MAP_LIST_FOLDERS_COMPLETE:
                BT_INFO("BLUETOOTH_EVENT_MAP_LIST_FOLDERS_COMPLETE event");
-               //do not need to release memory, it is managed by bluetooth-frwk
-               bt_map_client_folders_s* folders_struct = (bt_map_client_folders_s*) param->param_data;
-               ((bt_map_client_list_folders_cb)bt_event_slot_container[event_index].callback)
-                                                       (param->result, folders_struct->names, folders_struct->size,
-                                                                       bt_event_slot_container[event_index].user_data);
                break;
 
        case BLUETOOTH_EVENT_MAP_LIST_FILTER_FIELD_COMPLETE:
-               {
-                       BT_INFO(" BLUETOOTH_EVENT_MAP_LIST_FILTER_FIELD_COMPLETE event");
-                       bt_map_list_filter_fields_info_t* fields_info = (bt_map_list_filter_fields_info_t*)(param->param_data);
-
-                       ((bt_map_client_list_filter_fields_cb)bt_event_slot_container[event_index].callback)
-                                                       (param->result, fields_info->fields, fields_info->size,
-                                                       bt_event_slot_container[event_index].user_data);
-               }
+               BT_INFO(" BLUETOOTH_EVENT_MAP_LIST_FILTER_FIELD_COMPLETE event");
                break;
 
        case BLUETOOTH_EVENT_MAP_LIST_MESSAGES_COMPLETE:
                BT_INFO("BLUETOOTH_EVENT_MAP_LIST_MESSAGES_COMPLETE event");
-               bt_map_client_message_items_s* messages_struct = (bt_map_client_message_items_s*) param->param_data;
-               ((bt_map_client_list_messages_cb)bt_event_slot_container[event_index].callback)(
-                       param->result,
-                       (bt_map_client_message_item_s*)(messages_struct->message_items),
-                       messages_struct->size,
-                       bt_event_slot_container[event_index].user_data);
                break;
 
        case BLUETOOTH_EVENT_MAP_GET_MESSAGE_COMPLETE:
                BT_INFO("BLUETOOTH_EVENT_MAP_GET_MESSAGE_COMPLETE event");
-
-               bt_get_message_callback_data *data = bt_event_slot_container[event_index].user_data;
-               char *target_file = (char*) data->target_file;
-               void *map_user_data = data->user_data;
-
-               bt_map_client_message_s *res = g_malloc0(sizeof(bt_map_client_message_s));
-               res->file_path = target_file;
-
-               ((bt_map_client_get_message_cb)bt_event_slot_container[event_index].callback)(
-                       param->result, res, map_user_data);
-
-               g_free(res);
-               g_free(data);
                break;
 
        case BLUETOOTH_EVENT_MAP_PUSH_MESSAGE_COMPLETE:
                BT_INFO("BLUETOOTH_EVENT_MAP_PUSH_MESSAGE_COMPLETE event");
-
-               ((bt_map_client_push_message_cb)bt_event_slot_container[event_index].callback)(
-                       param->result,
-                       bt_event_slot_container[event_index].user_data);
                break;
 
        case BLUETOOTH_EVENT_NETWORK_SERVER_CONNECTED:
index c6b99539a8560ee0f512c88c441f9c7aa00bcfbf..ce946193e4459548b8ddab0a8bf89d16103f3b7c 100644 (file)
  * limitations under the License.
  */
 
-#include <glib.h>
-#include <dlog.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <bluetooth-api.h>
-
 #include "bluetooth.h"
 #include "bluetooth_private.h"
 
-static bool is_map_client_initialized = false;
-
-#define BT_CHECK_MAP_CLIENT_SUPPORT() \
-{ \
-       BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
-       BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_MAP); \
-}
-
-#define BT_CHECK_MAP_CLIENT_INIT_STATUS() \
-       if (__bt_check_map_client_init_status() == BT_ERROR_NOT_INITIALIZED) { \
-               BT_ERR("[%s] NOT_INITIALIZED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_INITIALIZED); \
-               return BT_ERROR_NOT_INITIALIZED; \
-       }
-/* LCOV_EXCL_START */
-int __bt_check_map_client_init_status(void)
-{
-       if (is_map_client_initialized != true) {
-               BT_ERR("NOT_INITIALIZED(0x%08x)", BT_ERROR_NOT_INITIALIZED);
-               return BT_ERROR_NOT_INITIALIZED;
-       }
-
-       return BT_ERROR_NONE;
-}
-
 int bt_map_client_initialize(void)
 {
-       BT_DBG("bt_map_client_initialize");
-
-       int error_code = BT_ERROR_NONE;
-
-       // TODO: MAP: it is not supported on TM1
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-
-       error_code = _bt_get_error_code(bluetooth_map_client_init());
-
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), /* LCOV_EXCL_LINE */
-                               error_code); /* LCOV_EXCL_LINE */
-               return error_code; /* LCOV_EXCL_LINE */
-       }
-
-       is_map_client_initialized = true;
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_deinitialize(void)
 {
-       BT_DBG("bt_map_client_deinitialize");
-
-       int error_code = BT_ERROR_NONE;
-
-       // TODO: MAP: it is not supported on TM1
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-
-       error_code = _bt_get_error_code(bluetooth_map_client_deinit());
-
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), /* LCOV_EXCL_LINE */
-                               error_code); /* LCOV_EXCL_LINE */
-               return error_code; /* LCOV_EXCL_LINE */
-       }
-
-       is_map_client_initialized = false;
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_create_session(const char* remote_address,
                        bt_map_client_session_info_h* handle)
 {
-       BT_DBG("bt_map_client_create_session");
-       int error_code = BT_ERROR_NONE;
-
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(remote_address);
-
-       bt_map_client_session_info_s* session =
-               g_malloc0(sizeof(bt_map_client_session_info_s));
-       session->remote_address = strdup(remote_address);
-
-       error_code = _bt_get_error_code(bluetooth_map_client_create_session(session));
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
-                               error_code);
-               free(session->remote_address);
-               g_free(session);
-       } else {
-               BT_DBG("Successfully created session");
-               *handle = session;
-       }
-       return error_code;
-
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_destroy_session(bt_map_client_session_info_h handle)
 {
-       BT_DBG("bt_map_client_destroy_session");
-       int error_code = BT_ERROR_NONE;
-
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(handle);
-
-       bt_map_client_session_info_s* session = (bt_map_client_session_info_s*)handle;
-
-       error_code = _bt_get_error_code(bluetooth_map_client_destroy_session(session));
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
-                               error_code);
-       } else {
-               BT_DBG("Successfully destroyed session");
-       }
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_set_folder(bt_map_client_session_info_h handle, const char *name)
 {
-       int error_code = BT_ERROR_NONE;
-
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(handle);
-       BT_CHECK_INPUT_PARAMETER(name);
-
-       bt_map_client_session_info_s* session = (bt_map_client_session_info_s*)handle;
-
-       error_code = _bt_get_error_code(bluetooth_map_client_set_folder(session, name));
-
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
-                               error_code);
-       }
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_list_folders(bt_map_client_session_info_h handle,
@@ -170,55 +48,14 @@ int bt_map_client_list_folders(bt_map_client_session_info_h handle,
                        bt_map_client_list_folders_cb callback,
                        void* user_data)
 {
-       BT_DBG("bt_map_client_list_folders");
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(handle);
-       BT_CHECK_INPUT_PARAMETER(filter);
-       BT_CHECK_INPUT_PARAMETER_UINT(filter->offset);
-       BT_CHECK_INPUT_PARAMETER_UINT(filter->max_count);
-
-       bt_map_client_session_info_s* session = (bt_map_client_session_info_s*) handle;
-
-       int error_code = _bt_get_error_code(
-               bluetooth_map_client_list_folders(
-                       session,
-                       (bt_map_client_list_folders_filter_t*) filter
-               )
-       );
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("bt_map_client_list_folders %s(0x%08x)", _bt_convert_error_to_string(error_code),
-                               error_code);
-       } else {
-               _bt_set_cb(BT_EVENT_MAP_CLIENT_LIST_FOLDERS, callback, user_data);
-       }
-
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_list_filter_fields(bt_map_client_session_info_h handle,
                        bt_map_client_list_filter_fields_cb callback,
                        void *user_data)
 {
-       int error_code = BT_ERROR_NONE;
-
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(handle);
-
-       bt_map_client_session_info_s* session = (bt_map_client_session_info_s*) handle;
-
-       error_code = _bt_get_error_code(bluetooth_map_client_list_filter_fields(session));
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
-                               error_code);
-       } else {
-               _bt_set_cb(BT_EVENT_MAP_CLIENT_LIST_FILTER_FIELDS, callback, user_data);
-       }
-
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_list_messages(bt_map_client_session_info_h handle,
@@ -227,56 +64,12 @@ int bt_map_client_list_messages(bt_map_client_session_info_h handle,
                        bt_map_client_list_messages_cb callback,
                        void *user_data)
 {
-       BT_DBG("bt_map_client_list_messages");
-
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(handle);
-       BT_CHECK_INPUT_PARAMETER(filter);
-       BT_CHECK_INPUT_PARAMETER_UINT(filter->offset);
-       BT_CHECK_INPUT_PARAMETER_UINT(filter->max_count);
-       BT_CHECK_INPUT_PARAMETER_UINT(filter->subject_length);
-       BT_CHECK_INPUT_PARAMETER_BOOL(filter->is_read);
-       BT_CHECK_INPUT_PARAMETER_BOOL(filter->is_priority);
-
-       bt_map_client_session_info_s* session = (bt_map_client_session_info_s*) handle;
-
-       int error_code = _bt_get_error_code(
-               bluetooth_map_client_list_messages(
-                       session,
-                       folder,
-                       (bt_map_client_list_messages_filter_t*) filter
-               )
-       );
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("bluetooth_map_client_list_messages %s(0x%08x)",
-                       _bt_convert_error_to_string(error_code), error_code);
-       } else {
-               _bt_set_cb(BT_EVENT_MAP_CLIENT_LIST_MESSAGES, callback, user_data);
-       }
-
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_update_inbox(bt_map_client_session_info_h handle)
 {
-       int error_code = BT_ERROR_NONE;
-
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(handle);
-
-       bt_map_client_session_info_s* session = (bt_map_client_session_info_s*)handle;
-
-       error_code = _bt_get_error_code(bluetooth_map_client_update_inbox(session));
-
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
-                               error_code);
-       }
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_push_message(bt_map_client_session_info_h handle,
@@ -286,34 +79,7 @@ int bt_map_client_push_message(bt_map_client_session_info_h handle,
                        bt_map_client_push_message_cb callback,
                        void *user_data)
 {
-       BT_DBG("Entered bt_map_client_get_message");
-
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(handle);
-       BT_CHECK_INPUT_PARAMETER(source_file);
-       BT_CHECK_INPUT_PARAMETER(folder);
-       BT_CHECK_INPUT_PARAMETER(args);
-
-       bt_map_client_session_info_s* session = (bt_map_client_session_info_s*)handle;
-
-       int error_code = _bt_get_error_code(
-               bluetooth_map_client_push_message(
-                       session,
-                       source_file,
-                       folder,
-                       (bt_map_client_push_message_args_t*) args
-               )
-       );
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("bluetooth_map_client_push_message %s(0x%08x)",
-                       _bt_convert_error_to_string(error_code), error_code);
-       } else {
-               _bt_set_cb(BT_EVENT_MAP_CLIENT_PUSH_MESSAGE, callback, user_data);
-       }
-
-       return error_code;
+       return BT_ERROR_NOT_SUPPORTED;
 }
 
 int bt_map_client_get_message(bt_map_client_session_info_h handle,
@@ -323,78 +89,5 @@ int bt_map_client_get_message(bt_map_client_session_info_h handle,
                        bt_map_client_get_message_cb callback,
                        void* user_data)
 {
-       BT_DBG("Entered bt_map_client_get_message");
-       //BT_CHECK_MAP_CLIENT_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_MAP_CLIENT_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(handle);
-       BT_CHECK_INPUT_PARAMETER(message_object);
-       BT_CHECK_INPUT_PARAMETER(target_file);
-
-       bt_map_client_session_info_s* session = (bt_map_client_session_info_s*) handle;
-
-       int error_code = _bt_get_error_code(bluetooth_map_client_get_message(session,
-                       message_object, target_file, attachment));
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("bt_map_client_get_message %s(0x%08x)", _bt_convert_error_to_string(error_code),
-                               error_code);
-       } else {
-               bt_get_message_callback_data *data = g_malloc(sizeof(*data));
-               data->target_file = target_file;
-               data->user_data = user_data;
-
-               _bt_set_cb(BT_EVENT_MAP_CLIENT_GET_MESSAGE, callback, data);
-       }
-
-       return error_code;
-}
-
-void bt_map_client_list_folders_filter_create(bt_map_client_list_folders_filter_h *filter)
-{
-       (*filter) = g_malloc(sizeof(bt_map_client_list_folders_filter_s));
-       (*filter)->offset = -1;
-       (*filter)->max_count = -1;
-}
-
-void bt_map_client_list_folders_filter_destroy(bt_map_client_list_folders_filter_h *filter)
-{
-       g_free(*filter);
-       *filter = NULL;
-}
-
-void bt_map_client_list_messages_filter_create(bt_map_client_list_messages_filter_h *filter)
-{
-       (*filter) = g_malloc(sizeof(bt_map_client_list_messages_filter_s));
-       (*filter)->offset = -1;
-       (*filter)->max_count = -1;
-       (*filter)->subject_length = -1;
-       (*filter)->fields = NULL;
-       (*filter)->types = NULL;
-       (*filter)->period_begin = NULL;
-       (*filter)->period_end = NULL;
-       (*filter)->is_read = -1;
-       (*filter)->recipient = NULL;
-       (*filter)->sender = NULL;
-       (*filter)->is_priority = -1;
-}
-
-void bt_map_client_list_messages_filter_destroy(bt_map_client_list_messages_filter_h *filter)
-{
-       g_free(*filter);
-       *filter = NULL;
-}
-
-void bt_map_client_push_message_args_create(bt_map_client_push_message_args_h *args)
-{
-       (*args) = g_malloc(sizeof(bt_map_client_push_message_args_s));
-       (*args)->is_transparent = -1;
-       (*args)->is_retry = -1;
-       (*args)->charset =  NULL;
-}
-
-void bt_map_client_push_message_args_destroy(bt_map_client_push_message_args_h *args)
-{
-       g_free(*args);
-       *args = NULL;
+       return BT_ERROR_NOT_SUPPORTED;
 }
-/* LCOV_EXCL_STOP */