Fix for 37448

[apps/osp/Call.git] / src / CallIncomingCallForm.cpp

diff --git a/src/CallIncomingCallForm.cpp b/src/CallIncomingCallForm.cpp
index fdea3cb..861214b 100644 (file)
--- a/src/CallIncomingCallForm.cpp
+++ b/src/CallIncomingCallForm.cpp
@@ -218,14 +218,7 @@ IncomingCallForm::OnInitializing(void)
        }
        HideRejectPanel();
 
-       //Get Reject list from Settings Manager
-       IMapT<int,String>* pMsgMap = SettingsManager::GetInstance()->GetRejectMessageListN();
-       if(pMsgMap != null)
-       {
-               __pRejectMessageList = pMsgMap->GetValuesN();
-               delete pMsgMap;
-               pMsgMap = null;
-       }
+
        InitializeTableView();
 
        __pAcceptCircle = AppUtility::GetBitmapFromResourcesN(IDB_ACCEPT_CIRCLE_ICON, W_DIAL_LABEL, H_DIAL_LABEL);
@@ -721,6 +714,28 @@ void
 IncomingCallForm::OnSceneActivatedN(const SceneId& previousSceneId,    const SceneId& currentSceneId, IList* pArgs)
 {
        AddOrientationEventListener(*this);
+       //Get Reject list from Settings Manager
+       IMapT<int,String>* pMsgMap = SettingsManager::GetInstance()->GetRejectMessageListN();
+       if(pMsgMap != null)
+       {
+               if (__pRejectMessageList != null)
+               {
+                       delete __pRejectMessageList;
+                       __pRejectMessageList = null;
+               }
+               __pRejectMessageList = pMsgMap->GetValuesN();
+               delete pMsgMap;
+               pMsgMap = null;
+       }
+       //No reject messages
+       else
+       {
+               if (__pRejectMessageList != null)
+               {
+                       delete __pRejectMessageList;
+                       __pRejectMessageList = null;
+               }
+       }
        //listen to Foreground events
        CallApp* pPhoneApp = static_cast<CallApp*>(CallApp::GetInstance());
        pPhoneApp->AddAppStateChangeListener(*this);
@@ -868,7 +883,6 @@ IncomingCallForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneI
 
        }
        CallApp* pCallApp = static_cast<CallApp*>(CallApp::GetInstance());
-       pCallApp->SetTopMostWindow(false);
        pCallApp->RemoveAppStateChangeListener(*this);
 }
 
@@ -1286,7 +1300,7 @@ IncomingCallForm::SetBitmapToRejectMessageButton(const String& btnName, const St
 void
 IncomingCallForm::OnTouchPressed(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
 {
-       __pCallPresentor->StopAlert();
+       //__pCallPresentor->StopAlert();
        if (currentPosition.x < VALID_TOUCH_X_OFFSET && currentPosition.y < VALID_TOUCH_Y_OFFSET)
        {
                Rectangle rect = source.GetBounds();