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

equal deleted inserted replaced

-:6aaf0276100e
+:c76a0b1755b9
 // -----------------------------------------------------------
 //
 void CPhoneEmergency::HandleIdleL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleIdleL() ");
 // Re-enable global notes, this enables secui (if needed) to come on top
 // if call creation was rejected by user
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 captureParam.SetKeyCode( EKeyNo );
 iViewCommandHandle->ExecuteCommand(
 EPhoneViewStopCapturingKey, &captureParam );
 const TBool isSimStateNotPresentWithSecurityMode = IsSimStateNotPresentWithSecurityModeEnabled();
 // Sim IS not ok when making emergency call from Pin query, no note
 if ( (!IsSimOk() && !iStartupInterrupted) || isSimStateNotPresentWithSecurityMode )
 {
 StartShowSecurityNoteL();
 }
 // Continue displaying current app but set up the
 // idle screen in the background
 SetupIdleScreenInBackgroundL();
 }
-else if ( iOnScreenDialer && IsNumberEntryContentStored() )
+else if ( IsNumberEntryContentStored() || IsNumberEntryUsedL() )
 {
 SetNumberEntryVisibilityL(ETrue);
 }
-else if ( IsNumberEntryUsedL() )
-{
-// Show the number entry if it exists
-SetNumberEntryVisibilityL(ETrue);
-}
 else
 {
-// Display idle screen
 DisplayIdleScreenL();
 }
-// Display call termination note, if necessary
 if ( iConnected )
 {
 DisplayCallTerminationNoteL();
 }
 }
 if ( ( !IsNumberEntryUsedL() ) &&
 !( IsSimStateNotPresentWithSecurityModeEnabled() &&
 !FeatureManager::FeatureSupported( KFeatureIdFfSimlessOfflineSupport ) ) )
 {
 UpdateCbaL( EPhoneEmptyCBA );
 TPhoneCmdParamBoolean securityMode;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &securityMode );
 if ( !securityMode.Boolean() )
 {
-// Setup idle as next active app.
 SetupIdleScreenInBackgroundL();
 }
 }
 iStateMachine->ChangeState( EPhoneStateIdle );
 }
 }
 else
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveAllCallHeaders );
 }
 }
 // -----------------------------------------------------------
 // CPhoneEmergency::HandleDialingL
 // -----------------------------------------------------------
 //
 // there could be a race condition between returning to Normal
 // mode (receiving a network registration status message from PE)
 // and receiving an EPEMessageDialling message. This can occur
 // because PE messages are processed asynchronously.
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleDialingL() ");
 if ( aCallId == KPEEmergencyCallId )
 {
 iDeviceLockOn = IsAutoLockOn();
-// Disable global notes when the phone is dialling
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
 TPhoneCmdParamKeyCapture captureParam;
 captureParam.SetKeyCode( EKeyNo );
 iViewCommandHandle->ExecuteCommand( EPhoneViewStartCapturingKey, &captureParam );
-// Capture keys when the phone is dialling
-CaptureKeysDuringCallNotificationL( ETrue );
 // Indicate that the Phone needs to be sent to the background if
 // an application other than the top application is in the foreground
 TPhoneCmdParamBoolean booleanParam;
 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 );
-// Hide the number entry if it is visible
 if ( IsNumberEntryUsedL() )
 {
 // Remove number entry
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 }
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery );
 BeginUiUpdateLC();
 TPhoneCmdParamEmergencyCallHeaderData emergencyHeaderParam;
-// Set call header
 TBuf<KPhoneCallHeaderLabelMaxLength> headerText( KNullDesC );
 StringLoader::Load(
 headerText,
 CPhoneMainResourceResolver::Instance()->ResolveResourceID(
 EPhoneEmergencyCallHeader ),
 aCallId,
 &headerParam );
 SetTouchPaneButtons( EPhoneEmergencyCallButtons );
 SetBackButtonActive(EFalse);
+EndUiUpdate();
-EndUiUpdate();
-// ShowNoteL( EPhoneEmergencyConnectWaitNote );
 UpdateSetupCbaL();
 }
 }
 // -----------------------------------------------------------
 // CPhoneEmergency::HandleConnectingL
 // -----------------------------------------------------------
 //
 void CPhoneEmergency::HandleConnectingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleConnectingL() ");
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
-// Re-enable global notes
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
 &globalNotifierParam );
