FCL/sf/app/phone: comparison phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp

equal deleted inserted replaced

-:1eef62f5c541
+:2a5d4ab426d3
 TBool CPhoneConferenceAndWaitingAndCallSetup::HandleCommandL( TInt aCommand )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaitingAndCallSetup::HandleCommandL()");
 TBool commandStatus = ETrue;
+commandStatus = CPhoneConference::HandleCommandL( aCommand );
-switch( aCommand )
-{
-case EPhoneDtmfDialerCancel:
-{
-}
-break;
-default:
-commandStatus = CPhoneConference::HandleCommandL( aCommand );
-break;
-}
 return commandStatus;
 }
 // --------------------------------------------------------------
 // CPhoneConferenceAndWaitingAndCallSetup::HandleKeyMessageL
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaitingAndCallSetup::HandleKeyMessageL");
 switch ( aCode )
 {
-// send-key
+case EKeyYes: // send-key
-case EKeyYes:
 if( IsNumberEntryVisibleL() )
 {
 CallFromNumberEntryL();
 }
 else
 {
 // Number entry is behind waiting call bubble.
 // We can't answer to call in this state so display
 // Not allowed -note.
 SendGlobalErrorNoteL(
 EPhoneNoteTextNotAllowed, ETrue );
 }
 break;
 default:
-// do base operation
 CPhoneConference::HandleKeyMessageL( aMessage, aCode );
 break;
 }
 }
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndWaitingAndCallSetup::UpdateInCallCbaL()
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneConferenceAndWaitingAndCallSetup::SetCallSetupCbaL() ");
 if ( iAlerting )
 {
 UpdateCbaL ( EPhoneCallHandlingCallWaitingCBA );
 }
 else
 //
 void CPhoneConferenceAndWaitingAndCallSetup::HandleConnectingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectingL");
 BeginUiUpdateLC();
 UpdateRemoteInfoDataL ( aCallId );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
-// Re-enable global notes
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
-// Stop capturing keys
-CaptureKeysDuringCallNotificationL( EFalse );
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnecting );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 &callHeaderParam );
-// Remove the number entry if it isn't DTMF dialer
+if ( !IsNumberEntryVisibleL() )
-if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 }
 EndUiUpdate();
+UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL");
 BeginUiUpdateLC();
 UpdateRemoteInfoDataL ( aCallId );
-// Show bubble
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnected );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 &callHeaderParam );
-// Capturing keys and number entry must be removed because some
+if ( !IsNumberEntryVisibleL() )
-// networks jump over connecting state directly to connected state.
-CaptureKeysDuringCallNotificationL( EFalse );
-// Remove the number entry if it isn't DTMF dialer
-if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 }
 SetTouchPaneButtons( EPhoneWaitingCallButtons );
 EndUiUpdate();
-// Go to Conference And Single And Waiting state
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaitingAndCallSetup::UpdateConnectingCbaL
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndWaitingAndCallSetup::UpdateConnectingCbaL()
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneConferenceAndCallSetup::UpdateInCallCbaL() ");
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL
 //
 void CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL");
 BeginUiUpdateLC();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
 if ( IsNumberEntryUsedL() )
 {
-// Show the number entry if it exists
 SetNumberEntryVisibilityL(ETrue);
 }
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateConnected );
 iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
 &callStateData );
-if( callStateData.CallId() > KErrNotFound )
+if( callStateData.CallId() > KErrNotFound ) //  No need update cba's.
 {
-// Go to Single And Waiting And Call Setup state
+SetTouchPaneButtons( EPhoneCallSetupButtons );
-SetTouchPaneButtons( EPhoneCallSetupButtons );
-// No need update cbas
 iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting );
 }
 else
 {
 callStateData.SetCallState( EPEStateHeld );
 iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
 &callStateData );
 if( callStateData.CallId() > KErrNotFound )
 {
-// Go to Single And Waiting And Call Setup state
 SetTouchPaneButtons( EPhoneCallSetupButtons );
-// No need update cbas
 iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting );
 }
 else
 {
 // Reset Hold flag to view
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-// Go to Call Setup And Waiting state
 SetTouchPaneButtons( EPhoneCallSetupButtons );
-// No need update cbas
 iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
 }
 }
 EndUiUpdate();
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaitingAndCallSetup::HandleIdleL
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndWaitingAndCallSetup::HandleIdleL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaitingAndCallSetup::HandleIdleL");
-// Re-enable global notes
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
-// Stop capturing keys
-CaptureKeysDuringCallNotificationL( EFalse );
 TPhoneCmdParamBoolean conferenceExistsForCallId;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference,
 aCallId, &conferenceExistsForCallId );
 if( conferenceExistsForCallId.Boolean() )
 {
-// Remove conference member from conference bubble
+iViewCommandHandle->ExecuteCommandL(
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference,
+EPhoneViewRemoveFromConference,
 aCallId );
 return;
 }
 else
 {
-// Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 TPhoneCmdParamBoolean conferenceBubbleExists;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsConference,
 &conferenceBubbleExists );
 if( !conferenceBubbleExists.Boolean() )
 {
 // Idle message came for last conference member.
 // Don't do anything, wait for ConferenceIdle message
 }
 else
 {
 BeginUiUpdateLC();
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateRinging );
 iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
 &callStateData );
 if( callStateData.CallId() > KErrNotFound )
 {
-CheckIfRestoreNEContentAfterDtmfDialer();
 if ( IsNumberEntryUsedL() )
 {
 // Show the number entry if callsetup failed with number busy
 // etc reason.
 SetNumberEntryVisibilityL(ETrue);
 }
-// Go to Conference And Waiting state
 SetTouchPaneButtons( EPhoneWaitingCallButtons );
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting );
 }
 else
 {
-// Go to Conference And Call Setup state
 SetTouchPaneButtons( EPhoneCallSetupButtons );
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 iStateMachine->ChangeState( EPhoneStateConferenceAndCallSetup );
 }
 EndUiUpdate();
 }
 }
 }
 // End of File

changeset 65	2a5d4ab426d3
parent 50	377c906a8701
child 74	d1c62c765e48