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

equal deleted inserted replaced

-:1eef62f5c541
+:2a5d4ab426d3
 TKeyCode aCode )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::HandleKeyMessageL() ");
 switch ( aCode )
 {
-// send-key
+case EKeyYes: // send-key
-case EKeyYes:
 if( IsNumberEntryVisibleL() )
 {
 CPhoneState::CallFromNumberEntryL();
 }
 else
 {
 // Number entry is behind waiting call bubble
 // We can't answer to waiting call in this state
 CPhoneState::SendGlobalErrorNoteL(
 EPhoneNoteTextNotAllowed, ETrue );
 }
 break;
-// end-key
+case EKeyNo: // end-key
-case EKeyNo:
 if ( aMessage == EPhoneKeyLongPress )
 {
-// Close all connections
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageTerminateAllConnections );
 if ( IsNumberEntryContentStored() )
 {
 ClearNumberEntryContentCache();
 }
 if ( CPhoneState::IsNumberEntryUsedL() )
 {
-// Remove number entry from screen
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewRemoveNumberEntry );
 // Do state-specific operation when number entry is cleared
 HandleNumberEntryClearedL();
 }
 if ( !TopAppIsDisplayedL() )
 {
-// Bring app to foreground
 TPhoneCmdParamInteger uidParam;
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewBringAppToForeground, &uidParam );
 }
 }
-else
+else // handle short end key
 {
-// handle end key
+DisconnectOutgoingCallL();
-DisconnectOutgoingCallL();
 }
 break;
 default:
-// do base operation
 CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
 break;
 }
 }
 break;
 case MEngineMonitor::EPEMessageIdle:
 HandleIdleL( aCallId );
 break;
-case MEngineMonitor::EPEMessageRemoteBusy:
-// If call setup failed then stop capturing keys.
-CaptureKeysDuringCallNotificationL( EFalse );
-CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
-break;
 default:
 CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
 break;
 }
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndCallSetupAndWaiting:HandleCommandL
 // -----------------------------------------------------------
 //
 TBool CPhoneSingleAndCallSetupAndWaiting::HandleCommandL( TInt aCommand )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::HandleCommandL() ");
 TBool commandStatus = ETrue;
 switch( aCommand )
 {
-// 'End active call' from menu
 case EPhoneInCallCmdEndThisActiveCall:
 DisconnectOutgoingCallL();
 break;
-// 'End all calls' from menu
 case EPhoneInCallCmdEndAllCalls:
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageReleaseAll );
 break;
 case EPhoneDtmfDialerCancel:
-{
+break;
-}
-break;
 default:
 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
 break;
 }
 return commandStatus;
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndCallSetupAndWaiting:HandleIdleL
 TPhoneViewResponseId heldResponse;
 TPhoneViewResponseId ringingResponse;
 TPhoneViewResponseId alertingResponse;
 TPhoneCmdParamCallStateData callStateData;
-// Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 callStateData.SetCallState( EPEStateHeld );
 heldResponse = iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 ringingResponse != EPhoneViewResponseSuccess ||
 alertingResponse != EPhoneViewResponseSuccess )
 {
 // Some or all call id fetches were unsuccesfull.
 // Terminate all connections and return to idle state.
 // TBD: Kill all bubbles here
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageTerminateAllConnections );
+CPhoneGsmInCall::HandleIdleL( aCallId );
-CPhoneGsmInCall::HandleIdleL( aCallId );
 return;
 }
 // Find out which call was terminated
 TTerminatedCall terminatedCall = ENull;
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndCallSetupAndWaiting::HandleConnectingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::HandleConnectingL() ");
 // Remove the number entry if it isn't DTMF dialer
-if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
+if ( !IsNumberEntryVisibleL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 }
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
-// Re-enable global notes
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
 BeginUiUpdateLC();
-// Update bubble content
 UpdateRemoteInfoDataL( aCallId );
