code restructure for better understanding

Change-Id: I85d9db3166b2c71726eb404311ce62b7899e423a
Signed-off-by: Karthik Subas Chandra Bose <karthik.scb@samsung.com>

diff --git a/src/setting/FSys_SettingNetworkProvider.cpp b/src/setting/FSys_SettingNetworkProvider.cpp
index 4ca760b..0b9a2cb 100644 (file)
--- a/src/setting/FSys_SettingNetworkProvider.cpp
+++ b/src/setting/FSys_SettingNetworkProvider.cpp
@@ -1091,73 +1091,48 @@ bool
 _SettingNetworkProvider::HasKey(const Tizen::Base::String& key)
 {
        int ret = 0;
-       bool wifi_supported = false;
-       ret = system_info_get_platform_bool("tizen.org/feature/network.wifi", &wifi_supported);
-        SysTryLog(NID_SYS, ret == 0, "It is failed to fetch wifi support information.");
-
-       bool wifi_direct_supported = false;
-       ret = system_info_get_platform_bool("tizen.org/feature/network.wifi.direct", &wifi_direct_supported);
-        SysTryLog(NID_SYS, ret == 0, "It is failed to fetch wifi-direct support information.");
-
-       bool bluetooth_supported = false;
-       ret = system_info_get_platform_bool("tizen.org/feature/network.bluetooth", &bluetooth_supported);
-        SysTryLog(NID_SYS, ret == 0, "It is failed to fetch bluetooth support information.");
-
-       bool telephony_supported = false;
-       ret = system_info_get_platform_bool("tizen.org/feature/network.telephony", &telephony_supported);
-        SysTryLog(NID_SYS, ret == 0, "It is failed to fetch telephony support information.");
-
+       bool isSupported = false;
        SysLog(NID_SYS, "requiredKey is %ls.", key.GetPointer());
+
        if(key == _NETWORK_FLIGHTMODE)
        {
-               return true;
+               isSupported = true;
        }
        else if(key == _NETWORK_TELEPHONY_PACKETSERVICE || key == _NETWORK_TELEPHONY_ROAMING)
        {
-               if(telephony_supported == true)
-               {
-                       return true;
-               }
+               ret = system_info_get_platform_bool("tizen.org/feature/network.telephony", &isSupported);
+               SysTryLog(NID_SYS, ret == 0, "It is failed to fetch telephony support information.");
        }
        else if(key == _NETWORK_WIFI || key == _NETWORK_WIFI_NOTIFICATION)
        {
-               if(wifi_supported == true)
-               {
-                       return true;
-               }
+               ret = system_info_get_platform_bool("tizen.org/feature/network.wifi", &isSupported);
+               SysTryLog(NID_SYS, ret == 0, "It is failed to fetch wifi support information.");
        }
        else if(key == _NETWORK_WIFI_DIRECT)
        {
-               if(wifi_direct_supported == true)
-               {
-                       return true;
-               }
+               ret = system_info_get_platform_bool("tizen.org/feature/network.wifi.direct", &isSupported);
+               SysTryLog(NID_SYS, ret == 0, "It is failed to fetch wifi-direct support information.");
        }
        else if(key == _NETWORK_WIFI_TETHERING || key ==  _NETWORK_WIFI_TETHERING_HIDE
                || key == _NETWORK_WIFI_TETHERING_SECURITY || key == _NETWORK_WIFI_TETHERING_SECURITY_PASSWORD || key == _USB_TETHERING)
        {
-               bool isSupported = false;
-               int errorCode = system_info_get_value_bool(SYSTEM_INFO_KEY_TETHERING_SUPPORTED, &isSupported);
-               if(errorCode == SYSTEM_INFO_ERROR_NONE && isSupported == true)
-               {
-                       return true;
-               }
+               ret = system_info_get_value_bool(SYSTEM_INFO_KEY_TETHERING_SUPPORTED, &isSupported);
+               SysTryLog(NID_SYS, ret == SYSTEM_INFO_ERROR_NONE, "It is failed to fetch tethering information.");
        }
        else if(key == _NETWORK_BLUETOOTH)
        {
-               if(bluetooth_supported == true)
-               {
-                       return true;
-               }
+               ret = system_info_get_platform_bool("tizen.org/feature/network.bluetooth", &isSupported);
+               SysTryLog(NID_SYS, ret == 0, "It is failed to fetch bluetooth support information.");
        }
        else if(key == _NETWORK_BLUETOOTH_TETHERING)
        {
-               if(__tetheringHandle != null && bluetooth_supported == true)
+               if(__tetheringHandle != null)
                {
-                       return true;
+                       ret = system_info_get_platform_bool("tizen.org/feature/network.bluetooth", &isSupported);
+                       SysTryLog(NID_SYS, ret == 0, "It is failed to fetch bluetooth support information.");
                }
        }
-       return false;
+       return isSupported;
 }
 
 void