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

equal deleted inserted replaced

-:1eef62f5c541
+:2a5d4ab426d3
 //
 void CPhoneConferenceAndWaiting::ConstructL()
 {
 CPhoneConference::ConstructL();
-// Fetch ringing call's id from view
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateRinging );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 iRingingCallId = callStateData.CallId();
 case MEngineMonitor::EPEMessageConnectedConference:
 {
 TPhoneCmdParamInteger callIdParam;
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewGetExpandedBubbleCallId, &callIdParam );
 CPhoneConference::HandlePhoneEngineMessageL( aMessage,
 aCallId );
 if ( KConferenceCallId == callIdParam.Integer() )
 {
 iViewCommandHandle->ExecuteCommand(EPhoneSetConferenceExpanded);
 }
 }
 TKeyCode aCode )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleKeyMessageL()");
 switch ( aCode )
 {
-// send-key
+case EKeyYes:  // send-key
-case EKeyYes:
 if( IsNumberEntryVisibleL() )
 {
 CallFromNumberEntryL();
 }
 else
 {
-// Number entry is below incoming call bubble so
-// answer the call
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageAnswer );
 }
 break;
 default:
-// do base operation
 CPhoneConference::HandleKeyMessageL( aMessage, aCode );
 break;
 }
 }
 //
 void CPhoneConferenceAndWaiting::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConnectedL()");
 TPhoneCmdParamCallStateData callStateData;
 if ( iRingingCallId == KErrNotFound )
 {
-// Fetch ringing call's id from view
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateRinging );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 iRingingCallId = callStateData.CallId();
 }
 if ( iRingingCallId == aCallId )
 {
 // not a member of conference call
 MakeStateTransitionToConferenceAndSingleL( aCallId );
 }
 else
 {
 // member of conference call which is on hold
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
 if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
 && iStateMachine->PhoneStorage()->IsScreenLocked() )
 {
 EnableCallUIL();
 }
-// Reset blocked keys list
 iStateMachine->PhoneStorage()->ResetBlockedKeysList();
+BeginUiUpdateLC();
-BeginUiUpdateLC();
 UpdateRemoteInfoDataL ( aCallId );
-// Show bubble
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnected );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 &callHeaderParam );
 if ( IsNumberEntryUsedL() )
 {
 if ( NeedToSendToBackgroundL() )
 {
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 }
 else
 {
-// Show the number entry if it exists.
 SetNumberEntryVisibilityL(ETrue);
 }
 }
 else
 {
 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
-// If numberentry is not open just check NeedToSendToBackgroundL and
-// sendbackround if needed.
 }
 SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
 EndUiUpdate();
+iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
-// CBA updates in above if-else conditions
-iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::HandleIdleL
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndWaiting::HandleIdleL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleIdleL()");
 if ( iRingingCallId == KErrNotFound )
 {
-// Fetch ringing call's id from view
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateRinging );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 iRingingCallId = callStateData.CallId();
 }
 if( iRingingCallId == aCallId )
 {
 BeginUiUpdateLC();
-// Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 if ( IsNumberEntryUsedL() )
 {
 if ( NeedToSendToBackgroundL() )
 {
-// Return phone to the background if send to background is needed.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 }
 else
 {
-// Show the number entry if it exists.
 SetNumberEntryVisibilityL(ETrue);
 }
 }
 else
 {
 if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
 && iStateMachine->PhoneStorage()->IsScreenLocked() )
 {
 EnableCallUIL();
 }
-// Reset blocked keys list
 iStateMachine->PhoneStorage()->ResetBlockedKeysList();
+SetTouchPaneButtons( EPhoneConferenceButtons );
-SetTouchPaneButtons( EPhoneConferenceButtons );
 EndUiUpdate();
+iStateMachine->ChangeState( EPhoneStateConference );
-// Go to conference state
-// CBA updates in above if-else conditions
-iStateMachine->ChangeState( EPhoneStateConference );
 }
 else
 {
 // Idle message came for conference member
 CPhoneConference::HandleIdleL( aCallId );
 TPhoneCmdParamBoolean conferenceBubbleExists;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsConference,
+iViewCommandHandle->ExecuteCommandL(
-&conferenceBubbleExists );
+EPhoneViewGetIsConference,
+&conferenceBubbleExists );
 if( !conferenceBubbleExists.Boolean() )
 {
 HandleConferenceIdleL();
 }
 }
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::HandleConferenceIdleL
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndWaiting::HandleConferenceIdleL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConferenceIdleL()");
 BeginUiUpdateLC();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
 TPhoneCmdParamInteger activeCallCount;
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewGetCountOfActiveCalls, &activeCallCount );
 switch( activeCallCount.Integer() )
 {
-case ENoActiveCalls:
+case ENoActiveCalls: // Go to incoming state
-// Go to incoming state
+{
-{
-// Display ringing bubble
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateRinging );
 // Set Hold flag to view
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-// Bring up callhandling view
 BringIncomingToForegroundL();
 SetCallHeaderTextsForCallComingInL( iRingingCallId, EFalse, &callHeaderParam );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
 iRingingCallId ,&callHeaderParam );
 iCbaManager->UpdateIncomingCbaL( iRingingCallId );
-// Hide number entry if visible
 if ( IsNumberEntryVisibleL() )
 {
 SetNumberEntryVisibilityL(EFalse);
 }
-// Check if HW Keys or Call UI should be disabled
 CheckDisableHWKeysAndCallUIL();
 SetTouchPaneButtons( EPhoneIncomingCallButtons );
 SetRingingTonePlaybackL( iRingingCallId );
 SetBackButtonActive(EFalse);
 iStateMachine->ChangeState( EPhoneStateIncoming );
-break;
+}
-}
+break;
 case EOneActiveCall:
 if ( IsNumberEntryUsedL() )
 {
-// Show the number entry if it exists
 SetNumberEntryVisibilityL(ETrue);
 }
