From 21a507577cfdc79f236b61bd920eb3e3e408cdec Mon Sep 17 00:00:00 2001
From: "jungmin76.park" <jungmin76.park@samsung.com>
Date: Thu, 18 Apr 2013 13:33:07 +0900
Subject: [PATCH] implement LifeDuration feature(remove from
 osp-appwidget-service)

Change-Id: Id071889dea665606a44c50545f53403c4d44cfb8
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>
---
 inc/FShell_AppWidgetContext.h      |  4 +--
 inc/FShell_AppWidgetPopupContext.h |  2 +-
 src/FShell_AppWidgetContext.cpp    | 43 +++++++++++++++---------------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/inc/FShell_AppWidgetContext.h b/inc/FShell_AppWidgetContext.h
index a1fc0e9..b4d289f 100644
--- a/inc/FShell_AppWidgetContext.h
+++ b/inc/FShell_AppWidgetContext.h
@@ -66,7 +66,7 @@ public:
 	_AppWidgetPopupContext* GetAppWidgetPopup() const;
 	virtual result SendTouchEvent(buffer_event event, double timestamp, double x, double y);
 
-	void RestartLifeDurationTimer();
+//	void RestartLifeDurationTimer();
 
 private:
 	result SendAddRequest(int width, int height);
@@ -93,7 +93,7 @@ private:
 
 private:
 	_AppWidgetPopupContext* __pAppWidgetPopup;
-	Tizen::Base::Runtime::Timer __lifeDurationTimer;
+//	Tizen::Base::Runtime::Timer __lifeDurationTimer;
 	Tizen::Base::Runtime::Timer __UpdateTimer;
 	int __updateMillis;
 	Tizen::Base::Collection::ArrayListT<PendingTouchEvent*>* __pPendingTouchEventList;
diff --git a/inc/FShell_AppWidgetPopupContext.h b/inc/FShell_AppWidgetPopupContext.h
index 3e3e339..e58390d 100644
--- a/inc/FShell_AppWidgetPopupContext.h
+++ b/inc/FShell_AppWidgetPopupContext.h
@@ -46,7 +46,7 @@ public:
 	result SendPopupDestroyRequest();
 	virtual result SendTouchEvent(buffer_event event, double timestamp, double x, double y);
 
-	result RequestUpdateRemote();
+	result RequestUpdateRemote(void);
 };
 
 
diff --git a/src/FShell_AppWidgetContext.cpp b/src/FShell_AppWidgetContext.cpp
index 9402919..7edccc5 100644
--- a/src/FShell_AppWidgetContext.cpp
+++ b/src/FShell_AppWidgetContext.cpp
@@ -66,8 +66,8 @@ _AppWidgetContext::_AppWidgetContext(const String& info, const String& providerI
  ,__updateMillis(period)
  ,__pPendingTouchEventList(null)
 {
-	__lifeDurationTimer.Construct(*this);//, true);
-	__lifeDurationTimer.Start(DEFAULT_LIFE_DURATION_MSEC );
+//	__lifeDurationTimer.Construct(*this);//, true);
+//	__lifeDurationTimer.Start(DEFAULT_LIFE_DURATION_MSEC );
 
 	__updateMillis = (__updateMillis > UPDATE_PERIOD_MSEC_MIN) ? __updateMillis : UPDATE_PERIOD_MSEC_MIN;
 	SysLog(NID_APP, "period(%d)", __updateMillis);
@@ -84,7 +84,7 @@ _AppWidgetContext::_AppWidgetContext(const String& info, const String& providerI
 _AppWidgetContext::~_AppWidgetContext()
 {
 	SysLog(NID_APP, "appId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority);
-	__lifeDurationTimer.Cancel();
+//	__lifeDurationTimer.Cancel();
 	__UpdateTimer.Cancel();
 
 	if (__pAppWidgetPopup)
@@ -169,7 +169,7 @@ _AppWidgetContext::OnPopupCreated(double x, double y, int width, int height)
 	__pAppWidgetPopup->SetIpcClientId(__ipcClientId);
 	__pAppWidgetPopup->OnPopupCreated(x, y, width, height);
 
-	__lifeDurationTimer.Cancel();
+//	__lifeDurationTimer.Cancel();
 }
 
 void
@@ -182,7 +182,7 @@ _AppWidgetContext::OnPopupDestoyed(void)
 		delete __pAppWidgetPopup;
 		__pAppWidgetPopup = null;
 	}
-	RestartLifeDurationTimer();
+//	RestartLifeDurationTimer();
 }
 
 result
@@ -288,26 +288,27 @@ _AppWidgetContext::RequestUpdateRemote(int width, int height)
 	return E_SUCCESS;
 }
 
-void
-_AppWidgetContext::RestartLifeDurationTimer()
-{
-	__lifeDurationTimer.Cancel();
-	__lifeDurationTimer.Start(DEFAULT_LIFE_DURATION_MSEC);
-	SysLog(NID_APP, "lifeDuration timer restarted (%d)msec", DEFAULT_LIFE_DURATION_MSEC);
-}
+//void
+//_AppWidgetContext::RestartLifeDurationTimer()
+//{
+//	__lifeDurationTimer.Cancel();
+//	__lifeDurationTimer.Start(DEFAULT_LIFE_DURATION_MSEC);
+//	SysLog(NID_APP, "lifeDuration timer restarted (%d)msec", DEFAULT_LIFE_DURATION_MSEC);
+//}
 
 void
 _AppWidgetContext::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
 {
-	if( &timer == &__lifeDurationTimer)
-	{
-		SysLog(NID_APP, "lifeDuration timer is expired, so terminating appWidget app(%ls)..", __providerId.GetPointer() );
-
-//		ReleaseSharedMem();
-		AppManager::GetInstance()->TerminateApplication(__appId);
-
-	}
-	else if( &timer == &__UpdateTimer)
+//	if( &timer == &__lifeDurationTimer)
+//	{
+//		SysLog(NID_APP, "lifeDuration timer is expired, so terminating appWidget app(%ls)..", __providerId.GetPointer() );
+//
+////		ReleaseSharedMem();
+//		AppManager::GetInstance()->TerminateApplication(__appId);
+//
+//	}
+//	else
+	if( &timer == &__UpdateTimer)
 	{
 		SysLog(NID_APP, "update timer is expired for appWidget app(%ls)..", __providerId.GetPointer() );
 		OnUpdate(L"");
-- 
2.34.1