-if(  TouchCallHandlingSupported() )
-{
-if ( !IsSimStateNotPresentWithSecurityModeEnabled() )
-{
-// Stop capturing keys
-CaptureKeysDuringCallNotificationL( EFalse );
-}
-}
-else if ( !iDeviceLockOn && SimState() == EPESimUsable )
-{
-// Stop capturing keys
-CaptureKeysDuringCallNotificationL( EFalse );
-}
-// Keep Phone in the foreground
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
-// Remove emergency connecting note
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
 TPhoneCmdParamCallHeaderData headerParam;
 headerParam.SetCallState( EPEStateConnecting );
 // Notify the view
 EPhoneViewUpdateBubble,
 aCallId,
 &headerParam );
 SetToolbarButtonLoudspeakerEnabled();
 UpdateInCallCbaL();
 }
 // -----------------------------------------------------------
 // CPhoneEmergency::HandleConnectedL
 // -----------------------------------------------------------
 //
 void CPhoneEmergency::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleConnectedL() ");
 BeginUiUpdateLC();
 TPhoneCmdParamCallHeaderData emergencyHeaderParam;
 emergencyHeaderParam.SetCallState( EPEStateConnected );
-// Notify the view
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewUpdateBubble,
 aCallId,
 &emergencyHeaderParam );
 SetBackButtonActive(ETrue);
 EndUiUpdate();
 UpdateInCallCbaL();
 }
 // -----------------------------------------------------------
 // -----------------------------------------------------------
 //
 void CPhoneEmergency::UpdateInCallCbaL()
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::UpdateInCallCbaL() ");
-TInt resourceId = EPhoneCallHandlingEmergencyCBA;
+iCbaManager->SetCbaL( EPhoneCallHandlingEmergencyCBA );
-iCbaManager->SetCbaL( resourceId );
 }
 // --------------------------------------------------------------
 // CPhoneEmergency::HandleKeyMessageL
 // --------------------------------------------------------------
 void CPhoneEmergency::HandleKeyMessageL(
 TPhoneKeyEventMessages aMessage,
 TKeyCode aCode )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleKeyMessageL()");
 switch ( aCode )
 {
-// end-key
+case EKeyNo: // end-key
-case EKeyNo:
-// handle end key
 DisconnectEmergencyCallL();
 break;
-// send-key
+case EKeyYes: // send-key
-case EKeyYes:
+if( IsNumberEntryVisibleL() )
-if( iOnScreenDialer && IsNumberEntryVisibleL() )
 {
 TPhoneCmdParamInteger numberEntryCountParam;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewGetNumberEntryCount,
 &numberEntryCountParam );
 TInt neLength( numberEntryCountParam.Integer() );
 if ( neLength )
 {
-// Show not allowed note
 SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
 }
 else
 {
-// Logs to open
 CallFromNumberEntryL();
 }
 }
 else
 {
-// Show not allowed note
 SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
 }
 break;
 default:
 {
-if ( TouchCallHandlingSupported() )
+CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
-{
-CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
-}
-else if ( !iDeviceLockOn && SimState() == EPESimUsable )
-{
-// do base operation
-CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
-}
 break;
 }
 }
 }
 //
 TBool CPhoneEmergency::HandleCommandL( TInt aCommand )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleCommandL()");
 TBool commandStatus = ETrue;
 switch( aCommand )
 {
 case EPhoneInCallCmdDtmfManualQuery:
 if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
 {
 case EPhoneDtmfDialerExit:      // fall through
 case EPhoneDtmfDialerCancel:
 {
 if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
 {
 UpdateSetupCbaL();
 }
 else
 {
 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
 default:
 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
 break;
 }
 return commandStatus;
 }
 // -----------------------------------------------------------
 // CPhoneEmergency::DisconnectEmergencyCallL
 //
 void CPhoneEmergency::DisconnectEmergencyCallL()
 {
 __LOGMETHODSTARTEND(EPhoneUIStates,
 "CPhoneEmergency::DisconnectEmergencyCallL()");
-// Release the call
+iStateMachine->SetCallId( KEmergencyCallId );
-iStateMachine->SetCallId(
-KEmergencyCallId );
 iStateMachine->SendPhoneEngineMessage(
 CPEPhoneModelIF::EPEMessageRelease );
 }
 // -----------------------------------------------------------
 void CPhoneEmergency::HandleKeyEventL(
 const TKeyEvent& aKeyEvent,
 TEventCode aEventCode )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleKeyEventL( ) ");
+CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
-if ( TouchCallHandlingSupported() )
-{
-CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
-}
-else
-{
-if ( iDeviceLockOn && CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
-{
-// Send the key event to the phone engine
-SendKeyEventL( aKeyEvent, aEventCode );
-}
-else
-{
-// Handle numeric keys when key events are received in idle state
-CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
-}
-}
 }
 // -----------------------------------------------------------
 // CPhoneEmergency::SendKeyEventL
 // -----------------------------------------------------------
 TEventCode aEventCode )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::SendKeyEventL( ) ");
 switch( aEventCode )
 {
-// EEventKey
 case EEventKey:
 {
 // Convert key code to western.
 TBuf<1> buffer; // one character
 buffer.Append( aKeyEvent.iCode );
 "CPhoneEmergency::SendKeyEventL(%S)",
 &buffer );
 TLex code( buffer );
 // Save the key code
 iStateMachine->PhoneEngineInfo()->SetKeyCode( code.Peek() );
-// Plays a DTMF tone if active call
 iStateMachine->SendPhoneEngineMessage(
 CPEPhoneModelIF::EPEMessagePlayDTMF );
 }
 break;
-// EEventKeyUp
 case EEventKeyUp:
 // Send a key up event for the last key code sent to
 // the phone engine
 iStateMachine->SendPhoneEngineMessage(
 CPEPhoneModelIF::EPEMessageEndDTMF );
 // -----------------------------------------------------------------------------
 //
 void CPhoneEmergency::HandleAudioOutputChangedL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneEmergency::HandleAudioOutputChangedL( ) ");
-// Audio Output
-TPhoneCmdParamAudioOutput outputParam;
-// Output
-const TPEAudioOutput audioOutput =
-iStateMachine->PhoneEngineInfo()->AudioOutput();
 UpdateSetupCbaL();
 SetTouchPaneButtons(0);
+TPhoneCmdParamAudioOutput outputParam;
-// view update
+outputParam.SetAudioOutput(
-outputParam.SetAudioOutput( audioOutput );
+iStateMachine->PhoneEngineInfo()->AudioOutput() );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewActivateAudioPathUIChanges,
+iViewCommandHandle->ExecuteCommandL(
-&outputParam );
+EPhoneViewActivateAudioPathUIChanges,
+&outputParam );
 }
 // -----------------------------------------------------------------------------
 // CPhoneEmergency::SetStartupInterrupted
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------
 //
 void CPhoneEmergency::UpdateSetupCbaL()
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::UpdateSetupCbaL() ");
-TInt resourceId = EPhoneCallHandlingEmergencyCBA;
+iCbaManager->SetCbaL( EPhoneCallHandlingEmergencyCBA );
-iCbaManager->SetCbaL( resourceId );
+}
-}
 // -----------------------------------------------------------------------------
 // CPhoneEmergency::HandleRemConCommandL
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CPhoneEmergency::HandleRemConCommandL(
 TRemConCoreApiOperationId aOperationId,
 TRemConCoreApiButtonAction aButtonAct )
 {
+__LOGMETHODSTARTEND(EPhoneControl, "CPhoneEmergency::MrccatoCommand() ");
 TBool handled = EFalse;
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneEmergency::MrccatoCommand() ");
 switch ( aOperationId )
 {
 case ERemConCoreApiMute:
 __PHONELOG( EBasic, EPhoneControl, "CPhoneEmergency::MrccatoCommand emerg. call no muting" );
 // Not Allowed
 break;
 }
 return handled;
 }
