#include <dlog.h>
#include <string.h>
#include <dirent.h>
-#ifdef TIZEN_DPM_ENABLE
+#ifdef TIZEN_FEATURE_BT_DPM
#include "bt-service-dpm.h"
#endif
static char *__bt_get_remote_device_name(const char *bdaddress)
{
char *device_path = NULL;
- char *name = NULL;
- GVariant *value;
+ const gchar *name = NULL;
+ gchar *dev_name = NULL;
+ gsize name_len = 0;
GVariant *result = NULL;
GError *err = NULL;
GDBusProxy *device_proxy;
g_free(device_path);
retv_if(device_proxy == NULL, NULL);
- result = g_dbus_proxy_call_sync(device_proxy, "GetAll",
- g_variant_new("(s)", BT_DEVICE_INTERFACE),
- G_DBUS_CALL_FLAGS_NONE,
- DBUS_TIMEOUT, NULL,
- &err);
+ result = g_dbus_proxy_call_sync(device_proxy, "Get",
+ g_variant_new("(ss)", BT_DEVICE_INTERFACE, "Alias"),
+ G_DBUS_CALL_FLAGS_NONE, DBUS_TIMEOUT, NULL, &err);
if (err) {
BT_ERR("DBus Error : %s", err->message);
g_clear_error(&err);
- return NULL;
- }
- if (result == NULL) {
- BT_ERR("g_dbus_proxy_call_sync function return NULL");
- return NULL;
+ } else {
+ GVariant *value;
+ g_variant_get(result, "(v)", &value);
+ name = g_variant_get_string(value, &name_len);
+ INFO_SECURE("Alias Name [%s]", name);
+ if (name_len)
+ dev_name = g_strdup(name);
+ g_variant_unref(value);
+ g_variant_unref(result);
}
- g_variant_get(result, "(@a{sv})", &value);
- if (value) {
- GVariant *temp_value = g_variant_lookup_value(value, "Alias",
- G_VARIANT_TYPE_STRING);
- g_variant_get(temp_value, "s", &name);
- if (temp_value)
- g_variant_unref(temp_value);
-
- if (name != NULL)
- DBG_SECURE("Alias Name [%s]", name);
- else {
- temp_value = g_variant_lookup_value(value, "Name", G_VARIANT_TYPE_STRING);
- g_variant_get(temp_value, "s", &name);
- if (temp_value)
- g_variant_unref(temp_value);
- DBG_SECURE("Name = %s", name);
+ if (name_len == 0) {
+ result = g_dbus_proxy_call_sync(device_proxy, "Get",
+ g_variant_new("(ss)", BT_DEVICE_INTERFACE, "Name"),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) {
+ ERR("DBus Error : %s", err->message);
+ g_clear_error(&err);
+ } else {
+ GVariant *value;
+ g_variant_get(result, "(v)", &value);
+ name = g_variant_get_string(value, &name_len);
+ INFO_SECURE("Name = %s", name);
+ if (name_len)
+ dev_name = g_strdup(name);
+ g_variant_unref(value);
+ g_variant_unref(result);
}
}
- g_variant_unref(result);
+
g_object_unref(device_proxy);
- return name;
+ return dev_name;
}
static void __bt_get_remote_device_name_authinfo(const char *bdaddress,
GDBusProxy *proxy;
GError *err = NULL;
- conn = _bt_gdbus_get_session_gconn();
+ conn = _bt_gdbus_get_system_gconn();
retv_if(conn == NULL, NULL);
proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
BT_OBEX_TRANSFER_INTERFACE,
NULL, &err);
- if (err) {
+ if (proxy == NULL && err) {
BT_ERR("Error : %s", err->message);
g_clear_error(&err);
return NULL;
GDBusConnection *conn;
GDBusProxy *proxy;
GError *err = NULL;
- conn = _bt_gdbus_get_session_gconn();
+ conn = _bt_gdbus_get_system_gconn();
retv_if(conn == NULL, NULL);
proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
transfer_path,
BT_PROPERTIES_INTERFACE,
NULL, &err);
- if (err) {
+ if (proxy == NULL && err) {
BT_ERR("Error : %s", err->message);
g_clear_error(&err);
return NULL;
GVariant *param = NULL;
GError *err = NULL;
bt_session_info_t *session_info = NULL;
+#ifdef TIZEN_FEATURE_BT_DPM
+ int value = DPM_BT_ERROR;
+#endif
BT_DBG(" path [%s] \n", path);
agent_info.auth_info->transfer_path = g_strdup(path);
-#ifdef TIZEN_DPM_ENABLE
- if (_bt_dpm_get_allow_bluetooth_mode() == DPM_BT_HANDSFREE_ONLY) {
+#ifdef TIZEN_FEATURE_BT_DPM
+ _bt_dpm_get_allow_bluetooth_mode(&value);
+ if (value == DPM_BT_HANDSFREE_ONLY) {
/* Free auth info in next function */
_bt_obex_server_reject_authorize();
return FALSE;
GVariant *val;
gsize len = 0;
while (g_variant_iter_loop(iter, "{sv}", &key, &val)) {
- if (g_strcmp0(key, "Name") == 0) {
+ if (g_strcmp0(key, "Name") == 0)
agent_info.auth_info->filename = g_variant_dup_string(val, &len);
- } else if (g_strcmp0(key, "Address") == 0) {
+ else if (g_strcmp0(key, "Address") == 0)
bdaddress = g_variant_dup_string(val, &len);
- } else if (g_strcmp0(key, "Size") == 0) {
+ else if (g_strcmp0(key, "Size") == 0)
agent_info.auth_info->file_size = g_variant_get_uint64(val);
- }
}
g_variant_iter_free(iter);
}
}
if (session_info->authorized == FALSE) {
- _bt_launch_system_popup(BT_AGENT_EVENT_EXCHANGE_REQUEST, device_name,
+ if (headed_plugin_info->plugin_headed_enabled)
+ headed_plugin_info->headed_plugin->bt_launch_system_popup(BT_AGENT_EVENT_EXCHANGE_REQUEST, device_name,
auth_info, NULL, NULL, BT_OBEX_SERVER_AGENT_PATH);
} else {
param = g_variant_new("(istss)", result,
- agent_info.auth_info->filename,
- agent_info.auth_info->file_size,
- agent_info.auth_info->address,
- agent_info.auth_info->device_name);
+ agent_info.auth_info->filename,
+ agent_info.auth_info->file_size,
+ agent_info.auth_info->address,
+ agent_info.auth_info->device_name);
_bt_send_event(BT_OPP_SERVER_EVENT,
- BLUETOOTH_EVENT_OBEX_SERVER_TRANSFER_AUTHORIZE, param);
+ BLUETOOTH_EVENT_OBEX_SERVER_TRANSFER_AUTHORIZE, param);
}
return TRUE;
g_variant_builder_add(builder, "y", agent_info.auth_info->contact_auth_info[i]);
param = g_variant_new("(isssstii(ay))", result,
+ transfer_info->device_name,
transfer_info->filename,
transfer_info->type,
- transfer_info->device_name,
transfer_info->address,
transfer_info->file_size,
transfer_info->transfer_id,
GError *g_error = NULL;
/* Get the session bus. */
- g_conn = _bt_gdbus_get_session_gconn();
+ g_conn = _bt_gdbus_get_system_gconn();
retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
_bt_obex_agent_new(BT_OBEX_SERVER_AGENT_PATH);
BT_OBEX_MANAGER,
NULL, &g_error);
- if (manager_proxy == NULL) {
+ if (manager_proxy == NULL)
return BLUETOOTH_ERROR_INTERNAL;
- }
result = g_dbus_proxy_call_sync(manager_proxy, "RegisterAgent",
g_variant_new("(o)", BT_OBEX_SERVER_AGENT_PATH),
char *__bt_transfer_folder_path(char *dest_path)
{
char *dst_path = (char *)g_malloc0(BT_OBEX_PATH_MAX_LENGTH);
- if (g_str_has_prefix(dest_path, BT_OBEX_PATH_PREFIX)) {
+ if (g_str_has_prefix(dest_path, BT_OBEX_PATH_PREFIX))
snprintf(dst_path, BT_OBEX_PATH_MAX_LENGTH, BT_OBEX_DEFAULT_PATH"%s", dest_path + strlen(BT_OBEX_PATH_PREFIX));
- } else {
+ else
snprintf(dst_path, BT_OBEX_PATH_MAX_LENGTH, "%s", dest_path);
- }
BT_INFO("obex transfed path : %s", dst_path);
return dst_path;
{
BT_CHECK_PARAMETER(activated, return);
- if (agent_info.custom_server) {
+ if (agent_info.custom_server)
*activated = TRUE;
- } else {
+ else
*activated = FALSE;
- }
return BLUETOOTH_ERROR_NONE;
}
{
BT_CHECK_PARAMETER(allocation, return);
- if (agent_info.native_server || agent_info.custom_server) {
+ if (agent_info.native_server || agent_info.custom_server)
*allocation = TRUE;
- } else {
+ else
*allocation = FALSE;
- }
return BLUETOOTH_ERROR_NONE;
}
{
BT_CHECK_PARAMETER(receiving, return);
- if (transfers == NULL || g_slist_length(transfers) == 0) {
+ if (transfers == NULL || g_slist_length(transfers) == 0)
*receiving = FALSE;
- } else {
+ else
*receiving = TRUE;
- }
return BLUETOOTH_ERROR_NONE;
}
projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff