[Jira|N_SE-37236] fix problem when appwidget viewer is terminated unexpectedly

Change-Id: I3572b309ac5af68281137beeaa7ff309ed4dc086
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

diff --git a/inc/FShell_AppWidgetContext.h b/inc/FShell_AppWidgetContext.h
index 710dab4..2139818 100644 (file)
--- a/inc/FShell_AppWidgetContext.h
+++ b/inc/FShell_AppWidgetContext.h
@@ -76,7 +76,7 @@ private:
        result SendRequestToApp(const Tizen::App::AppId& appId, const Tizen::Base::String& operation, Tizen::Base::Collection::HashMap* pArgs);
        void SendPendingTouchEvent(void);
 
-       virtual Tizen::Base::Collection::HashMap* CreateRequestArgs(void);
+       virtual Tizen::Base::Collection::HashMap* CreateRequestArgsN(void);
 
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
 

diff --git a/inc/FShell_AppWidgetContextBase.h b/inc/FShell_AppWidgetContextBase.h
index 4cb57c4..31259b7 100644 (file)
--- a/inc/FShell_AppWidgetContextBase.h
+++ b/inc/FShell_AppWidgetContextBase.h
@@ -69,7 +69,7 @@ protected:
        bool IsRunning(void) const;
        bool IsSharedMemCreated(void) const;
 
-       virtual Tizen::Base::Collection::HashMap* CreateRequestArgs(void) = 0;
+       virtual Tizen::Base::Collection::HashMap* CreateRequestArgsN(void) = 0;
        result SendRequestToApp(const Tizen::App::AppId& appId, const Tizen::Base::String& operation, Tizen::Base::Collection::HashMap* pArgs);
 
 public:

diff --git a/inc/FShell_AppWidgetPopupContext.h b/inc/FShell_AppWidgetPopupContext.h
index 240b0de..fc4b0af 100644 (file)
--- a/inc/FShell_AppWidgetPopupContext.h
+++ b/inc/FShell_AppWidgetPopupContext.h
@@ -50,7 +50,7 @@ public:
        result RequestUpdateRemote(void);
 
 private:
-       virtual Tizen::Base::Collection::HashMap* CreateRequestArgs(void);
+       virtual Tizen::Base::Collection::HashMap* CreateRequestArgsN(void);
 
 private:
        _AppWidgetContext* __pParent;

diff --git a/src/FShell_AppWidgetContext.cpp b/src/FShell_AppWidgetContext.cpp
index 4383d06..c06db2e 100644 (file)
--- a/src/FShell_AppWidgetContext.cpp
+++ b/src/FShell_AppWidgetContext.cpp
@@ -181,7 +181,7 @@ _AppWidgetContext::OnPopupDestoyed(void)
 result
 _AppWidgetContext::SendAddRequest(int width, int height)
 {
-       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgs() );
+       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgsN() );
 
        return SendRequestToApp( __appId, APPWIDGET_ON_ADD, pArgs.get());
 }
@@ -189,7 +189,7 @@ _AppWidgetContext::SendAddRequest(int width, int height)
 result
 _AppWidgetContext::SendUpdateRequest(int width, int height, const String& argument)
 {
-       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgs() );
+       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgsN() );
 
        pArgs->Add(new String(ARG_KEY_ARGUMENT), new String(argument));
 
@@ -199,7 +199,7 @@ _AppWidgetContext::SendUpdateRequest(int width, int height, const String& argume
 result
 _AppWidgetContext::SendResizeRequest(int width, int height)
 {
-       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgs() );
+       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgsN() );
 
        return SendRequestToApp( __appId, APPWIDGET_ON_RESIZE, pArgs.get());
 }
@@ -207,7 +207,7 @@ _AppWidgetContext::SendResizeRequest(int width, int height)
 result
 _AppWidgetContext::SendRemoveRequest()
 {
-       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgs() );
+       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgsN() );
 
        return SendRequestToApp( __appId, APPWIDGET_ON_REMOVE, pArgs.get());
 }
@@ -240,7 +240,7 @@ _AppWidgetContext::SendTouchEvent(buffer_event eventType, double timeStamp, doub
                __pPendingTouchEventList->Add(new PendingTouchEvent(eventType, timeStamp, x, y));
 
                //
-               std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgs() );
+               std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgsN() );
 
                pArgs->Add(new String(ARG_KEY_EVENT_TYPE), new String(Integer::ToString(eventType)));
                pArgs->Add(new String(ARG_KEY_TIME_STAMP), new String(Double::ToString(timeStamp)));
@@ -282,7 +282,7 @@ _AppWidgetContext::RequestUpdateRemote(int width, int height)
 }
 
 Tizen::Base::Collection::HashMap*
