Fix for 38025 37983

Change-Id: I92f1a6ab2e5510d3e0b6db127d533f77552ab2c8
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..03f0c77 100644 (file)
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
 Flora License
 
-Version 1.0, April, 2013
+Version 1.1, April, 2013
 
 http://floralicense.org/license/
 
@@ -192,7 +192,7 @@ identification within third-party archives.
 
    Copyright [yyyy] [name of copyright owner]
 
-   Licensed under the Flora License, Version 1.0 (the "License");
+   Licensed under the Flora License, Version 1.1 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 

diff --git a/NOTICE b/NOTICE
index 9ec42be..a5964ea 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,3 @@
 Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE.Flora file for Flora License, Version 1 terms and conditions.
\ No newline at end of file
+Except as noted, this software is licensed under Flora License, Version 1.1.
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.

diff --git a/src/CallButtonsPanel.cpp b/src/CallButtonsPanel.cpp
index ab0635d..06129b5 100644 (file)
--- a/src/CallButtonsPanel.cpp
+++ b/src/CallButtonsPanel.cpp
@@ -646,6 +646,7 @@ CallButtonsPanel::SetEndCallPanelState(bool isEnabled)
        //AddToContact or Viewcontact button
        pButton = static_cast<Button*>(GetControl(IDC_ADD_TO_CONTACT_BUTTON));
        pButton->SetShowState(isEnabled);
+       pButton->SetEnabled(isEnabled);
        /*pButton->Invalidate(true);*/
 }
 

diff --git a/src/CallEndCallForm.cpp b/src/CallEndCallForm.cpp
index 8917b4a..38ae27e 100644 (file)
--- a/src/CallEndCallForm.cpp
+++ b/src/CallEndCallForm.cpp
@@ -393,7 +393,10 @@ EndCallForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cu
                }
                else if(pEndCall->GetCalllogType() == CALL_LOG_TYPE_VOICE_INCOMING)
                {
-                       __pCallButtonsPanel->ShowOrHideAddtoContactsButton(true);
+                       if(pEndCall->GetContactNumber().IsEmpty() == false)
+                       {
+                               __pCallButtonsPanel->ShowOrHideAddtoContactsButton(true);
+                       }
                }
 
        }

diff --git a/src/CallIncomingCallForm.cpp b/src/CallIncomingCallForm.cpp
index 861214b..def9aef 100644 (file)
--- a/src/CallIncomingCallForm.cpp
+++ b/src/CallIncomingCallForm.cpp
@@ -840,6 +840,9 @@ IncomingCallForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneI
                pButtonRejectMessage->SetActionId(IDA_SHOW_REJECT_CALL_MESSAGE_PANEL);
                pButtonRejectMessage->AddActionEventListener(*this);
        }
+       //This called here to handle the case when incoming call comes when
+       // add call is in foreground.
+       __pCallPresentor->OnAppForeground();
 
 }
 
@@ -1608,6 +1611,7 @@ IncomingCallForm::OnOrientationChanged(const Control& source, OrientationStatus
 void
 IncomingCallForm::OnForeground(void)
 {
+       AppLogDebug("Enter");
        __pCallPresentor->OnAppForeground();
 }
 

diff --git a/src/CallPresentationModel.cpp b/src/CallPresentationModel.cpp
index 468f732..3da9eed 100644 (file)
--- a/src/CallPresentationModel.cpp
+++ b/src/CallPresentationModel.cpp
@@ -474,6 +474,7 @@ CallPresentationModel::RejectCall(int callHandle, bool sendMsg, const String& co
 
 void CallPresentationModel::OnAppForeground(void)
 {
+       AppLogDebug("Enter %d %d",__isDialAppControlRunning ,__isMessageAppControlRunning);
        if (__isDialAppControlRunning == true)
        {
                //This comes here, when Dialer AppControl is finished working.
@@ -487,10 +488,10 @@ void CallPresentationModel::OnAppForeground(void)
                __pAppControlMgr->AppControlRequestCompleted();
                //Check if this was the last call, then terminate application.
                //And if any calls are active, then those cases are already handled from Other places.
-               if( GetCurrentCallCount() == 0)
+               if( GetCurrentCallCount() == 0 && IsIncomingorDialingCallPresent() == false)
                {
-                       CallApp* pPhoneApp = static_cast<CallApp*>(UiApp::GetInstance());
-                       pPhoneApp->Terminate();
+                       CallApp* pCallApp = static_cast<CallApp*>(UiApp::GetInstance());
+                       pCallApp->Terminate();
                }
        }
 }
@@ -713,6 +714,7 @@ CallPresentationModel::LaunchDialAppControl()
 
        if(__isDialAppControlRunning == true)
        {
+               AppLogDebug("__isDialAppControlRunning == true");
                //Do not allow another app control if already running
                return;
        }