From ce5c46003377990aab3b4ee92bf0b5e79b4ad3ef Mon Sep 17 00:00:00 2001 From: Joohyun Kim Date: Mon, 26 Aug 2013 10:47:09 +0900 Subject: [PATCH] Remove tethering password Change-Id: I9317aba8bba8db58e305d6f664bb4125873c4241 Signed-off-by: Joohyun Kim --- .../providers/FSys_SettingNetworkProvider.cpp | 96 +++++++++++----------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp b/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp index 9969e59..8b4219e 100644 --- a/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp +++ b/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp @@ -56,7 +56,7 @@ static const wchar_t* _NETWORK_WIFI_NOTIFICATION = L"http://tizen.org/setting/ne static const wchar_t* _NETWORK_WIFI_TETHERING = L"http://tizen.org/setting/network.wifi.tethering"; static const wchar_t* _NETWORK_WIFI_TETHERING_HIDE = L"http://tizen.org/setting/network.wifi.tethering.hide"; static const wchar_t* _NETWORK_WIFI_TETHERING_SECURITY = L"http://tizen.org/setting/network.wifi.tethering.security"; -static const wchar_t* _NETWORK_WIFI_TETHERING_SECURITY_PASSWORD = L"http://tizen.org/setting/network.wifi.tethering.security.password"; +//static const wchar_t* _NETWORK_WIFI_TETHERING_SECURITY_PASSWORD = L"http://tizen.org/setting/network.wifi.tethering.security.password"; static const wchar_t* _USB_TETHERING = L"http://tizen.org/setting/usb.tethering"; //Especially, USB tethering is covered by this provider. static const wchar_t* _NETWORK_WIFI_DIRECT = L"http://tizen.org/setting/network.wifi.direct"; @@ -915,51 +915,50 @@ _SettingNetworkProvider::SettingWifiActivateCallBack(wifi_error_e errorCode, voi SysTryReturnVoidResult(NID_SYS, (pSettingInfo != null && pProvider != null), E_SYSTEM, "There is no values of args."); SysTryCatch(NID_SYS, pProvider->__stateOfWifi == 1, E_SYSTEM, E_SYSTEM, "Wi-Fi processing is under way."); - SysLog(NID_SYS, "Wi-Fi result is called. %d", errorCode); - if(errorCode != WIFI_ERROR_NONE) + switch(errorCode) { - switch(errorCode) - { - case WIFI_ERROR_INVALID_PARAMETER: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by invalid param."); - break; - case WIFI_ERROR_OUT_OF_MEMORY: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by out of memory."); - break; - case WIFI_ERROR_INVALID_OPERATION: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by invalid operation."); - break; - case WIFI_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by family not supported."); - break; - case WIFI_ERROR_OPERATION_FAILED: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by operation failed."); - break; - case WIFI_ERROR_NO_CONNECTION: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by no connection."); - break; - case WIFI_ERROR_ALREADY_EXISTS: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by already exist."); - break; - case WIFI_ERROR_OPERATION_ABORTED: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by operation aborted."); - break; - case WIFI_ERROR_DHCP_FAILED: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by DHCP fail."); - break; - case WIFI_ERROR_INVALID_KEY: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by invalid key."); - break; - case WIFI_ERROR_NO_REPLY: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by no reply."); - break; - case WIFI_ERROR_SECURITY_RESTRICTED: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by security restricted."); - break; - case WIFI_ERROR_NOW_IN_PROGRESS: - SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is under way."); - break; - } + case WIFI_ERROR_INVALID_PARAMETER: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by invalid param."); + break; + case WIFI_ERROR_OUT_OF_MEMORY: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by out of memory."); + break; + case WIFI_ERROR_INVALID_OPERATION: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by invalid operation."); + break; + case WIFI_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by family not supported."); + break; + case WIFI_ERROR_OPERATION_FAILED: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by operation failed."); + break; + case WIFI_ERROR_NO_CONNECTION: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by no connection."); + break; + case WIFI_ERROR_ALREADY_EXISTS: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by already exist."); + break; + case WIFI_ERROR_OPERATION_ABORTED: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by operation aborted."); + break; + case WIFI_ERROR_DHCP_FAILED: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by DHCP fail."); + break; + case WIFI_ERROR_INVALID_KEY: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by invalid key."); + break; + case WIFI_ERROR_NO_REPLY: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by no reply."); + break; + case WIFI_ERROR_SECURITY_RESTRICTED: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is failed by security restricted."); + break; + case WIFI_ERROR_NOW_IN_PROGRESS: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is under way."); + break; + case WIFI_ERROR_NONE: + SysLogException(NID_SYS, E_SYSTEM, "Wifi change request is work properly"); + break; } if(pProvider->__pWifiListener != null) @@ -1007,6 +1006,7 @@ _SettingNetworkProvider::GetValue(const String& key, String& value) int errorCode = 0; result r = E_OBJ_NOT_FOUND; +/* if (key == _NETWORK_WIFI_TETHERING_SECURITY_PASSWORD) { r = E_SUCCESS; @@ -1023,6 +1023,7 @@ _SettingNetworkProvider::GetValue(const String& key, String& value) value.Clear(); value.Append(password.get()); } +*/ return r; } @@ -1031,7 +1032,7 @@ _SettingNetworkProvider::SetValue(const String& key, const String value) { int errorCode = 0; result r = E_OBJ_NOT_FOUND; - +/* if(key ==_NETWORK_WIFI_TETHERING_SECURITY_PASSWORD) { r = E_SUCCESS; @@ -1043,6 +1044,7 @@ _SettingNetworkProvider::SetValue(const String& key, const String value) errorCode = tethering_wifi_set_passphrase(__tetheringHandle, password.get()); SysTryReturnResult(NID_SYS, errorCode == TETHERING_ERROR_NONE, E_SYSTEM, "It is failed to set password"); } +*/ return r; } @@ -1092,7 +1094,7 @@ _SettingNetworkProvider::HasKey(const String& key) } } 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) + || 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); -- 2.7.4