FCL/sf/app/phone: comparison phoneapp/phoneuivoipextension/src/cphonevcchandler.cpp

equal deleted inserted replaced

-:40a3f856b14d
+:41a7f70b3818
 * Description: Implementation of CPhoneVccHandler class.
 *
 */
 // INCLUDES
-#include <phoneui.rsg>
+#include "phoneresourceids.h"
-#include <avkon.rsg>
-#include <phoneuivoip.rsg>
 #include <StringLoader.h>
 #include <avkon.rsg>
 #include <mpeengineinfo.h>
 #include <eikmenup.h>
 #include <vccuipsproperty.h>
 //
 CPhoneVccHandler::CPhoneVccHandler(
 MPhoneStateMachine& aStateMachine,
 MPhoneViewCommandHandle& aViewCommandHandle ) :
 iStateMachine( aStateMachine ),
-iViewCommandHandle( aViewCommandHandle ), iVccHoReady( ETrue ),
+iViewCommandHandle( aViewCommandHandle ), iVccHoReady( ETrue )
-iHOFailure ( EFalse )
 {
 }
 // -----------------------------------------------------------
 // CPhoneVccHandler::~CPhoneStateIdleVoIP()
 // -----------------------------------------------------------
 //
 CPhoneVccHandler::~CPhoneVccHandler()
 {
 delete iPropListener;
-delete iPropListenerReq;
 TRAPD( err, CancelHandoverNoteTimerL() );
 if ( err != KErrNone )
 {
 __PHONELOG( EBasic, PhoneUIVoIPExtension,
 "CPhoneVccHandler::~CPhoneVccHandler, leave" );
 void CPhoneVccHandler::ConstructL()
 {
 iPropListener = CVccUiPsPropertyListener::NewL( KVccPropKeyHoStatus );
 iPropListener->AddObserverL( *this );
 iPropListener->Start();
-iPropListenerReq = CVccUiPsPropertyListener::NewL( KVccPropKeyHoRequest );
-iPropListenerReq->AddObserverL( *this );
-iPropListenerReq->Start();
 }
 // -----------------------------------------------------------
 // CPhoneVccHandler::NewL()
 // Constructor
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneVccHandler::RemoveHandoverNoteL()");
 if ( iVccHoReady && !iHandoverNoteTimer )
 {
 iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveGlobalNote );
-if ( iHOFailure )
-{
-iHOFailure = EFalse;
-CPhoneState* phoneState =
-static_cast< CPhoneState* >( iStateMachine.State() );
-phoneState->SendGlobalInfoNoteL( EPhoneVoIPHandoverFail );
-}
 }
 }
 // -----------------------------------------------------------
 // CPhoneVccHandler::HandoverInProgressNoteL
 // -----------------------------------------------------------
 //
 void CPhoneVccHandler::HandoverInProgressNoteL( TInt aCommand )
 {
-__LOGMETHODSTARTEND( PhoneUIVoIPExtension,
+TPhoneCmdParamGlobalNote globalNoteParam;
-"CPhoneVccHandler::HandoverInProgressNoteL()");
-TPhoneCmdParamGlobalNote globalNoteParam;
 // Check notification tone user setting
 TInt tone = GetHoNotifToneModeL();
-__PHONELOG1( EBasic, EPhoneControl,
+//      if ( tone == 1 )
-"CPhoneVccHandler::HandoverInProgressNoteL - tone: %d", tone );
+//           {
+//           globalNoteParam.SetTone( EAvkonSIDConfirmationTone );
-if ( tone == 1 )
+//           }
-{
+//       else
-globalNoteParam.SetTone( EAvkonSIDDefaultSound );
+//           {
-}
+//           globalNoteParam.SetTone( EAvkonSIDNoSound );
-else
+//           }
-{
-globalNoteParam.SetTone( EAvkonSIDNoSound );
+globalNoteParam.SetType( EPhoneNotificationDialog );
-}
-globalNoteParam.SetType( EAknGlobalWaitNote );
 globalNoteParam.SetSoftkeys( R_AVKON_SOFTKEYS_EMPTY );
 globalNoteParam.SetTextResourceId(
 CPhoneMainResourceResolver::Instance()->
 ResolveResourceID( aCommand ) );
 // CPhoneVccHandler::VccPropertyChangedL
 // Gets called when PS key is changed
 // -----------------------------------------------------------------------------
 //
 void CPhoneVccHandler::VccPropertyChangedL( const TUint aKeyId,
 const TInt aValue )
 {
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneVccHandler::VccPropertyChangedL() ");
 __PHONELOG1( EBasic, EPhoneControl,
 "CPhoneVccHandler::VccPropertyChangedL - key: %d", aValue );
-if( aKeyId == KVccPropKeyHoRequest )
+if( aKeyId == KVccPropKeyHoStatus )
 {
 switch( aValue )
 {
-case  EVccAutomaticStartPsToCsHoRequest:
+case EVccCsToPsHoFailure:
-{
+case EVccPsToCsHoFailure:
-__PHONELOG( EBasic, PhoneUIVoIPExtension,
+{
-"CPhoneVccHandler::VccPropertyChangedL VccPropertyChangedL -- EVccAutomaticStartPsToCsHoRequest" );
+__PHONELOG( EBasic, PhoneUIVoIPExtension,
-// Do not show if already started since the wait note is
-// already visible
-if ( iVccHoReady && !iHandoverNoteTimer )
-{
-iVccHoReady = EFalse;
-HandoverInProgressNoteL( EPhoneVoIPWaitHandoverFromWlan );
-}
-}
-break;
-case EVccAutomaticStartCsToPsHoRequest:
-{
-__PHONELOG( EBasic, PhoneUIVoIPExtension,
-"CPhoneVccHandler::VccPropertyChangedL VccPropertyChangedL -- EVccAutomaticStartCsToPsHoRequest" );
-// Do not show if already started since the wait note is
-// already visible
-if ( iVccHoReady && !iHandoverNoteTimer )
-{
-iVccHoReady = EFalse;
-HandoverInProgressNoteL( EPhoneVoIPWaitHandoverFromGsm );
-}
-}
-break;
-default:
-// none
-break;
-}
-}
-if( aKeyId == KVccPropKeyHoStatus )
-		{
-		switch( aValue )
-			{
-			case EVccCsToPsHoFailure:
-			case EVccPsToCsHoFailure:
-			    {
-			    __PHONELOG( EBasic, PhoneUIVoIPExtension,
 "CPhoneVccHandler::VccPropertyChangedL VccPropertyChangedL -- HO fail" );
 // Remove handover note if handover is in progress
 if( !iVccHoReady )
 {
 iVccHoReady = ETrue;
-iHOFailure = ETrue;
+CPhoneState* phoneState =
-if ( !iHandoverNoteTimer )
+static_cast< CPhoneState* >( iStateMachine.State() );
-{
+CancelHandoverNoteTimerL();
-RemoveHandoverNoteL();
+phoneState->SendGlobalInfoNoteL( EPhoneVoIPHandoverFail );
 }
-}
 }
 break;
 case EVccCsToPsHoSuccessful:
 case EVccPsToCsHoSuccessful:
 {
 __PHONELOG( EBasic, PhoneUIVoIPExtension,
 "CPhoneVccHandler::VccPropertyChangedL VccPropertyChangedL -- HO Success" );
 iVccHoReady = ETrue;
 RemoveHandoverNoteL();
-			    }
+}
-				break;
+break;
 case EVccCsToPsHoStarted:
 {
 __PHONELOG( EBasic, PhoneUIVoIPExtension,
 "CPhoneVccHandler::VccPropertyChangedL VccPropertyChangedL -- CsToPsHoStarted" );
-// Do not show if already started since the wait note is
+// Do not show if manually started since the wait note is
 // already visible
-if ( iVccHoReady && !iHandoverNoteTimer )
+if ( iVccHoReady )
 {
 iVccHoReady = EFalse;
 HandoverInProgressNoteL( EPhoneVoIPWaitHandoverFromGsm );
 }
 }
 break;
 case EVccPsToCsHoStarted:
 {
 __PHONELOG( EBasic, PhoneUIVoIPExtension,
 "CPhoneVccHandler::VccPropertyChangedL VccPropertyChangedL -- PsToCsHoStarted" );
-// Do not show if already started since the wait note is
+// Do not show if manually started since the wait note is
 // already visible
-if ( iVccHoReady && !iHandoverNoteTimer )
+if ( iVccHoReady )
 {
 iVccHoReady = EFalse;
 HandoverInProgressNoteL( EPhoneVoIPWaitHandoverFromWlan);
 }
 }
 "CPhoneVccHandler::VccPropertyChangedL VccPropertyChangedL -- HO IDLE" );
 iVccHoAllowedToGsm = ETrue;
 iVccHoAllowedToWlan = ETrue;
 iNoHoIfMultiCall = EFalse;
 iVccUnavailable = EFalse;
-if( !iVccHoReady )
-{
-iVccHoReady = ETrue;
-if ( !iHandoverNoteTimer )
-{
-RemoveHandoverNoteL();
-}
-}
 break;
 }
 case EVccCsToPsNotAllowed:
 {
 __PHONELOG( EBasic, PhoneUIVoIPExtension,
 iVccHoAllowedToWlan = ETrue;
 iVccUnavailable = EFalse;
 break;
 }
-			default:
+default:
 __PHONELOG( EBasic, PhoneUIVoIPExtension,
 "CPhoneVccHandler::VccPropertyChangedL VccPropertyChangedL -- default" );
-		break;
+break;
-			}
+}
-		}
+}
 }
 // ---------------------------------------------------------------------------
 // Gets HO notification tone setting value
 // ---------------------------------------------------------------------------
 //
 TInt CPhoneVccHandler::GetHoNotifToneModeL()
 {
-__LOGMETHODSTARTEND( PhoneUIVoIPExtension,
-"CPhoneVccHandler::GetHoNotifToneModeL() ");
 // Find out VCC service id
 CSPProperty* property = CSPProperty::NewLC();
 CSPSettings* settings = CSPSettings::NewLC();
 TInt err = settings->FindPropertyL(
 vccServiceId, ESubPropertyVccDtVoipServiceId, *property );
 TInt voipId;
 TInt error = property->GetValue( voipId );
-__PHONELOG1( EBasic, EPhoneControl,
-"CPhoneVccHandler::GetHoNotifToneModeL - voipId: %d", voipId );
 // Find and get the HO notification tone property
 TInt tone = 0;
 RBuf value;
 value.CreateL( 1 );

branch	RCL_3
changeset 61	41a7f70b3818
parent 34	b68fcd923911
child 62	5266b1f337bd