Add vconf for download url

Change-Id: Iab0b68959ce88f05b240bd17e5f510afc031cbff
Signed-off-by: Sangkoo Kim <sangkoo.kim@samsung.com>

diff --git a/inc/controlee_firmware_resource_internal.h b/inc/controlee_firmware_resource_internal.h
index decd647523639d751c8c0a0a95748470497badaf..53d064500950b9a29c3ec45d520ba6003d8bc6dc 100644 (file)
--- a/inc/controlee_firmware_resource_internal.h
+++ b/inc/controlee_firmware_resource_internal.h
@@ -30,7 +30,7 @@
 
 #define VCONF_FIRMWARE_UPDATE_STATE    "db/private/firmware_update/state"
 #define VCONF_FIRMWARE_UPDATE_RESULT   "db/private/firmware_update/result"
-
+#define VCONF_FIRMWARE_UPDATE_DOWNLOAD_URL     "db/private/firmware_update/download_url"
 #ifdef LOG_TAG
 #undef LOG_TAG
 #define LOG_TAG "FIRMWARE_RESOURCE"

diff --git a/packaging/controlee-firmware-resource.spec b/packaging/controlee-firmware-resource.spec
index dbf0742283134156fda926514571a644db59f7c1..3c8147b967c36f7556396eb29f16d7756426a0a4 100644 (file)
--- a/packaging/controlee-firmware-resource.spec
+++ b/packaging/controlee-firmware-resource.spec
@@ -55,6 +55,7 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 /usr/bin/vconftool set -t int db/private/firmware_update/state 0 -s tizen::vconf::platform::rw
 /usr/bin/vconftool set -t int db/private/firmware_update/result 0 -s tizen::vconf::platform::rw
+/usr/bin/vconftool set -t string db/private/firmware_update/download_url "" -s tizen::vconf::platform::rw
 
 %postun 
 /sbin/ldconfig

diff --git a/src/controlee_firmware_resource_internal.c b/src/controlee_firmware_resource_internal.c
index bd1458b8acd6e2aa6b8686b744c91a332c091ffb..6bf53bff413d282a68029f2df9da156200889cc4 100644 (file)
--- a/src/controlee_firmware_resource_internal.c
+++ b/src/controlee_firmware_resource_internal.c
@@ -170,6 +170,7 @@ void _update_firmware_resource(OCRepPayload *input)
                if (g_strcmp0(package_uri, g_firmware_resource->package_uri)) {
                        g_free(g_firmware_resource->package_uri);
                        g_firmware_resource->package_uri = g_strdup(new_firmware);
+                       vconf_set_str(VCONF_FIRMWARE_UPDATE_DOWNLOAD_URL, new_firmware);
                }
                g_free(package_uri);
                FWR_LOGD("g_firmware_resource->package_uri = [%s]", g_firmware_resource->package_uri);

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 94bc7edd76ba8191b737985a10a7361984542ee0..c99234e1359b6179b73f4ca84e0d381b859f73b2 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,8 +8,8 @@ SET(CONTROLEE_FIRMWARE_TEST_SRCS
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../inc)
 
-INSTALL(FILES ${CMAKE_BINARY_DIR}/test/thawte.cert.pem DESTINATION /opt/usr/data/ua-client/)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/test/oic_svr_db_client.dat DESTINATION /opt/usr/data/ua-client/)
+#INSTALL(FILES ${CMAKE_BINARY_DIR}/test/thawte.cert.pem DESTINATION /opt/usr/data/ua-client/)
+#INSTALL(FILES ${CMAKE_BINARY_DIR}/test/oic_svr_db_client.dat DESTINATION /opt/usr/data/ua-client/)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(test_pkgs REQUIRED glib-2.0 iotivity key-manager)