-// Update bubble type
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnecting );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
+iViewCommandHandle->ExecuteCommandL(
-&callHeaderParam );
+EPhoneViewUpdateBubble,
+aCallId,
-EndUiUpdate();
+&callHeaderParam );
+EndUiUpdate();
-// Set call waiting cba
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-// Stop key Capture when the phone is connecting
-CaptureKeysDuringCallNotificationL( EFalse );
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndCallSetupAndWaiting::HandleConnectedL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndCallSetupAndWaiting::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleAndCallSetupAndWaiting::HandleConnectedL()");
-// Keep Phone in the foreground
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
-// Show bubble
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnected );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 &callHeaderParam );
-// Capturing keys and number entry must be removed because some
-// networks jump over connecting state directly to connected state.
-CaptureKeysDuringCallNotificationL( EFalse );
 // Remove the number entry if it isn't DTMF dialer
-if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
+if ( !IsNumberEntryVisibleL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 }
-if ( aCallId != iWaitingCallId )
+if ( aCallId != iWaitingCallId ) // Alerting call is connected
 {
-// Alerting call is connected
 StateChangeToTwoSinglesAndWaitingL( aCallId );
 }
 else
 {
 // Waiting call is connected while alerting call is disconnecting
 // (manual control sequence '1' + Send).
 StateChangeToTwoSinglesL( aCallId );
 }
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndCallSetupAndWaiting:StateChangeToCallSetupAndWaitingL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndCallSetupAndWaiting::StateChangeToCallSetupAndWaitingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::StateChangeToCallSetupAndWaitingL() ");
-// Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-// Reset Hold flag to view
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 BeginUiUpdateLC();
 SetTouchPaneButtons( EPhoneCallSetupButtons );
 SetToolbarButtonLoudspeakerEnabled();
 EndUiUpdate();
-// Go to Call Setup And Waiting state
-// No need to update cbas
 iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndCallSetupAndWaiting:StateChangeToSingleAndWaitingL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndCallSetupAndWaiting::StateChangeToSingleAndWaitingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::StateChangeToSingleAndWaitingL() ");
-// Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-CheckIfRestoreNEContentAfterDtmfDialer();
 if ( CPhoneState::IsNumberEntryUsedL() )
 {
-// Show number entry
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetNumberEntryVisible, &booleanParam );
 }
-// Set Hold flag to view
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 BeginUiUpdateLC();
 SetTouchPaneButtons( EPhoneWaitingCallButtons );
 EndUiUpdate();
-// Go to Single And Waiting state
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndCallSetupAndWaiting:StateChangeToSingleAndAlertingL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndCallSetupAndWaiting::StateChangeToSingleAndAlertingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::StateChangeToSingleAndAlertingL() ");
-// Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 // Remove the number entry if it isn't DTMF dialer
-if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
+if ( !IsNumberEntryVisibleL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 }
 // Set Hold flag to view EFalse that dtmf menu item not delete
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 BeginUiUpdateLC();
 SetTouchPaneButtons( EPhoneCallSetupButtons );
 EndUiUpdate();
-// Go to Single And Alerting state
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 iStateMachine->ChangeState( EPhoneStateAlertingInSingle );
 }
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL( TInt /*aCallId*/ )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL()");
 BeginUiUpdateLC();
 SetTouchPaneButtons( EPhoneTwoSinglesButtons );
 EndUiUpdate();
-// Go to two singles state
 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
 iStateMachine->ChangeState( EPhoneStateTwoSingles );
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL( TInt /*aCallId*/ )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL()");
 BeginUiUpdateLC();
 SetTouchPaneButtons( EPhoneWaitingCallButtons );
 EndUiUpdate();
-// Go to two singles state and waiting
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );
 }
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndCallSetupAndWaiting::UpdateInCallCbaL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleAndCallSetupAndWaiting::UpdateInCallCbaL() ");
 if ( iAlerting )
 {
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 }
 else
 {
 UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
 }
 }
 // End of File

changeset 65	2a5d4ab426d3
parent 50	377c906a8701
child 74	d1c62c765e48