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

equal deleted inserted replaced

-:6aaf0276100e
+:c76a0b1755b9
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndCallSetup::ConstructL()
 {
 CPhoneConference::ConstructL();
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndCallSetup::NewL()
 // Constructor
 TBool CPhoneConferenceAndCallSetup::HandleCommandL( TInt aCommand )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndCallSetup::HandleCommandL()");
 TBool commandStatus = ETrue;
 switch( aCommand )
 {
 case EPhoneDtmfDialerCancel:
 {
 }
 default:
 commandStatus = CPhoneConference::HandleCommandL( aCommand );
 break;
 }
 return commandStatus;
 }
 // --------------------------------------------------------------
 // CPhoneConferenceAndCallSetup::HandleKeyMessageL
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndCallSetup::HandleKeyMessageL()");
 switch ( aCode )
 {
-// End-key
+case EKeyNo: // End-key
-case EKeyNo:
 if ( aMessage == EPhoneKeyLongPress )
 {
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageTerminateAllConnections );
 }
 DisconnectOutgoingCallL();
 }
 break;
 default:
-// do base operation
 CPhoneConference::HandleKeyMessageL( aMessage, aCode );
 break;
 }
 }
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndCallSetup::HandleConnectingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectingL()");
 BeginUiUpdateLC();
 UpdateRemoteInfoDataL ( aCallId );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
-// Re-enable global notes
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
-// Stop capturing keys
+if ( !IsNumberEntryVisibleL() )
-CaptureKeysDuringCallNotificationL( EFalse );
-// Remove the number entry if it isn't DTMF dialer
-if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 }
 // Set Hold flag to view EFalse that IHF is on RSK not unhold
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-// Updated connecting cba's
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnecting );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 &callHeaderParam );
 EndUiUpdate();
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndCallSetup::HandleConnectedL
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndCallSetup::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectedL()");
-// Keep Phone in the foreground
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
 BeginUiUpdateLC();
-// 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( EPhoneConferenceAndSingleButtons );
 EndUiUpdate();
 UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA );
+iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
-iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndCallSetup:HandleIdleL
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndCallSetup::HandleIdleL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndCallSetup::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 on hold' global note
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
+iViewCommandHandle->ExecuteCommandL(
-// Remove conference member from conference bubble
+EPhoneViewRemoveFromConference,
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference,
+aCallId );
-aCallId );
 //Check if removed call was last one to be able to be in conference mode
 //If there is no confrence call, go to single and call setup state
 TPhoneCmdParamBoolean conferenceExists;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsConference,
 &conferenceExists );
 __PHONELOG1( EBasic, EPhoneControl,
 "CPhoneConferenceAndCallSetup::HandleIdleL - conferenceExists =%d ",
 conferenceExists.Boolean() );
 if( !conferenceExists.Boolean() )
 {
 iStateMachine->ChangeState( EPhoneStateAlertingInSingle );
 }
 else
 {
 iStateMachine->ChangeState( EPhoneStateCallSetupInSingle );
 }
 }
 }
 else
 {
 // Remove  outgoing call
 BeginUiUpdateLC();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-CheckIfRestoreNEContentAfterDtmfDialer();
 if ( IsNumberEntryUsedL() )
 {
-// Show the number entry if it exists
 SetNumberEntryVisibilityL(ETrue);
 }
 SetTouchPaneButtons( EPhoneConferenceButtons );
 EndUiUpdate();
-// Go to conference state
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 iStateMachine->ChangeState( EPhoneStateConference );
 }
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndCallSetup::UpdateInCallCbaL
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndCallSetup::UpdateInCallCbaL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::UpdateInCallCbaL() ");
 if ( iAlerting )
 {
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 }
 else
 //
 void CPhoneConferenceAndCallSetup::HandleConferenceIdleL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndCallSetup::HandleConferenceIdleL()");
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
-// Fetch alerting call's id from view
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateConnecting );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 iStateMachine->ChangeState( EPhoneStateAlertingInSingle );
 }
 else
 {
-// Go to callsetup and single state
 UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
 iStateMachine->ChangeState( EPhoneStateCallSetupInSingle );
 }
 }
 // End of File

changeset 72	c76a0b1755b9
parent 56	5bcb308bd24d
child 74	d1c62c765e48