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

equal deleted inserted replaced

-:1eef62f5c541
+:2a5d4ab426d3
 {
 }
 // -----------------------------------------------------------
 // CPhoneSingleCall::~CPhoneSingleCall()
-// Destructor
-// (other items were commented in a header).
 // -----------------------------------------------------------
 //
 EXPORT_C CPhoneSingleCall::~CPhoneSingleCall()
 {
 }
 // -----------------------------------------------------------
 // CPhoneSingleCall::ConstructL()
-// Constructor
-// (other items were commented in a header).
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneSingleCall::ConstructL()
 {
 CPhoneGsmInCall::ConstructL();
-// Re-enable global notes
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
-TPhoneCmdParamBoolean holdFlag;
-holdFlag.SetBoolean( EFalse );
-// Fetch active call's id from view
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateConnected );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
+TPhoneCmdParamBoolean holdFlag;
+holdFlag.SetBoolean( EFalse );
+// No connected call,
 if( callStateData.CallId() == KErrNotFound )
 {
 holdFlag.SetBoolean( ETrue );
-// No connected call, find the hold call
+//find the held call.
 callStateData.SetCallState( EPEStateHeld );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
+// No held call.
 if ( callStateData.CallId() == KErrNotFound )
 {
-// No hold call, find the disconnected call
+// find the disconnected call.
 callStateData.SetCallState( EPEStateDisconnecting );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 }
 }
 iCallId = callStateData.CallId();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 }
 TKeyCode aCode )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleCall::HandleKeyMessageL()");
 switch ( aCode )
 {
-// send-key
+case EKeyYes: // send-key
-case EKeyYes:
 if( IsNumberEntryUsedL() )
 {
 if ( IsVideoCallActiveL() )
 {
 HBufC *phoneNumber = HBufC::NewLC( KPhoneNumberEntryBufferSize );
 &stringParam );
 iStateMachine->PhoneEngineInfo()->SetPhoneNumber( ptr ) ;
 if (  iStateMachine->PhoneEngineInfo()->PhoneNumberIsServiceCode() ||
 phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength )
 {
-// Send a manual control sequence by providing number
-// information with dial command
 CallFromNumberEntryL();
 }
 else
 {
 iStateMachine->SendPhoneEngineMessage(
 }
 CleanupStack::PopAndDestroy( phoneNumber );
 }
 else
 {
-// Provide number information with dial command
 CallFromNumberEntryL();
 }
 }
 else
 {
 ToggleHoldL();
 }
 break;
 default:
-// do base operation
 CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
 break;
 }
 }
 //
 EXPORT_C TBool CPhoneSingleCall::HandleCommandL( TInt aCommand )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleCall::HandleCommandL()");
 TBool commandStatus = ETrue;
 switch( aCommand )
 {
 /* Flow through */
 case EPhoneInCallCmdHold:
 case EPhoneInCallCmdUnhold:
 ToggleHoldL();
 break;
-case EPhoneInCallCmdNewCall:
-break;
-case EPhoneInCallCmdNewCallCall:
-break;
 case EPhoneInCallCmdSwitchToVideo:
 SwitchToVideoL();
-break;
-case EPhoneInCallCmdSwitchToVoice:
-SwitchToVoiceL();
 break;
 case EPhoneCmdYesSwitchToVideo:
 // Set current call id
 iStateMachine->SetCallId( iCallId );
 iStateMachine->SendPhoneEngineMessage(
 CPEPhoneModelIF::EPEMessageSwitchToVideoOrVoice );
 break;
 /* Flow through */
+case EPhoneInCallCmdNewCall:
+case EPhoneInCallCmdNewCallCall:
+case EPhoneInCallCmdSwitchToVoice:
 case EPhoneCmdNoSwitchToVideo:
 case EPhoneCmdNoSwitchToVoice:
 break;
 case EPhoneCmdYesSwitchToVoice:
-// Set current call id
+// Set current call id.
 iStateMachine->SetCallId( iCallId );
 if( IsVideoCall( iCallId ) )
 {
 // Video call can be released only after we get response to VT Shutdown Command
-CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( KMediatorVideoTelephonyDomain,
+CPhoneMediatorFactory::Instance()->Sender()->IssueCommand(
-KCatPhoneToVideotelCommands,
+KMediatorVideoTelephonyDomain,
-EVtCmdReleaseDataport,
+KCatPhoneToVideotelCommands,
-TVersion( KPhoneToVideotelCmdVersionMajor,
+EVtCmdReleaseDataport,
-KPhoneToVideotelCmdVersionMinor,
+TVersion( KPhoneToVideotelCmdVersionMajor,
-KPhoneToVideotelCmdVersionBuild ),
+KPhoneToVideotelCmdVersionMinor,
-KNullDesC8,
+KPhoneToVideotelCmdVersionBuild ),
-CPhoneSwitchToVideoOrVoiceCommand::NewL( *iStateMachine ) );
+KNullDesC8,
-}
+CPhoneSwitchToVideoOrVoiceCommand::NewL( *iStateMachine ) );
-else
+}
-{
+else
-iStateMachine->SendPhoneEngineMessage(
+{
-CPEPhoneModelIF::EPEMessageSwitchToVideoOrVoice );
+iStateMachine->SendPhoneEngineMessage(
-}
+CPEPhoneModelIF::EPEMessageSwitchToVideoOrVoice );
+}
 break;
 case EPhoneVideoSharing:
 case EPhoneVideoSharingOpt2:
 case EPhoneVideoSharingOpt3:
 {
 TPhoneCmdParamInteger command;
 command.SetInteger( aCommand );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSendAiwCommand,
+iViewCommandHandle->ExecuteCommandL(
-&command );
+EPhoneViewSendAiwCommand,
+&command );
 }
 break;
 default:
 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
 break;
 }
 return commandStatus;
 }
 // -----------------------------------------------------------
 // CPhoneSingleCall::CallId
 // -----------------------------------------------------------
 //
 EXPORT_C TInt CPhoneSingleCall::CallId() const
 {
 return iCallId;
-}
-// -----------------------------------------------------------
-// CPhoneSingleCall::OpenVideoCallMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneSingleCall::OpenVideoCallMenuBarL()
-{
-__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleCall::OpenVideoCallMenuBarL()");
 }
 // -----------------------------------------------------------
 // CPhoneSingleCall::HandleHeldL
 // -----------------------------------------------------------
 CCoeEnv::Static() );
 callHeaderParam.SetLabelText( labelText );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewUpdateBubble, aCallId, &callHeaderParam );
