Fix the problem that timestamp is not included in user_presence_detected_cb

- Problem: Even if the user device is detected, the timestamp value is 0.
- Cause: The timestamp value is not applied to the detected device.
- Solution: Apply timestamp value to detected device info.

Change-Id: I08536397aa2ad021231289661de969bfb872221d
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/include/user-awareness-private.h b/include/user-awareness-private.h
index d67d3a932b44eb4b5bc01c610ff9fea63f6a5284..a436cdc348037dd6885edb3809e315798d1a3871 100644 (file)
--- a/include/user-awareness-private.h
+++ b/include/user-awareness-private.h
@@ -358,7 +358,7 @@ void _ua_monitor_handle_scan_complete(int result);
  */
 void _ua_monitor_handle_user_presence_detected(uam_sensor_info_s *sensor_info,
                                               char *service, char *account,
-                                              long timestamp, char *device_id);
+                                              unsigned long long timestamp, char *device_id);
 
 /**
  * @brief Stops monitoring detection.

diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec
index 38f5c9f4439164e0983513d097d10e4ceaba11ad..5974fa8a438e49140e1ae5277bbaa0082f473998 100644 (file)
--- a/packaging/capi-network-ua.spec
+++ b/packaging/capi-network-ua.spec
@@ -1,6 +1,6 @@
 Name: capi-network-ua
 Summary: User Awareness Framework CAPI
-Version: 0.12.9
+Version: 0.12.10
 Release: 1
 License: Apache-2.0
 Source0: %{name}-%{version}.tar.gz

diff --git a/src/user-awareness-event-handler.c b/src/user-awareness-event-handler.c
old mode 100755 (executable)
new mode 100644 (file)
index 5fd129b..a36ba8c
--- a/src/user-awareness-event-handler.c
+++ b/src/user-awareness-event-handler.c
@@ -57,6 +57,12 @@ static void __ua_event_handler(int event, uam_event_data_s *event_param,
                ret_if(NULL == sensor_info);
 
                sensor_info->sensor_bitmask = event_data->sensor_bitmask;
+               sensor_info->timestamp = event_data->timestamp;
+
+               UA_INFO("sensor: [%u], timestamp [%llu], accuracy [%d], value [%f]",
+                               sensor_info->sensor_bitmask, sensor_info->timestamp,
+                               sensor_info->accuracy, sensor_info->values[0]);
+
                _ua_monitor_handle_user_presence_detected(
                                sensor_info, event_data->service,
                                event_data->account, event_data->timestamp,
@@ -78,6 +84,11 @@ static void __ua_event_handler(int event, uam_event_data_s *event_param,
                ret_if(NULL == sensor_info);
 
                sensor_info->sensor_bitmask = event_data->sensor_bitmask;
+
+               UA_INFO("sensor: [%u], timestamp [%llu], accuracy [%d], value [%f]",
+                               sensor_info->sensor_bitmask, sensor_info->timestamp,
+                               sensor_info->accuracy, sensor_info->values[0]);
+
                _ua_monitor_handle_user_absence_detected(
                                sensor_info, event_data->service,
                                event_data->account);

diff --git a/src/user-awareness-monitors.c b/src/user-awareness-monitors.c
index 15a1de568e885b6804a50354c2814eb7008de7c3..8ef4b88e44d9819f0ebb88268ee992bbeff5420c 100644 (file)
--- a/src/user-awareness-monitors.c
+++ b/src/user-awareness-monitors.c
@@ -821,7 +821,7 @@ void _ua_monitor_handle_scan_complete(int result)
 }
 
 void _ua_monitor_handle_user_presence_detected(uam_sensor_info_s *info,
-               char *service, char *account, long timestamp, char *device_id)
+               char *service, char *account, unsigned long long timestamp, char *device_id)
 {
        FUNC_ENTRY;
        GSList *l;