Apply vconf key path builder

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] Replace local define to using common inline function
[SCMRequest] must be imported with wrt-commons
https://tizendev.org/gerrit/#/c/25043/

Change-Id: I435c5223db2dbbe0a3310ddd8f25aa84bd00bc4c

diff --git a/webapp-detail/advancedview.cpp b/webapp-detail/advancedview.cpp
index bac5ede..b552753 100644 (file)
--- a/webapp-detail/advancedview.cpp
+++ b/webapp-detail/advancedview.cpp
@@ -26,8 +26,8 @@
 #include <dpl/foreach.h>
 #include <dpl/assert.h>
 #include <dpl/wrt-dao-ro/WrtDatabase.h>
+#include <dpl/wrt-dao-ro/vconf_config.h>
 #include <dpl/wrt-dao-rw/widget_dao.h>
-
 #include "exceptionsview.h"
 #include "util.h"
 
@@ -43,14 +43,6 @@ const char* const ELM_GENLIST_ITEM_CLASS_STYLE_GROUPINDEX = "groupindex";
 const char* const ELM_GENLIST_ITEM_CLASS_STYLE_1TEXT = "1text";
 const char* const ELM_GENLIST_ITEM_CLASS_STYLE_1TEXT_1ICON_6 = "1text.1icon.6";
 const char* const TEXT_NAVIFRAME_TITLE = "Advanced Settings";
-
-const char * const VCONF_KEY_PREFIX = "file/private/";
-const char * const VCONF_KEY_GROUP = "/security";
-const char * const VCONF_KEY_POPUP_USAGE = "/popup_usage";
-const char * const VCONF_KEY_GEOLOCATION_USAGE = "/geolocation_usage";
-const char * const VCONF_KEY_WEB_NOTIFICATION_USAGE = "/web_notification_usage";
-const char * const VCONF_KEY_WEB_DATABASE_USAGE = "/web_database_usage";
-const char * const VCONF_KEY_FILESYSTEM_USAGE = "/filesystem_usage";
 }
 
 AdvancedView::AdvancedView(Evas_Object *navi, int appID) :
@@ -273,30 +265,24 @@ SecuritySettingsData::SecuritySettingsData(int appID, int index, std::string men
 bool SecuritySettingsData::isEnabled()
 {
     using namespace WrtDB;
-    SettingsType result = SETTINGS_TYPE_UNKNOWN;
-
-    std::string key =
-        VCONF_KEY_PREFIX
-        + DPL::ToUTF8String(m_dao->getPkgName())
-        + VCONF_KEY_GROUP;
-
+    std::string key;
     if (m_index == SECURITY_MENU_INDEX_SECURITY_POPUP_USAGE) {
-        key += VCONF_KEY_POPUP_USAGE;
+        key = VconfConfig::GetVconfKeyPopupUsage(m_dao->getPkgName());
     } else if (m_index == SECURITY_MENU_INDEX_GEOLOCATION_USAGE) {
-        key += VCONF_KEY_GEOLOCATION_USAGE;
+        key = VconfConfig::GetVconfKeyGeolocationUsage(m_dao->getPkgName());
     } else if (m_index == SECURITY_MENU_INDEX_WEB_NOTIFICATION_USAGE) {
-        key += VCONF_KEY_WEB_NOTIFICATION_USAGE;
+        key = VconfConfig::GetVconfKeyWebNotificationUsage(
+            m_dao->getPkgName());
     } else if (m_index == SECURITY_MENU_INDEX_WEB_DATABASE_USAGE) {
-        key += VCONF_KEY_WEB_DATABASE_USAGE;
+        key = VconfConfig::GetVconfKeyWebDatabaseUsage(m_dao->getPkgName());
     } else if (m_index == SECURITY_MENU_INDEX_FILE_SYSTEM_USAGE) {
-        key += VCONF_KEY_FILESYSTEM_USAGE;
+        key = VconfConfig::GetVconfKeyFilesystemUsage(m_dao->getPkgName());
     } else {
         Assert("Wrong security settings menu index");
     }
 
     int ret = 0;
     vconf_get_int(key.c_str(), &ret);
-
     if (static_cast<SettingsType>(ret) == SETTINGS_TYPE_ON) {
         return true;
     } else if (static_cast<SettingsType>(ret) == SETTINGS_TYPE_OFF) {
@@ -313,25 +299,21 @@ void SecuritySettingsData::saveChange(bool state)
     using namespace WrtDB;
     SettingsType result = state ? SETTINGS_TYPE_ON : SETTINGS_TYPE_OFF;
 
-    std::string key =
-        VCONF_KEY_PREFIX
-        + DPL::ToUTF8String(m_dao->getPkgName())
-        + VCONF_KEY_GROUP;
-
+    std::string key;
     if (m_index == SECURITY_MENU_INDEX_SECURITY_POPUP_USAGE) {
-        key += VCONF_KEY_POPUP_USAGE;
+        key = VconfConfig::GetVconfKeyPopupUsage(m_dao->getPkgName());
     } else if (m_index == SECURITY_MENU_INDEX_GEOLOCATION_USAGE) {
-        key += VCONF_KEY_GEOLOCATION_USAGE;
+        key = VconfConfig::GetVconfKeyGeolocationUsage(m_dao->getPkgName());
     } else if (m_index == SECURITY_MENU_INDEX_WEB_NOTIFICATION_USAGE) {
-        key += VCONF_KEY_WEB_NOTIFICATION_USAGE;
+        key = VconfConfig::GetVconfKeyWebNotificationUsage(
+            m_dao->getPkgName());
     } else if (m_index == SECURITY_MENU_INDEX_WEB_DATABASE_USAGE) {
-        key += VCONF_KEY_WEB_DATABASE_USAGE;
+        key = VconfConfig::GetVconfKeyWebDatabaseUsage(m_dao->getPkgName());
     } else if (m_index == SECURITY_MENU_INDEX_FILE_SYSTEM_USAGE) {
-        key += VCONF_KEY_FILESYSTEM_USAGE;
+        key = VconfConfig::GetVconfKeyFilesystemUsage(m_dao->getPkgName());
     } else {
         Assert("Wrong security settings menu index");
     }
-
     vconf_set_int(key.c_str(), static_cast<int>(result));
 }