-// Set Hold flag to view
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-if ( !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
-{
-HandleHoldNoteL( aCallId , ETrue );
-}
 UpdateInCallCbaL();
 SetTouchPaneButtons( EPhoneIncallHeldButtons );
 }
 //
 void CPhoneSingleCall::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleCall::HandleConnectedL()");
-// Show bubble
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnected );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 &callHeaderParam );
 TPhoneCmdParamBoolean holdFlag;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetHoldFlag, &holdFlag );
 if ( holdFlag.Boolean() )
 {
-// Update hold flag to view
 holdFlag.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-if ( !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
-{
-HandleHoldNoteL( aCallId , EFalse );
-}
 }
 UpdateInCallCbaL();
 SetTouchPaneButtons( EPhoneIncallButtons );
 }
 //
 void CPhoneSingleCall::HandleIncomingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleCall::HandleIncomingL()");
 BeginUiUpdateLC();
+// Get allow waiting call header param value.
 TPhoneCmdParamBoolean dialerParam;
 dialerParam.SetBoolean( ETrue );
+AllowShowingOfWaitingCallHeaderL( dialerParam );
-// Get allow waiting call header param value.
-AllowShowingOfWaitingCallHeaderL( dialerParam );
-// Display incoming call
 DisplayIncomingCallL( aCallId, dialerParam );
-// Show incoming call buttons
 SetTouchPaneButtons( EPhoneWaitingCallButtons );
 if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
 && !CPhoneCenRepProxy::Instance()->
 IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming )
 if ( iSwitchToVideoQuery )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery );
 }
