2020-02-11 07:30:46

by Ajay Kishore

[permalink] [raw]
Subject: [PATCH v2 5/6] obexd: Handle MAP Event Report v1.1 and v1.2

Changes made to add handler function for the corresponding
events mentioned in extended event reports 1.1 and 1.2.
---
obexd/client/map-event.h | 8 +++++++-
obexd/client/map.c | 19 +++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/obexd/client/map-event.h b/obexd/client/map-event.h
index 5414b26..c41bb67 100644
--- a/obexd/client/map-event.h
+++ b/obexd/client/map-event.h
@@ -32,7 +32,13 @@ enum map_event_type {
MAP_ET_MEMORY_FULL,
MAP_ET_MEMORY_AVAILABLE,
MAP_ET_MESSAGE_DELETED,
- MAP_ET_MESSAGE_SHIFT
+ MAP_ET_MESSAGE_SHIFT,
+ MAP_ET_READ_STATUS_CHANGED,
+ MAP_ET_MESSAGE_REMOVED,
+ MAP_ET_MESSAGE_EXTENDED_DATA_CHANGED,
+ MAP_ET_PARTICIPANT_PRESENCE_CHANGED,
+ MAP_ET_PARTICIPANT_CHAT_STATE_CHANGED,
+ MAP_ET_CONVERSATION_CHANGED
};

struct map_event {
diff --git a/obexd/client/map.c b/obexd/client/map.c
index 8a059ab..3bcb4a3 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -2550,6 +2550,12 @@ static void map_handle_folder_changed(struct map_data *map,
"Folder");
}

+static void map_handle_remove_message(struct map_data *map,
+ struct map_event *event)
+{
+ g_hash_table_remove(map->messages, &event->handle);
+}
+
static void map_handle_notification(struct map_event *event, void *user_data)
{
struct map_data *map = user_data;
@@ -2582,6 +2588,19 @@ static void map_handle_notification(struct map_event *event, void *user_data)
case MAP_ET_MESSAGE_SHIFT:
map_handle_folder_changed(map, event, event->folder);
break;
+ case MAP_ET_READ_STATUS_CHANGED:
+ map_handle_status_changed(map, event, "read");
+ break;
+ case MAP_ET_MESSAGE_REMOVED:
+ map_handle_remove_message(map, event);
+ break;
+ case MAP_ET_MESSAGE_EXTENDED_DATA_CHANGED:
+ map_handle_status_changed(map, event,
+ "message-extended-data-changed");
+ break;
+ case MAP_ET_PARTICIPANT_PRESENCE_CHANGED:
+ case MAP_ET_PARTICIPANT_CHAT_STATE_CHANGED:
+ case MAP_ET_CONVERSATION_CHANGED:
case MAP_ET_MEMORY_FULL:
case MAP_ET_MEMORY_AVAILABLE:
default:
--
2.7.4