Merge "[2.2.1]String::Contains() seems to block for long time for very long String...

[platform/framework/native/appfw.git] / src / app / FApp_AppImpl.cpp

diff --git a/src/app/FApp_AppImpl.cpp b/src/app/FApp_AppImpl.cpp
index 8dd78e2..3286d92 100644 (file)
--- a/src/app/FApp_AppImpl.cpp
+++ b/src/app/FApp_AppImpl.cpp
@@ -56,6 +56,7 @@
 #include "FApp_AppArg.h"
 #include "FApp_IAppImpl.h"
 #include "FApp_AppResourceImpl.h"
+#include <FSys_SettingInfoImpl.h>
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
@@ -137,6 +138,9 @@ _AppImpl::Construct(const IList* pArgs)
 
        _AppInfo::SetAppState(INITIALIZING);
 
+       r = _SettingInfoImpl::AddSettingEventListenerForInternal(*this);
+       SysTryLog(NID_APP, !IsFailed(r), "[%s] failed to add setting event listener.", GetErrorMessage(r));
+
        return E_SUCCESS;
 }
 
@@ -172,7 +176,7 @@ _AppImpl::Execute(_IAppImpl* pIAppImpl)
 
        state_handler.low_memory = &OnLowMemory;
        state_handler.low_battery = NULL;
-       state_handler.language_changed = &OnLanguageChanged;
+       state_handler.language_changed = NULL;
        state_handler.region_format_changed = NULL;
 
        _Aul::SetPowerOffNotiListener(OnPowerOffNotiReceived, this);
@@ -368,6 +372,9 @@ _AppImpl::OnTerminate(void* user_data)
        SysTryReturnVoidResult(NID_APP, pAppImpl != null, E_INVALID_STATE, "[E_INVALID_STATE] Getting App instance failed.");
        SysTryReturnVoidResult(NID_APP, pAppImpl->__pIAppImpl != null, E_INVALID_STATE, "[E_INVALID_STATE] Getting App instance failed.");
 
+       result r = _SettingInfoImpl::RemoveSettingEventListenerForInternal(*pAppImpl);
+       SysTryLog(NID_APP, !IsFailed(r), "[%s] failed to remove setting event listener.", GetErrorMessage(r));
+
        __isTerminationRequested = true;
        pAppImpl->__pIAppImpl->OnTerminate();
 }
@@ -456,6 +463,8 @@ _AppImpl::Terminate(void)
 {
        result r = E_SUCCESS;
 
+       SysLog(NID_APP, "Terminate() is called by application itself");
+
        __isTerminationRequested = true;
 
        app_efl_exit();
@@ -611,17 +620,6 @@ _AppImpl::OnBatteryLevelChanged(BatteryLevel batteryLevel)
        __pApp->OnBatteryLevelChanged(batteryLevel);
 }
 
-void
-_AppImpl::OnLanguageChanged(void* user_data)
-{
-       SysLog(NID_APP, "");
-       _AppInfo::UpdatePackageInfo(true);
-
-       _AppResourceImpl::Reinitialize();
-       SysLog(NID_APP, "Language change done.");
-}
-
-
 result
 _AppImpl::SendUserEvent(RequestId requestId, const IList* pArgs, bool isPublic)
 {
@@ -1414,6 +1412,17 @@ _AppImpl::OnPowerOffNotiReceived(void* node, void* user_data)
        }
 }
 
+void
+_AppImpl::OnSettingChanged(String& key)
+{
+       if (key == L"http://tizen.org/setting/locale.language")
+       {
+               _AppInfo::UpdatePackageInfo(true);
+               _AppResourceImpl::Reinitialize();
+               SysLog(NID_APP, "Reinitialized resources due to locale change.");
+       }
+}
+
 bool
 _AppImpl::IsForcedTermination(void)
 {