Merge "Fix ASAN issue multiple definition of variable" into tizen

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-opp-client.c

diff --git a/bt-api/bt-opp-client.c b/bt-api/bt-opp-client.c
index 014806f..b69d2bd 100644 (file)
--- a/bt-api/bt-opp-client.c
+++ b/bt-api/bt-opp-client.c
@@ -24,7 +24,7 @@
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
 
-#ifdef TIZEN_DPM_ENABLE
+#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
 #endif
 
@@ -58,7 +58,7 @@ BT_EXPORT_API int bluetooth_opc_deinit(void)
 }
 
 BT_EXPORT_API int bluetooth_opc_push_files(bluetooth_device_address_t *remote_address,
-                                char **file_name_array)
+                       char **file_name_array)
 {
        int result;
        int i;
@@ -77,7 +77,7 @@ BT_EXPORT_API int bluetooth_opc_push_files(bluetooth_device_address_t *remote_ad
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-#ifdef TIZEN_DPM_ENABLE
+#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, remote_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -191,14 +191,45 @@ BT_EXPORT_API int bluetooth_opc_is_sending(gboolean *is_sending)
        result = _bt_send_request(BT_OBEX_SERVICE, BT_OPP_IS_PUSHING_FILES,
                in_param1, in_param2, in_param3, in_param4, &out_param);
 
-       if (result == BLUETOOTH_ERROR_NONE) {
+       if (result == BLUETOOTH_ERROR_NONE)
                *is_sending = g_array_index(out_param, gboolean, 0);
+       else
+               BT_ERR("Fail to send request");
+
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_opp_get_transfer_progress(bluetooth_opp_transfer_type_t transfer_type,
+               int transfer_id, unsigned char *progress)
+{
+       int result;
+       int direction = transfer_type;
+       int percentage = 0;
+       BT_CHECK_ENABLED(return);
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &direction, sizeof(int));
+       g_array_append_vals(in_param2, &transfer_id, sizeof(int));
+
+       result = _bt_send_request(BT_OBEX_SERVICE, BT_OPP_GET_TRANSFER_PROGRESS,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result == BLUETOOTH_ERROR_NONE) {
+               percentage = g_array_index(out_param, guint8, 0);
+               BT_DBG("Percentage: %d", percentage);
        } else {
                BT_ERR("Fail to send request");
        }
 
+       if (progress)
+               *progress = percentage;
+
        BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
        return result;
 }
-