-_AppWidgetContext::CreateRequestArgs(void)
+_AppWidgetContext::CreateRequestArgsN(void)
 {
        HashMap* pArgs = new (std::nothrow) HashMap(SingleObjectDeleter);
        pArgs->Construct();

diff --git a/src/FShell_AppWidgetContextBase.cpp b/src/FShell_AppWidgetContextBase.cpp
index 66de751..8643800 100644 (file)
--- a/src/FShell_AppWidgetContextBase.cpp
+++ b/src/FShell_AppWidgetContextBase.cpp
@@ -219,11 +219,11 @@ _AppWidgetContextBase::ReleaseSharedMem()
 result
 _AppWidgetContextBase::SendRequestToApp(const AppId& appId, const String& operation, HashMap* pArgs)
 {
-       if( __isForeground == false)
+       /*if( __isForeground == false)
        {
                SysLog(NID_SHELL, "appWidget isn't foreground, so, message skip");
                return E_SUCCESS;
-       }
+       }*/
 
        return _AppWidgetRequestHelper::SendRequestToApp(appId, operation, pArgs);
 }
@@ -234,7 +234,7 @@ _AppWidgetRequestHelper::SendRequestToApp(const AppId& appId, const String& oper
        SysLog(NID_SHELL, "appId(%ls), operation(%ls), arg count(%d)", appId.GetPointer(), operation.GetPointer(), pArgs->GetCount() );
 
        _AppMessageImpl msg;
-       msg.AddData(OSP_K_APPCONTROL_INTERNAL_OPERATION, L"livebox");
+       msg.AddData(OSP_K_APPCONTROL_INTERNAL_OPERATION, L"appwidget");
        Tizen::App::_AppArg::AddStrMap(msg.GetBundle(), pArgs);
 
        std::unique_ptr<char[]> pAppId(_StringConverter::CopyToCharArrayN(appId) );

diff --git a/src/FShell_AppWidgetManagerService.cpp b/src/FShell_AppWidgetManagerService.cpp
index 5088e8f..26e9abc 100644 (file)
--- a/src/FShell_AppWidgetManagerService.cpp
+++ b/src/FShell_AppWidgetManagerService.cpp
@@ -136,6 +136,7 @@ AppWidgetManagerService::OnTimerExpired(Timer& timer)
        provider_send_ping();
 }
 
+//TODO: remove unused param 'appId'
 _AppWidgetContext*
 AppWidgetManagerService::Find(const String& appId, const String& instanceId) const
 {
@@ -143,11 +144,9 @@ AppWidgetManagerService::Find(const String& appId, const String& instanceId) con
        {
                _AppWidgetContext* pAppWidgetContext = null;
                __appWidgetContextList.GetAt(i, pAppWidgetContext);
-//             SysLog(NID_SHELL, "%ls", pAppWidgetContext->__instanceId.GetPointer());
 
                if ( pAppWidgetContext->__instanceId == instanceId )
                {
-//                     SysAssert(pAppWidgetContext->__appId == appId)
                        return pAppWidgetContext;
                }
        }
@@ -172,7 +171,6 @@ AppWidgetManagerService::SetIpcClientIds(const Tizen::App::AppId& appId, int cli
 
                        if( clientId == -1)//disconnected
                        {
-//                             pAppWidgetContext->ReleaseSharedMem();
                                pAppWidgetContext->Suspend();
                                if(pAppWidgetContext->GetAppWidgetPopup())
                                {

diff --git a/src/FShell_AppWidgetPopupContext.cpp b/src/FShell_AppWidgetPopupContext.cpp
index ab5f146..23cc7d5 100644 (file)
--- a/src/FShell_AppWidgetPopupContext.cpp
+++ b/src/FShell_AppWidgetPopupContext.cpp
@@ -76,7 +76,7 @@ _AppWidgetPopupContext::OnPopupDestoyed()
 result
 _AppWidgetPopupContext::SendPopupCreateRequest(double x, double y, int width, int height)
 {
-       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgs() );
+       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgsN() );
 
        pArgs->Add(new String(ARG_KEY_X), new String(Double::ToString(x)));
        pArgs->Add(new String(ARG_KEY_Y), new String(Double::ToString(y)));
@@ -89,7 +89,7 @@ _AppWidgetPopupContext::SendPopupCreateRequest(double x, double y, int width, in
 result
 _AppWidgetPopupContext::SendPopupDestroyRequest()
 {
-       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgs() );
+       std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgsN() );
 
        return SendRequestToApp( __appId, APPWIDGET_POPUP_ON_DESTROY, pArgs.get());
 }
@@ -133,7 +133,7 @@ _AppWidgetPopupContext::RequestUpdateRemote()
 }
 
 Tizen::Base::Collection::HashMap*
-_AppWidgetPopupContext::CreateRequestArgs(void)
+_AppWidgetPopupContext::CreateRequestArgsN(void)
 {
        HashMap* pArgs = new (std::nothrow) HashMap(SingleObjectDeleter);
        pArgs->Construct();