Fix alarm defect for applaunch based logic.

[platform/framework/native/appfw.git] / src / system / FSys_AlarmManager.cpp

diff --git a/src/system/FSys_AlarmManager.cpp b/src/system/FSys_AlarmManager.cpp
index 7ddeb62..bf61df0 100644 (file)
--- a/src/system/FSys_AlarmManager.cpp
+++ b/src/system/FSys_AlarmManager.cpp
@@ -86,6 +86,29 @@ _AlarmManager::~_AlarmManager()
        alarm_cancel_all();
 }
 
+int alarm_callback(alarm_id_t alarmId, void *user_param)
+{
+       _AlarmManager* pAlarmManager = _AlarmManager::GetInstance();
+       pAlarmManager->OnAlarmExpired((int)alarmId);
+        return 0;
+}
+
+result
+_AlarmManager::Construct(void)
+{
+       int errorCode;
+       Tizen::App::App* pApp = null;
+       pApp = Tizen::App::App::GetInstance();
+       String appId = pApp->GetAppId();
+       std::unique_ptr<char[]> pAppId(_StringConverter::CopyToCharArrayN(appId));
+
+       errorCode = alarmmgr_init(pAppId.get());
+       SysTryReturnResult(NID_SYS, errorCode == ALARMMGR_RESULT_SUCCESS, E_SYSTEM, "It is failed to init alarmmgr. error [%d]", errorCode);
+       errorCode = alarmmgr_set_cb(alarm_callback, null);
+       SysTryReturnResult(NID_SYS, errorCode == ALARMMGR_RESULT_SUCCESS, E_SYSTEM, "It is failed to set cb to alarmmgr. error [%d]", errorCode);
+       return E_SUCCESS;
+}
+
 _AlarmManager*
 _AlarmManager::GetInstance(void)
 {
@@ -100,11 +123,13 @@ _AlarmManager::GetInstance(void)
 void
 _AlarmManager::InitSingleton(void)
 {
-       _AlarmManager* pAlarmManager = new (std::nothrow) _AlarmManager();
+       result r = E_SUCCESS;
+       std::unique_ptr<_AlarmManager> pAlarmManager(new (std::nothrow) _AlarmManager());
        SysTryReturnVoidResult(NID_SYS, pAlarmManager, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.",
                                                   GetErrorMessage(E_OUT_OF_MEMORY));
-
-       __pAlarmManager = pAlarmManager;
+       r = pAlarmManager->Construct();
+       SysTryReturnVoidResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to construct alarm manager.");
+       __pAlarmManager = pAlarmManager.release();
        std::atexit(DestroySingleton);
 }
 
@@ -163,7 +188,7 @@ _AlarmManager::ReserveAlarm(Tizen::Base::String appId, Tizen::Base::DateTime sta
        ret = alarmmgr_set_type(pAlarmInfo, ALARM_TYPE_NOLAUNCH);
        SysTryCatch(NID_SYS, ret == ALARMMGR_RESULT_SUCCESS, r = E_SYSTEM, r, "It is failed to set repeat mode");
 
-       ret = alarmmgr_add_alarm_appsvc_with_localtime(pAlarmInfo,(void *)pBundle, &reservedAlarmId);
+       ret = alarmmgr_add_alarm_with_localtime(pAlarmInfo, null, &reservedAlarmId);
        SysTryCatch(NID_SYS, ret == ALARMMGR_RESULT_SUCCESS, r = E_SYSTEM, r, "Alarm creation failed!!! Alrmgr error code is %d", ret);
 
 CATCH: