Fix the error info is sent when removing paired devices

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-event-receiver.c

diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c
index 86d33ba..42aca3d 100644 (file)
--- a/bt-service/bt-service-event-receiver.c
+++ b/bt-service/bt-service-event-receiver.c
@@ -645,7 +645,6 @@ static gboolean __bt_discovery_finished()
 
 void __bt_adapter_property_changed_event(DBusMessageIter *msg_iter, const char *path)
 {
-       DBusGProxy *adapter_proxy;
        int mode = 0;
        int result = BLUETOOTH_ERROR_NONE;
        DBusMessageIter value_iter;
@@ -723,6 +722,7 @@ void __bt_adapter_property_changed_event(DBusMessageIter *msg_iter, const char *
 
                if (discoverable == FALSE) {
                        if (_bt_get_discoverable_timeout_property() > 0) {
+                               DBusGProxy *adapter_proxy;
                                g_value_init(&timeout, G_TYPE_UINT);
                                g_value_set_uint(&timeout, 0);
 
@@ -787,9 +787,7 @@ static void __bt_device_remote_connected_properties(
                for (i = 0; i<remote_dev_info->uuid_count; i++) {
                        char *uuid = remote_dev_info->uuids[i];
                        if (strcasecmp(uuid, HID_UUID) == 0){
-                               int event = BLUETOOTH_EVENT_NONE;
-
-                               event = (connected == TRUE) ?
+                               int event = (connected == TRUE) ?
                                        BLUETOOTH_HID_CONNECTED :
                                        BLUETOOTH_HID_DISCONNECTED;
 
@@ -866,10 +864,7 @@ void __bt_device_property_changed_event(DBusMessageIter *msg_iter, const char *p
 
                } else if (strcasecmp(property, "Paired") == 0) {
                        gboolean paired = FALSE;
-
                        GList *node;
-                       bt_remote_dev_info_t *dev_info;
-                       bt_remote_dev_info_t *new_dev_info;
 
                        dbus_message_iter_recurse(&dict_iter, &value_iter);
                        dbus_message_iter_get_basic(&value_iter, &paired);
@@ -897,17 +892,11 @@ void __bt_device_property_changed_event(DBusMessageIter *msg_iter, const char *p
                        node = g_list_first(g_list);
 
                        while (node != NULL) {
+                               bt_remote_dev_info_t *dev_info;
                                dev_info = (bt_remote_dev_info_t *)node->data;
                                if (strcasecmp(dev_info->address, address) == 0) {
                                        g_list = g_list_remove(g_list, dev_info);
                                        _bt_free_device_info(dev_info);
-
-                                       new_dev_info =  _bt_get_remote_device_info(address);
-                                       if (new_dev_info == NULL) {
-                                               g_free(address);
-                                               return;
-                                       }
-                                       g_list = g_list_append(g_list, new_dev_info);
                                }
                                node = g_list_next(node);
                        }
@@ -1004,7 +993,7 @@ void _bt_handle_input_event(DBusMessage *msg)
        ret_if(property == NULL);
 
        if (strcasecmp(property, "Connected") == 0) {
-               int event = BLUETOOTH_EVENT_NONE;
+               int event;
                char *address;
 
                dbus_message_iter_next(&item_iter);
@@ -1120,7 +1109,6 @@ void __bt_handle_network_client_event(DBusMessageIter *msg_iter, const char *pat
 
 void _bt_handle_device_event(DBusMessage *msg)
 {
-       int event;
        int result = BLUETOOTH_ERROR_NONE;
        DBusMessageIter item_iter;
        DBusMessageIter value_iter;
@@ -1146,6 +1134,7 @@ void _bt_handle_device_event(DBusMessage *msg)
                ret_if(property == NULL);
 
                if (strcasecmp(property, "Connected") == 0) {
+                       int event;
                        gboolean connected = FALSE;
                        dbus_message_iter_next(&item_iter);
                        dbus_message_iter_recurse(&item_iter, &value_iter);
@@ -1247,7 +1236,7 @@ void __bt_handle_media_control_event(DBusMessageIter *msg_iter,
        ret_if(!dbus_message_iter_next(&dict_iter));
 
        if (strcasecmp(property, "Connected") == 0) {
-               int event = BLUETOOTH_EVENT_NONE;
+               int event;
                char *address;
 
                dbus_message_iter_recurse(&dict_iter, &value_iter);
@@ -1547,12 +1536,12 @@ static int __bt_get_object_path(DBusMessage *msg, char **path)
 
 static void __bt_devices_list_free()
 {
-       bt_remote_dev_info_t *dev_info;
        GList *node;
 
        node = g_list_first(g_list);
 
        while (node != NULL){
+               bt_remote_dev_info_t *dev_info;
                dev_info = (bt_remote_dev_info_t *)node->data;
 
                g_list = g_list_remove(g_list, dev_info);
@@ -1617,7 +1606,10 @@ static DBusHandlerResult __bt_manager_event_filter(DBusConnection *conn,
                                DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
                                &dev_info->uuids, dev_info->uuid_count,
                                DBUS_TYPE_INVALID);
-                       g_list = g_list_append(g_list, dev_info);
+                       if (!dev_info->paired)
+                               g_list = g_list_append(g_list, dev_info);
+                       else
+                               _bt_free_device_info(dev_info);
                } else if (bt_event == BT_MEDIA_TRANSFER_EVENT) {
                        __bt_parse_audio_properties(msg);
                }
@@ -1638,8 +1630,9 @@ static DBusHandlerResult __bt_manager_event_filter(DBusConnection *conn,
                        if (strncasecmp(object_path, BT_BLUEZ_HCI_DEV_PATH, strlen(BT_BLUEZ_HCI_DEV_PATH)) == 0) {
                                int result = BLUETOOTH_ERROR_NONE;
                                char *address;
-                               bt_remote_dev_info_t * dev_info;
+                               bt_remote_dev_info_t *dev_info;
                                GList * node;
+                               gboolean is_in_glist = FALSE;
 
                                BT_DBG("device interface removed | path: %s", object_path);
 
@@ -1650,39 +1643,41 @@ static DBusHandlerResult __bt_manager_event_filter(DBusConnection *conn,
 
                                node = g_list_first(g_list);
 
-                               while (node != NULL){
+                               while (node != NULL) {
                                        dev_info = (bt_remote_dev_info_t *)node->data;
                                        if (strcasecmp(dev_info->address, address) == 0) {
-                                               if (dev_info->paired) {
-                                                       BT_DBG("send bt bond destroy event");
-                                                       _bt_send_event(BT_ADAPTER_EVENT,
-                                                               BLUETOOTH_EVENT_BONDED_DEVICE_REMOVED,
-                                                               DBUS_TYPE_INT32, &result,
-                                                               DBUS_TYPE_STRING, &address,
-                                                               DBUS_TYPE_INVALID);
-                                               } else {
-                                                       BT_DBG("Bluez removes device %s, send device disappear event", dev_info->name);
-                                                       _bt_send_event(BT_ADAPTER_EVENT,
-                                                               BLUETOOTH_EVENT_REMOTE_DEVICE_DISAPPEARED,
-                                                               DBUS_TYPE_INT32, &result,
-                                                               DBUS_TYPE_STRING, &dev_info->address,
-                                                               DBUS_TYPE_UINT32, &dev_info->class,
-                                                               DBUS_TYPE_INT16, &dev_info->rssi,
-                                                               DBUS_TYPE_STRING, &dev_info->name,
-                                                               DBUS_TYPE_BOOLEAN, &dev_info->paired,
-                                                               DBUS_TYPE_BOOLEAN, &dev_info->connected,
-                                                               DBUS_TYPE_BOOLEAN, &dev_info->trust,
-                                                               DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
-                                                               &dev_info->uuids, dev_info->uuid_count,
-                                                               DBUS_TYPE_INVALID);
-                                               }
+                                               is_in_glist = TRUE;
+
+                                               BT_DBG("Bluez removes device %s, send device disappear event", dev_info->name);
+                                               _bt_send_event(BT_ADAPTER_EVENT,
+                                                       BLUETOOTH_EVENT_REMOTE_DEVICE_DISAPPEARED,
+                                                       DBUS_TYPE_INT32, &result,
+                                                       DBUS_TYPE_STRING, &dev_info->address,
+                                                       DBUS_TYPE_UINT32, &dev_info->class,
+                                                       DBUS_TYPE_INT16, &dev_info->rssi,
+                                                       DBUS_TYPE_STRING, &dev_info->name,
+                                                       DBUS_TYPE_BOOLEAN, &dev_info->paired,
+                                                       DBUS_TYPE_BOOLEAN, &dev_info->connected,
+                                                       DBUS_TYPE_BOOLEAN, &dev_info->trust,
+                                                       DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+                                                       &dev_info->uuids, dev_info->uuid_count,
+                                                       DBUS_TYPE_INVALID);
+
                                                g_list = g_list_remove(g_list, dev_info);
                                                _bt_free_device_info(dev_info);
                                                break;
                                        }
                                        node = g_list_next(node);
                                }
-
+                               /* if device is not in glist, we need to trig destroy bonding event */
+                               if (!is_in_glist) {
+                                       BT_DBG("send bt bond destroy event");
+                                       _bt_send_event(BT_ADAPTER_EVENT,
+                                               BLUETOOTH_EVENT_BONDED_DEVICE_REMOVED,
+                                               DBUS_TYPE_INT32, &result,
+                                               DBUS_TYPE_STRING, &address,
+                                               DBUS_TYPE_INVALID);
+                               }
                                g_free(address);
                        }
                } else {
@@ -2283,24 +2278,21 @@ void _bt_get_temp_remote_devinfo(void)
 
        while (node != NULL) {
                dev_info = (bt_remote_dev_info_t *)node->data;
-               /* do not search paired devices.
-                * Paired devices are in g_list in order to trig device disappear
-                * or remove bonding events */
-               if (!dev_info->paired) {
-                       _bt_send_event(BT_ADAPTER_EVENT,
-                               BLUETOOTH_EVENT_REMOTE_DEVICE_FOUND,
-                               DBUS_TYPE_INT32, &result,
-                               DBUS_TYPE_STRING, &dev_info->address,
-                               DBUS_TYPE_UINT32, &dev_info->class,
-                               DBUS_TYPE_INT16, &dev_info->rssi,
-                               DBUS_TYPE_STRING, &dev_info->name,
-                               DBUS_TYPE_BOOLEAN, &dev_info->paired,
-                               DBUS_TYPE_BOOLEAN, &dev_info->connected,
-                               DBUS_TYPE_BOOLEAN, &dev_info->trust,
-                               DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
-                               &dev_info->uuids, dev_info->uuid_count,
-                               DBUS_TYPE_INVALID);
-               }
+
+               _bt_send_event(BT_ADAPTER_EVENT,
+                       BLUETOOTH_EVENT_REMOTE_DEVICE_FOUND,
+                       DBUS_TYPE_INT32, &result,
+                       DBUS_TYPE_STRING, &dev_info->address,
+                       DBUS_TYPE_UINT32, &dev_info->class,
+                       DBUS_TYPE_INT16, &dev_info->rssi,
+                       DBUS_TYPE_STRING, &dev_info->name,
+                       DBUS_TYPE_BOOLEAN, &dev_info->paired,
+                       DBUS_TYPE_BOOLEAN, &dev_info->connected,
+                       DBUS_TYPE_BOOLEAN, &dev_info->trust,
+                       DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+                       &dev_info->uuids, dev_info->uuid_count,
+                       DBUS_TYPE_INVALID);
+
                node = g_list_next(node);
        }
 }