--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Tue Aug 31 15:14:29 2010 +0300
@@ -54,16 +54,6 @@
//
CPhoneConferenceAndWaitingAndCallSetup::~CPhoneConferenceAndWaitingAndCallSetup()
{
- // Need to check iViewCommandHandle validity here to not
- // trigger a high/can panic error in a Codescanner run.
- // coverity[var_compare_op]
- if ( iViewCommandHandle )
- {
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( EFalse );
- TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag ) );
- }
}
// -----------------------------------------------------------
@@ -114,35 +104,25 @@
switch ( aMessage )
{
case MEngineMonitor::EPEMessageConnecting:
- {
iAlerting = ETrue;
HandleConnectingL( aCallId );
- }
break;
case MEngineMonitor::EPEMessageConnected:
- {
HandleConnectedL( aCallId );
- }
break;
case MEngineMonitor::EPEMessageConferenceIdle:
- {
HandleConferenceIdleL();
- }
break;
case MEngineMonitor::EPEMessageIdle:
- {
HandleIdleL( aCallId );
- }
break;
default:
- {
CPhoneConference::HandlePhoneEngineMessageL( aMessage,
aCallId );
- }
break;
}
}
@@ -161,7 +141,6 @@
{
case EPhoneDtmfDialerCancel:
{
- CloseDTMFEditorL();
}
break;
@@ -197,7 +176,7 @@
// We can't answer to call in this state so display
// Not allowed -note.
SendGlobalErrorNoteL(
- EPhoneNoteTextNotAllowed );
+ EPhoneNoteTextNotAllowed, ETrue );
}
break;
@@ -209,67 +188,6 @@
}
// -----------------------------------------------------------
-// CPhoneConferenceAndWaitingAndCallSetup::HandleErrorL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneConferenceAndWaitingAndCallSetup::HandleErrorL(
- const TPEErrorInfo& aErrorInfo )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaitingAndCallSetup::HandleErrorL()");
-
- if( aErrorInfo.iErrorCode == ECCPErrorCCUserAlertingNoAnswer )
- {
- // Should not shown "No Answer" note
- __PHONELOG1( EBasic, EPhoneUIStates,
- "PhoneUIStates: CPhoneConferenceAndWaitingAndCallSetup::HandleErrorL - aErrorInfo.iErrorCode =%d ",
- aErrorInfo.iErrorCode);
- }
- else
- {
- CPhoneState::HandleErrorL( aErrorInfo );
- }
- }
-
-// -----------------------------------------------------------
-// CPhoneConferenceAndWaitingAndCallSetup::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndWaitingAndCallSetup::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConferenceAndWaitingAndCallSetup::OpenMenuBarL");
-
- // Set specific flag to view so that DTMF menu item available
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
-
- TInt resourceId ( EPhoneAlertingWaitingAndConfHeldCallMenuBar );
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId =
- EPhoneAlertingWaitingAndConfHeldCallMenuBarWithNumberEntry;
- }
- else if ( IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsDropMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneConferenceAndWaitingAndCallSetup::UpdateInCallCbaL
// -----------------------------------------------------------
//
@@ -317,7 +235,7 @@
&callHeaderParam );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -351,13 +269,12 @@
CaptureKeysDuringCallNotificationL( EFalse );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
SetTouchPaneButtons( EPhoneWaitingCallButtons );
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
EndUiUpdate();
// Go to Conference And Single And Waiting state
@@ -385,10 +302,10 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL");
+
BeginUiUpdateLC();
-
+
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
if ( IsNumberEntryUsedL() )
{
@@ -425,13 +342,16 @@
// Reset Hold flag to view
TPhoneCmdParamBoolean holdFlag;
holdFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
+ iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
+
+ // Go to Call Setup And Waiting state
SetTouchPaneButtons( EPhoneCallSetupButtons );
- SetToolbarDimming( ETrue );
+
+ // No need update cbas
iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
}
}
- EndUiUpdate();
+ EndUiUpdate();
}
// -----------------------------------------------------------
@@ -452,9 +372,6 @@
// Stop capturing keys
CaptureKeysDuringCallNotificationL( EFalse );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
TPhoneCmdParamBoolean conferenceExistsForCallId;
iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference,
aCallId, &conferenceExistsForCallId );
@@ -509,7 +426,7 @@
UpdateCbaL( EPhoneCallHandlingInCallCBA );
iStateMachine->ChangeState( EPhoneStateConferenceAndCallSetup );
}
- EndUiUpdate();
+ EndUiUpdate();
}
}
}