-// Go to incoming state
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
 }
 // -----------------------------------------------------------
 TInt aCallId,
 const TPhoneCmdParamBoolean aCommandParam )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleCall::DisplayIncomingCallL()");
 // Cannot delete active note, e.g. New call query,
 // but show waiting note with or without caller name
-if ( IsAnyQueryActiveL() ||
+if ( IsAnyQueryActiveL() || !aCommandParam.Boolean() )
-( !aCommandParam.Boolean() && iOnScreenDialer ) )
+{
-{
+CallWaitingNoteL( aCallId );
-CallWaitingNoteL( aCallId );
 }
 else
 {
-// Remove any phone dialogs if they are displayed
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
 }
 // Indicate that the Phone needs to be sent to the background if
 // an application other than the top application is in the foreground
 booleanParam.SetBoolean( !TopAppIsDisplayedL() );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewSetNeedToSendToBackgroundStatus,
 &booleanParam );
-// Bring Phone app in the foreground
 TPhoneCmdParamInteger uidParam;
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
 &uidParam );
-// Set Phone as the top application
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
 &uidParam );
 DisplayHeaderForCallComingInL( aCallId, ETrue ); //waiting call
 }
 // -----------------------------------------------------------
 // CPhoneSingleCall::HandleDiallingL
 // -----------------------------------------------------------
 void CPhoneSingleCall::HandleDiallingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleCall::HandleDiallingL()");
 BeginUiUpdateLC();
 SetNumberEntryVisibilityL(EFalse);
-// Display call setup
 DisplayCallSetupL( aCallId );
-// Show incoming call buttons
 SetTouchPaneButtons( EPhoneCallSetupAndSingleButtons );
 EndUiUpdate();
-// Go to call setup state
 UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
 iStateMachine->ChangeState( EPhoneStateCallSetupInSingle );
 }
 // -----------------------------------------------------------
 //
 void CPhoneSingleCall::DisplayCallSetupL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleCall::DisplayCallSetupL()");
-// Remove dialogs if necessary
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
-// Capture keys when the phone is dialling
-CaptureKeysDuringCallNotificationL( ETrue );
-// Force telephony to the foreground
 TPhoneCmdParamInteger uidParam;
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
 &uidParam );
-// Display call setup header
 DisplayHeaderForOutgoingCallL( aCallId );
 }
 // -----------------------------------------------------------
 // CPhoneSingleCall::SwitchToVideoL
 //
 void CPhoneSingleCall::SwitchToVideoL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleCall::SwitchToVideoL()");
 if( FeatureManager::FeatureSupported( KFeatureIdCsVideoTelephony ) )
 {
 TInt networkMode( CPhonePubSubProxy::Instance()->Value( KPSUidNetworkInfo,
 KNWTelephonyNetworkMode ) );
 TBool restoreOngoing( CPhonePubSubProxy::Instance()->Value( KUidSystemCategory,
 conn::KUidBackupRestoreKey ));
 if ( networkMode != ENWNetworkModeWcdma )
 {
 // We aren't in 3G, video call not possible
 SendGlobalInfoNoteL( EPhoneInformationNoNetworkSupportForVideoCallNote );
 }
 else if ( restoreOngoing & ( conn::EBURRestoreFull | conn::EBURRestorePartial ))
 {
-// MC restore ongoing
 SendGlobalInfoNoteL( EPhoneInformationVideoCallNotAllowedDuringRestoreNote );
 }
 else
 {
 iSwitchToVideoQuery = ETrue;
-//ShowQueryL( EPhoneSwitchToVideoQuery );
 iSwitchToVideoQuery = EFalse;
 }
 }
 }
-// -----------------------------------------------------------
-// CPhoneSingleCall::SwitchToVoiceL
-// -----------------------------------------------------------
-//
-void CPhoneSingleCall::SwitchToVoiceL()
-{
-__LOGMETHODSTARTEND( EPhoneUIStates,
-"CPhoneSingleCall::SwitchToVoiceL()");
-//ShowQueryL( EPhoneSwitchToVoiceQuery );
-}
 // End of File

changeset 65	2a5d4ab426d3
parent 50	377c906a8701
child 74	d1c62c765e48