X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fsystem%2FFSys_SettingInfoImpl.cpp;h=4dd00313a43aeb8218c10b0cb65cb21312c58525;hb=fb718301c0247e55776ebf661b9b6217f1f84cbe;hp=26cec356421a7167133cd218d618fe253ac6a4fd;hpb=59001a10eb1e341c788a0f8e6326ff03a2995325;p=platform%2Fframework%2Fnative%2Fappfw.git diff --git a/src/system/FSys_SettingInfoImpl.cpp b/src/system/FSys_SettingInfoImpl.cpp index 26cec35..4dd0031 100644 --- a/src/system/FSys_SettingInfoImpl.cpp +++ b/src/system/FSys_SettingInfoImpl.cpp @@ -26,13 +26,13 @@ #include #include +#include #include #include #include #include #include "FSys_SettingClient.h" -#include "FSys_SettingClientEx.h" using namespace std; @@ -44,9 +44,6 @@ using namespace Tizen::Base::Utility; namespace Tizen { namespace System { -//IDs for IPC -static const int _SYSTEM_RESPONSE_DATA = 2; - //Reserved key static const wchar_t* _SETTING_SCREEN_WALLPAPER = L"http://tizen.org/setting/screen.wallpaper"; static const wchar_t* _SETTING_SYSTEM_SOUND_VOLUME = L"SystemSoundVolume"; @@ -79,30 +76,13 @@ static const int _FONT_SIZE_SMALL_VCONF = 0; static _SettingClient* pSettingClient = null; -static _SettingClientEx* pSettingClientEx = null; -static const wchar_t* _COMMON_SERVICE_ENABLED = L"/opt/usr/etc/setting_common"; -static bool common_mode = false; void _SettingInfoImpl::InitSettingClient(void) { - if(pSettingClient == null && pSettingClientEx == null) + if(pSettingClient == null) { - if(File::IsFileExist(_COMMON_SERVICE_ENABLED) == false) - { - if(pSettingClient == null) - { - pSettingClient = _SettingClient::GetInstance(); - } - } - else - { - common_mode = true; - if(pSettingClientEx == null) - { - pSettingClientEx = _SettingClientEx::GetInstance(); - } - } + pSettingClient = _SettingClient::GetInstance(); } } result @@ -126,7 +106,7 @@ _SettingInfoImpl::GetValue(const Tizen::Base::String& key, Tizen::Base::String& if(key == _FONTSIZE) { - if(_AppInfo::GetApiVersion() == _API_VERSION_2_0 && _AppInfo::IsOspCompat() == true) + if(_AppInfo::GetApiVersion() == _API_VERSION_2_0 && _AppInfo::IsOspCompat()) { if(value == _FONT_SIZE_GIANT || value == _FONT_SIZE_HUGE) { @@ -138,15 +118,17 @@ _SettingInfoImpl::GetValue(const Tizen::Base::String& key, Tizen::Base::String& else { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - r = pSettingClient->GetValue(key, value); - } - else + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + r = pSettingClient->GetValue(key, value); + + if(key == L"Wallpaper") { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - r = pSettingClientEx->GetValue(key, value); + if(_AppInfo::GetApiVersion() == _API_VERSION_2_0 && _AppInfo::IsOspCompat()) + { + String physicalFilePath = value; + r = Tizen::Io::_FileImpl::ConvertPhysicalToVirtualPath(physicalFilePath, value); + SysTryReturn(NID_SYS, r == E_SUCCESS, r, r, "[%s] It is failed to converting virtual path", GetErrorMessage(r)); + } } } return r; @@ -156,80 +138,40 @@ result _SettingInfoImpl::GetValue(const Tizen::Base::String& key, int& value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->GetValue(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->GetValue(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->GetValue(key, value); } result _SettingInfoImpl::GetValue(const Tizen::Base::String& key, long long& value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->GetValue(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->GetValue(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->GetValue(key, value); } result _SettingInfoImpl::GetValue(const Tizen::Base::String& key, double& value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->GetValue(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->GetValue(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->GetValue(key, value); } result _SettingInfoImpl::GetValue(const Tizen::Base::String& key, bool& value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->GetValue(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->GetValue(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->GetValue(key, value); } result _SettingInfoImpl::GetValue(const Tizen::Base::String& key, Tizen::Base::UuId& value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->GetValue(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->GetValue(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->GetValue(key, value); } result @@ -238,17 +180,18 @@ _SettingInfoImpl::SetWallpaper(const Tizen::Base::String& filePath) InitSettingClient(); result r = E_SUCCESS; - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - r = pSettingClient->SetValue(_SETTING_SCREEN_WALLPAPER, filePath); - } - else + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + + String physicalFilePath = filePath; + + if(Tizen::App::_AppInfo::GetApiVersion() == _API_VERSION_2_0 && Tizen::App::_AppInfo::IsOspCompat()) { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - r = pSettingClientEx->SetValue(_SETTING_SCREEN_WALLPAPER, filePath); + r = Tizen::Io::_FileImpl::ConvertVirtualToPhysicalPath(filePath, physicalFilePath); + SysTryReturn(NID_SYS, r == E_SUCCESS, r, r, "[%s] It is failed to converting physical path", GetErrorMessage(r)); } + r = pSettingClient->SetValue(_SETTING_SCREEN_WALLPAPER, physicalFilePath); + if(r == E_INVALID_ARG) r = E_FILE_NOT_FOUND; else if(r == E_OBJ_NOT_FOUND) @@ -264,48 +207,24 @@ _SettingInfoImpl::GetValueForPrivilegedKey(const String& key, bool& value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->GetValueForPrivilegedKey(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->GetValueForPrivilegedKey(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->GetValueForPrivilegedKey(key, value); } result _SettingInfoImpl::SetValue(const String& key, bool value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->SetValue(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->SetValue(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->SetValue(key, value); } result _SettingInfoImpl::SetValue(const String& key, int value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->SetValue(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->SetValue(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->SetValue(key, value); } @@ -314,22 +233,24 @@ _SettingInfoImpl::SetValue(const String& key, String value) { result r = E_SUCCESS; if (key == _FONT_SIZE || key == _FONT_TYPE) - { + { r = SetValueForFont(key, value); - } + } else { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->SetValue(key, value); - } - else + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + + if(key == _SETTING_SCREEN_WALLPAPER) { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->SetValue(key, value); + if(_AppInfo::GetApiVersion() == _API_VERSION_2_0 && _AppInfo::IsOspCompat()) + { + String virtualFilePath = value; + r = Tizen::Io::_FileImpl::ConvertVirtualToPhysicalPath(virtualFilePath, value); + SysTryReturn(NID_SYS, r == E_SUCCESS, r, r, "[%s] It is failed to converting physical path", GetErrorMessage(r)); + } } + return pSettingClient->SetValue(key, value); } return r; } @@ -338,63 +259,31 @@ result _SettingInfoImpl::SetValueForPrivilegedKey(const String& key, bool value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->SetValueForPrivilegedKey(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->SetValueForPrivilegedKey(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->SetValueForPrivilegedKey(key, value); } result _SettingInfoImpl::SetValueForPrivilegedKey(const String& key, String value) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->SetValueForPrivilegedKey(key, value); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->SetValueForPrivilegedKey(key, value); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->SetValueForPrivilegedKey(key, value); } bool _SettingInfoImpl::HasKey(const String& key) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->HasKey(key); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->HasKey(key); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->HasKey(key); } result _SettingInfoImpl::ResetToFactoryDefault(void) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->ResetToFactoryDefault(); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->ResetToFactoryDefault(); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->ResetToFactoryDefault(); } result @@ -402,16 +291,8 @@ _SettingInfoImpl::SetRingtone(const Tizen::Base::String& filePath) { result r = E_SUCCESS; InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - r = pSettingClient->SetValue(_SETTING_SOUND_RINGTONE, filePath); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - r = pSettingClientEx->SetValue(_SETTING_SOUND_RINGTONE, filePath); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + r = pSettingClient->SetValue(_SETTING_SOUND_RINGTONE, filePath); if(r == E_INVALID_ARG) r = E_FILE_NOT_FOUND; @@ -451,16 +332,8 @@ _SettingInfoImpl::SetVolume(const Tizen::Base::String& soundCategory, int level) } InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - r = pSettingClient->SetValue(key, level); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - r = pSettingClientEx->SetValue(key, level); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + r = pSettingClient->SetValue(key, level); if (r == E_OBJ_NOT_FOUND) { @@ -481,112 +354,56 @@ result _SettingInfoImpl::AddSettingEventListener(ISettingEventListener& listener) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->AddSettingEventListener(listener); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->AddSettingEventListener(listener); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->AddSettingEventListener(listener); } result _SettingInfoImpl::RemoveSettingEventListener(ISettingEventListener& listener) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->RemoveSettingEventListener(listener); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->RemoveSettingEventListener(listener); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->RemoveSettingEventListener(listener); } result _SettingInfoImpl::AddSettingEventListenerForInternal(ISettingEventListener& listener) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->AddSettingEventListenerForInternal(listener); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->AddSettingEventListenerForInternal(listener); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->AddSettingEventListenerForInternal(listener); } result _SettingInfoImpl::RemoveSettingEventListenerForInternal(ISettingEventListener& listener) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->RemoveSettingEventListenerForInternal(listener); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->RemoveSettingEventListenerForInternal(listener); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->RemoveSettingEventListenerForInternal(listener); } result _SettingInfoImpl::SetSettingEventListener(ISettingEventListener* pListener) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->SetSettingEventListener(pListener); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->SetSettingEventListener(pListener); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->SetSettingEventListener(pListener); } result _SettingInfoImpl::SetValueAsync(const Tizen::Base::String& key, bool value, ISettingInfoSetValueAsyncResultListener* listener) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->SetValueAsync(key, value, listener); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->SetValueAsync(key, value, listener); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->SetValueAsync(key, value, listener); } result _SettingInfoImpl::SetValueAsyncForPrivilegedKey(const Tizen::Base::String& key, bool value, ISettingInfoSetValueAsyncResultListener* listener) { InitSettingClient(); - if(common_mode == false) - { - SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClient->SetValueAsyncForPrivilegedKey(key, value, listener); - } - else - { - SysTryReturnResult(NID_SYS, pSettingClientEx != null, E_SYSTEM, "It is failed to intialize setting manager"); - return pSettingClientEx->SetValueAsyncForPrivilegedKey(key, value, listener); - } + SysTryReturnResult(NID_SYS, pSettingClient != null, E_SYSTEM, "It is failed to intialize setting manager"); + return pSettingClient->SetValueAsyncForPrivilegedKey(key, value, listener); } _SettingInfoImpl*