Rename ble payload purpose to secondary key

Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>

diff --git a/include/user-awareness-private.h b/include/user-awareness-private.h
index 3713cde01747148fbd400368933291cabc0c2d53..d51c770c50c47844c42b605a1a41c334ce754bae 100644 (file)
--- a/include/user-awareness-private.h
+++ b/include/user-awareness-private.h
@@ -291,7 +291,7 @@ typedef enum {
 typedef struct {
        char primary_key; /**< primary key for manufacturer data */
        char device_icon; /**< device icon for manufacturer data */
-       char purpose; /**< purpose for manufacturer data */
+       char secondary_key; /**< secondary_key for manufacturer data */
        char *duid; /**< duid for manufacturer data */
        char *bt_mac; /**< bt mac address of device */
 } ua_ble_payload_s;

diff --git a/include/user-awareness.h b/include/user-awareness.h
index ae44f9ec849ceb6048211c4f54a0550be6a7f379..096d672874f98f3d6964be3197e6e3b2c2f71c5e 100644 (file)
--- a/include/user-awareness.h
+++ b/include/user-awareness.h
@@ -2620,7 +2620,7 @@ int ua_device_get_discriminant(
  * @see ua_device_set_discriminant()
  * @see ua_device_set_payload_primary_key()
  * @see ua_device_set_payload_device_icon()
- * @see ua_device_set_payload_purpose()
+ * @see ua_device_set_payload_secondary_key()
  * @see ua_device_set_payload_duid()
  */
 int ua_device_update(
@@ -2672,11 +2672,11 @@ int ua_device_set_payload_device_icon(
 
 /**
  * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Sets BLE payload purpose for device.
+ * @brief Sets BLE payload secondary_key for device.
  * @since_tizen 5.5
  *
  * @param[in] handle The device handle.
- * @param[in] purpose The BLE payload purpose.
+ * @param[in] secondary_key The BLE payload secondary_key.
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
@@ -2686,11 +2686,11 @@ int ua_device_set_payload_device_icon(
  * @pre
  * @post
  *
- * @see ua_device_get_payload_purpose()
+ * @see ua_device_get_payload_secondary_key()
  */
-int ua_device_set_payload_purpose(
+int ua_device_set_payload_secondary_key(
                ua_device_h handle,
-               const char purpose);
+               const char secondary_key);
 
 /**
  * @ingroup CAPI_NETWORK_UA_MODULE
@@ -2785,11 +2785,11 @@ int ua_device_get_payload_device_icon(
 
 /**
  * @ingroup CAPI_NETWORK_UA_MODULE
- * @brief Gets device's BLE payload purpose.
+ * @brief Gets device's BLE payload secondary_key.
  * @since_tizen 5.5
  *
  * @param[in] handle The device handle.
- * @param[out] purpose The BLE payload purpose.
+ * @param[out] secondary_key The BLE payload secondary_key.
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #UA_ERROR_NONE Successful
@@ -2799,11 +2799,11 @@ int ua_device_get_payload_device_icon(
  * @pre
  * @post
  *
- * @see ua_device_set_payload_purpose()
+ * @see ua_device_set_payload_secondary_key()
  */
-int ua_device_get_payload_purpose(
+int ua_device_get_payload_secondary_key(
                ua_device_h handle,
-               char *purpose);
+               char *secondary_key);
 
 /**
  * @ingroup CAPI_NETWORK_UA_MODULE

diff --git a/src/user-awareness-device.c b/src/user-awareness-device.c
index 5e3f59c3a2f0110609101155053b6b2ce6ac58b9..79d3439c15532251fd931cbe33577edd78524ce2 100644 (file)
--- a/src/user-awareness-device.c
+++ b/src/user-awareness-device.c
@@ -194,7 +194,7 @@ void _ua_create_ua_ble_payload_s(ua_ble_payload_s **payload_handle)
 
        payload->primary_key = 13;
        payload->device_icon = 1;
-       payload->purpose = 1;
+       payload->secondary_key = 1;
        payload->duid = NULL;
        payload->bt_mac = NULL;
 
@@ -231,7 +231,7 @@ ua_ble_payload_s* _ua_get_payload_from_uam(uam_ble_payload_s *uam_payload)
 
        payload->primary_key = uam_payload->primary_key;
        payload->device_icon = uam_payload->device_icon;
-       payload->purpose = uam_payload->purpose;
+       payload->secondary_key = uam_payload->secondary_key;
 
        payload->duid = g_memdup(uam_payload->duid, UA_BLE_PAYLOAD_DUID_LEN + 1);
        if (!payload->duid) {
@@ -260,14 +260,14 @@ void _ua_get_uam_payload_from_ua(uam_ble_payload_s *uam_payload,
        if (NULL == payload) {
                uam_payload->primary_key = 13;
                uam_payload->device_icon = 1;
-               uam_payload->purpose = 1;
+               uam_payload->secondary_key = 1;
                UA_DBG("(NULL == payload) return");
                return;
        }
 
        uam_payload->primary_key = payload->primary_key;
        uam_payload->device_icon = payload->device_icon;
-       uam_payload->purpose = payload->purpose;
+       uam_payload->secondary_key = payload->secondary_key;
 
        if (payload->duid)
                memcpy(uam_payload->duid, payload->duid, UA_BLE_PAYLOAD_DUID_LEN + 1);
@@ -293,7 +293,7 @@ ua_ble_payload_s* _ua_payload_clone(ua_ble_payload_s *org_payload)
 
        payload->primary_key = org_payload->primary_key;
        payload->device_icon = org_payload->device_icon;
-       payload->purpose = org_payload->purpose;
+       payload->secondary_key = org_payload->secondary_key;
 
        payload->duid = g_memdup(org_payload->duid, UA_BLE_PAYLOAD_DUID_LEN + 1);
        if (!payload->duid && org_payload->duid) {
@@ -728,9 +728,9 @@ int ua_device_set_payload_device_icon(
        return UA_ERROR_NONE;
 }
 
-int ua_device_set_payload_purpose(
+int ua_device_set_payload_secondary_key(
                ua_device_h handle,
-               const char purpose)
+               const char secondary_key)
 {
        FUNC_ENTRY;
        ua_dev_info_s *device = (ua_dev_info_s *)handle;
@@ -747,7 +747,7 @@ int ua_device_set_payload_purpose(
                }
        }
 
-       device->payload->purpose = purpose;
+       device->payload->secondary_key = secondary_key;
 
        FUNC_EXIT;
        return UA_ERROR_NONE;
@@ -1015,25 +1015,25 @@ done:
        FUNC_EXIT;
        return UA_ERROR_NONE;
 }
-int ua_device_get_payload_purpose(
+int ua_device_get_payload_secondary_key(
                ua_device_h handle,
-               char *purpose)
+               char *secondary_key)
 {
        FUNC_ENTRY;
        ua_dev_info_s *device = (ua_dev_info_s *)handle;
 
        UA_VALIDATE_INPUT_PARAMETER(handle);
-       UA_VALIDATE_INPUT_PARAMETER(purpose);
+       UA_VALIDATE_INPUT_PARAMETER(secondary_key);
        UA_PRINT_DEVICE_HANDLE(handle);
        retv_if(device->type != UA_MAC_TYPE_BLE, UA_ERROR_INVALID_PARAMETER);
 
        if (!device->payload) {
-               *purpose = 0x00;
-               UA_DBG("payload(purpose) is not found");
+               *secondary_key = 0x00;
+               UA_DBG("payload(secondary_key) is not found");
                goto done;
        }
 
-       *purpose = device->payload->purpose;
+       *secondary_key = device->payload->secondary_key;
 
 done:
        FUNC_EXIT;

diff --git a/test/uat-devices.c b/test/uat-devices.c
index 17ebefe84d5bdf990791ce583f2fe9d7df49753d..209b41e042dd0b2ced65998a514fdb1cadd10256 100644 (file)
--- a/test/uat-devices.c
+++ b/test/uat-devices.c
@@ -45,7 +45,7 @@ static char g_ipv4_address_str[MENU_DATA_SIZE + 1] = {0,}; /**< IPv4 of the sele
 static char g_is_paring_required_str[MENU_DATA_SIZE + 1] = {0,}; /**< Is paring required for the selected device */
 static char g_payload_primary_key[MENU_DATA_SIZE + 1] = {0,}; /**< payload primary_key for the selected device */
 static char g_payload_device_icon[MENU_DATA_SIZE + 1] = {0,}; /**< payload device_icon for the selected device */
-static char g_payload_purpose[MENU_DATA_SIZE + 1] = {0,}; /**< payload purpose for the selected device */
+static char g_payload_secondary_key[MENU_DATA_SIZE + 1] = {0,}; /**< payload secondary_key for the selected device */
 static char g_payload_duid_str[MENU_DATA_SIZE + 1] = {0,}; /**< payload duid for the selected device */
 
 char g_selected_device_idx[MENU_DATA_SIZE + 1] = {0,}; /**< Selected device id */
@@ -72,7 +72,7 @@ static bool __foreach_added_device_cb(
        bool discriminant = false;
        char primary_key = 0;
        char device_icon = 0;
-       char purpose = 0;
+       char secondary_key = 0;
        char *duid = NULL;
 
        if (!device_handle) {
@@ -144,9 +144,9 @@ static bool __foreach_added_device_cb(
        if (UA_ERROR_NONE == ret_temp)
                msgb("payload device_icon : %d[hex: 0x%X]", device_icon, device_icon);
 
-       ret_temp = ua_device_get_payload_purpose(handle, &purpose);
+       ret_temp = ua_device_get_payload_secondary_key(handle, &secondary_key);
        if (UA_ERROR_NONE == ret_temp)
-               msgb("payload purpose : %d[hex: 0x%X]", purpose, purpose);
+               msgb("payload secondary_key : %d[hex: 0x%X]", secondary_key, secondary_key);
 
        ret_temp = ua_device_get_payload_duid(handle, &duid);
        if (UA_ERROR_NONE == ret_temp) {
@@ -172,7 +172,7 @@ void uat_update_device_info(void)
        bool discriminant = false;
        char primary_key = 0;
        char device_icon = 0;
-       char purpose = 0;
+       char secondary_key = 0;
        char *duid = NULL;
 
        check_if(NULL == g_device_h);
@@ -242,10 +242,10 @@ void uat_update_device_info(void)
                snprintf(g_payload_device_icon, MENU_DATA_SIZE + 1, "%u",
                        (unsigned int)device_icon);
 
-       ret = ua_device_get_payload_purpose(g_device_h, &purpose);
+       ret = ua_device_get_payload_secondary_key(g_device_h, &secondary_key);
        if (UA_ERROR_NONE == ret)
-               snprintf(g_payload_purpose, MENU_DATA_SIZE + 1, "%u",
-                       (unsigned int)purpose);
+               snprintf(g_payload_secondary_key, MENU_DATA_SIZE + 1, "%u",
+                       (unsigned int)secondary_key);
 
        ret = ua_device_get_payload_duid(g_device_h, &duid);
        memset(g_payload_duid_str, 0, MENU_DATA_SIZE + 1);
@@ -494,20 +494,20 @@ static int run_ua_device_set_payload_device_icon(
        return RET_SUCCESS;
 }
 
-static int run_ua_device_set_payload_purpose(
+static int run_ua_device_set_payload_secondary_key(
        MManager *mm, struct menu_data *menu)
 {
        int ret = UA_ERROR_NONE;
-       char purpose = 0;
+       char secondary_key = 0;
 
-       msg("ua_device_set_payload_purpose");
+       msg("ua_device_set_payload_secondary_key");
 
-       if (strlen(g_payload_purpose))
-               purpose = (unsigned char)strtol(g_payload_purpose, NULL, 10);
+       if (strlen(g_payload_secondary_key))
+               secondary_key = (unsigned char)strtol(g_payload_secondary_key, NULL, 10);
 
-       ret = ua_device_set_payload_purpose(g_device_h, purpose);
+       ret = ua_device_set_payload_secondary_key(g_device_h, secondary_key);
 
-       msg(" - ua_device_set_payload_purpose() ret: [0x%X] [%s]",
+       msg(" - ua_device_set_payload_secondary_key() ret: [0x%X] [%s]",
                        ret, uat_get_error_str(ret));
 
        return RET_SUCCESS;
@@ -675,11 +675,11 @@ static struct menu_data menu_ua_device_set_payload_device_icon[] = {
        { NULL, NULL, },
 };
 
-static struct menu_data menu_ua_device_set_payload_purpose[] = {
+static struct menu_data menu_ua_device_set_payload_secondary_key[] = {
        { "1", "Purpose (0 to 255)",
-               NULL, NULL, g_payload_purpose },
+               NULL, NULL, g_payload_secondary_key },
        { "2", "run", NULL,
-               run_ua_device_set_payload_purpose, NULL },
+               run_ua_device_set_payload_secondary_key, NULL },
        { NULL, NULL, },
 };
 
@@ -734,8 +734,8 @@ struct menu_data menu_ua_devices[] = {
                menu_ua_device_set_payload_primary_key, NULL, g_payload_primary_key },
        { "10", "ua_device_set_payload_device_icon",
                menu_ua_device_set_payload_device_icon, NULL, g_payload_device_icon },
-       { "11", "ua_device_set_payload_purpose",
-               menu_ua_device_set_payload_purpose, NULL, g_payload_purpose },
+       { "11", "ua_device_set_payload_secondary_key",
+               menu_ua_device_set_payload_secondary_key, NULL, g_payload_secondary_key },
        { "12", "ua_device_set_payload_duid",
                menu_ua_device_set_payload_duid, NULL, g_payload_duid_str },
        { "13", "ua_device_get_wifi_bssid",

diff --git a/test/uat-service.c b/test/uat-service.c
index 33a2938f947fa0a3a286b2633f317384d43e5c18..f52637c7d890fd65be02d1af8c8c4dbe0e761649 100644 (file)
--- a/test/uat-service.c
+++ b/test/uat-service.c
@@ -193,7 +193,7 @@ static bool _service_foreach_added_device_cb(
        unsigned long long last_seen = 0;
        char primary_key = 0;
        char device_icon = 0;
-       char purpose = 0;
+       char secondary_key = 0;
        char *duid = NULL;
 
        if (!service_handle) {
@@ -276,9 +276,9 @@ static bool _service_foreach_added_device_cb(
        if (UA_ERROR_NONE == ret_temp)
                msgb("payload device_icon : %d[hex: 0x%X]", device_icon, device_icon);
 
-       ret_temp = ua_device_get_payload_purpose(handle, &purpose);
+       ret_temp = ua_device_get_payload_secondary_key(handle, &secondary_key);
        if (UA_ERROR_NONE == ret_temp)
-               msgb("payload purpose : %d[hex: 0x%X]", purpose, purpose);
+               msgb("payload secondary_key : %d[hex: 0x%X]", secondary_key, secondary_key);
 
        ret_temp = ua_device_get_payload_duid(handle, &duid);
        if (UA_ERROR_NONE == ret_temp) {

diff --git a/test/uat-users.c b/test/uat-users.c
index 2ecb677b119681580962c161d84e09fb8e1ab909..467025dbf962be41f5c2511f70a5218987a01491 100644 (file)
--- a/test/uat-users.c
+++ b/test/uat-users.c
@@ -208,7 +208,7 @@ static bool _user_foreach_added_device_cb(ua_device_h device_handle,
        bool discriminant = false;
        char primary_key = 0;
        char device_icon = 0;
-       char purpose = 0;
+       char secondary_key = 0;
        char *duid = NULL;
 
        if (!device_handle) {
@@ -281,9 +281,9 @@ static bool _user_foreach_added_device_cb(ua_device_h device_handle,
        if (UA_ERROR_NONE == ret_temp)
                msgc("payload device_icon : %d[hex: 0x%X]", device_icon, device_icon);
 
-       ret_temp = ua_device_get_payload_purpose(handle, &purpose);
+       ret_temp = ua_device_get_payload_secondary_key(handle, &secondary_key);
        if (UA_ERROR_NONE == ret_temp)
-               msgc("payload purpose : %d[hex: 0x%X]", purpose, purpose);
+               msgc("payload secondary_key : %d[hex: 0x%X]", secondary_key, secondary_key);
 
        ret_temp = ua_device_get_payload_duid(handle, &duid);
        if (UA_ERROR_NONE == ret_temp) {