Handling optional platform information

Change-Id: I1e96ac17467d7bac26fb87e834a10385a960da68
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/daemon/icd-payload.c b/daemon/icd-payload.c
index 0239bbb..3df9083 100644 (file)
--- a/daemon/icd-payload.c
+++ b/daemon/icd-payload.c
@@ -324,15 +324,15 @@ static GVariant* _icd_payload_platform_to_gvariant(OCPlatformPayload *repr)
                        repr->uri,
                        repr->info.platformID,
                        repr->info.manufacturerName,
-                       repr->info.manufacturerUrl,
-                       repr->info.modelNumber,
-                       repr->info.dateOfManufacture,
-                       repr->info.platformVersion,
-                       repr->info.operatingSystemVersion,
-                       repr->info.hardwareVersion,
-                       repr->info.firmwareVersion,
-                       repr->info.supportUrl,
-                       repr->info.systemTime);
+                       ic_utils_dbus_encode_str(repr->info.manufacturerUrl),
+                       ic_utils_dbus_encode_str(repr->info.modelNumber),
+                       ic_utils_dbus_encode_str(repr->info.dateOfManufacture),
+                       ic_utils_dbus_encode_str(repr->info.platformVersion),
+                       ic_utils_dbus_encode_str(repr->info.operatingSystemVersion),
+                       ic_utils_dbus_encode_str(repr->info.hardwareVersion),
+                       ic_utils_dbus_encode_str(repr->info.firmwareVersion),
+                       ic_utils_dbus_encode_str(repr->info.supportUrl),
+                       ic_utils_dbus_encode_str(repr->info.systemTime));
 
        return value;
 }

diff --git a/lib/icl-device.c b/lib/icl-device.c
index 6430934..4f2c502 100644 (file)
--- a/lib/icl-device.c
+++ b/lib/icl-device.c
@@ -271,6 +271,16 @@ static void _icl_platform_info_cb(GDBusConnection *connection,
                        &info.support_url,
                        &info.system_time);
 
+       info.manuf_url = ic_utils_dbus_decode_str(info.manuf_url);
+       info.model_number = ic_utils_dbus_decode_str(info.model_number);
+       info.date_of_manuf = ic_utils_dbus_decode_str(info.date_of_manuf);
+       info.platform_ver = ic_utils_dbus_decode_str(info.platform_ver);
+       info.os_ver = ic_utils_dbus_decode_str(info.os_ver);
+       info.hardware_ver = ic_utils_dbus_decode_str(info.hardware_ver);
+       info.firmware_ver = ic_utils_dbus_decode_str(info.firmware_ver);
+       info.support_url = ic_utils_dbus_decode_str(info.support_url);
+       info.system_time = ic_utils_dbus_decode_str(info.system_time);
+
        /* From iotivity, we can get uri_path. But, the value is always "/oic/p". */
 
        if (cb)