-// --------------------------------------------------------------
-// CPhoneEmergency::TouchCallHandlingSupported
-// --------------------------------------------------------------
-//
-TBool CPhoneEmergency::TouchCallHandlingSupported () const
-{
-if ( FeatureManager::FeatureSupported ( KFeatureIdTouchCallHandling ) )
-{
-return ETrue;
-}
-else
-{
-return EFalse;
-}
-}
-// --------------------------------------------------------------
-// CPhoneEmergency::UseEmergencyNoIhfCBA
-// --------------------------------------------------------------
-//
-TBool CPhoneEmergency::UseEmergencyNoIhfCBA( const TPEAudioOutput& aAudioOutput ) const
-{
-if ( !( TouchCallHandlingSupported() )
-&& ( ( aAudioOutput == EPEWiredAudioAccessory ) || ( IsSwivelClosed() ) ) )
-{
-return ETrue;
-}
-else
-{
-return EFalse;
-}
-}
-// --------------------------------------------------------------
-// CPhoneEmergency::UseHandsetEmergencyCBA
-// --------------------------------------------------------------
-//
-TBool CPhoneEmergency::UseHandsetEmergencyCBA( const TPEAudioOutput& aAudioOutput ) const
-{
-if ( !( TouchCallHandlingSupported() )
-&& ( ( aAudioOutput == EPELoudspeaker ) || ( aAudioOutput == EPEBTAudioAccessory ) ) )
-{
-return ETrue;
-}
-else
-{
-return EFalse;
-}
-}
 // End of File

changeset 72	c76a0b1755b9
parent 56	5bcb308bd24d
child 74	d1c62c765e48