-// Go to waiting in single state
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-// Check if HW Keys or Call UI should be disabled
 CheckDisableHWKeysAndCallUIL();
+SetTouchPaneButtons( EPhoneWaitingCallButtons );
-SetTouchPaneButtons( EPhoneWaitingCallButtons );
 iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
 break;
 case ETwoActiveCalls:
 if ( IsNumberEntryUsedL() )
 {
-// Show the number entry if it exists
 SetNumberEntryVisibilityL(ETrue);
 }
-// Go to two singles and waiting state
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-// Check if HW Keys or Call UI should be disabled
 CheckDisableHWKeysAndCallUIL();
+SetTouchPaneButtons( EPhoneWaitingCallButtons );
-SetTouchPaneButtons( EPhoneWaitingCallButtons );
 iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );
 break;
 default:
 // Too many active calls to handle reliable state change now.
 // Waiting for all conference member idles
 // This case may happen when 'End all calls' because conferenceIdle may
 // come earlier than idle for conference member
 break;
 }
 EndUiUpdate();
 }
 // -----------------------------------------------------------
 //
 void CPhoneConferenceAndWaiting::HandleDiallingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaiting::HandleDiallingL()");
 BeginUiUpdateLC();
-// Hide number entry if it exists
+SetNumberEntryVisibilityL(EFalse);
-SetNumberEntryVisibilityL(EFalse);
-// Display call setup
 DisplayCallSetupL( aCallId );
+SetTouchPaneButtons( EPhoneCallSetupButtons );
-SetTouchPaneButtons( EPhoneCallSetupButtons );
 EndUiUpdate();
-// Update conference and waiting and call setup softkeys
 UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
-// Go to conference and waiting and call setup state
 iStateMachine->ChangeState( EPhoneStateConferenceAndWaitingAndCallSetup );
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::HandleWentOneToOneL
 //
 void CPhoneConferenceAndWaiting::HandleWentOneToOneL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaiting::HandleWentOneToOneL()");
 BeginUiUpdateLC();
-// Update conference bubble
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewPrivateFromConference, aCallId );
 if ( iRingingCallId == KErrNotFound )
 {
-// Fetch ringing call's id from view
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateRinging );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 iRingingCallId = callStateData.CallId();
 }
 TPhoneCmdParamBoolean conferenceBubbleExists;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsConference,
 &conferenceBubbleExists );
 if( conferenceBubbleExists.Boolean() &&
 ( iRingingCallId != KErrNotFound ) )
 {
 SetTouchPaneButtons( EPhoneWaitingCallButtons );
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-// Go to Conference And Single And Waiting state
 iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );
 }
 EndUiUpdate();
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::HandleCommandL
 TBool CPhoneConferenceAndWaiting::HandleCommandL( TInt aCommand )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConferenceAndWaiting::HandleCommandL() ");
 TBool commandStatus = ETrue;
 switch( aCommand )
 {
 case EPhoneCmdUpdateUiControls:
 UpdateUiControlsL();
 break;
 default:
 commandStatus = CPhoneConference::HandleCommandL( aCommand );
 break;
 }
 return commandStatus;
 }
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::UpdateUiControlsL

changeset 65	2a5d4ab426d3
parent 50	377c906a8701
child 74	d1c62c765e48