MCL/sf/app/phone: comparison phoneapp/phoneuicontrol/src/cphonestate.cpp

equal deleted inserted replaced

-:c84cf270c54f
+:8871b09be73b
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <aknsoundsystem.h>
 #include <cphcntprofileengine.h>
 #include <wlaninternalpskeys.h>
 #include <btengdomainpskeys.h>
 #include <btengdomaincrkeys.h>
-#include <SettingsInternalCRKeys.h>
+#include <settingsinternalcrkeys.h>
 #include <starterclient.h>
 #include <RSSSettings.h>
 #include <UikonInternalPSKeys.h>
 #include <telephonydomainpstypes.h>
 #include <telinformationpskeys.h>
 #include "cphonereleasecommand.h"
 #include "cphonecontinueemergencycallcommand.h"
 #include "cphonecallheadermanager.h"
 #include "cphonenumberentrymanager.h"
 #include "mphonestorage.h"
+#include "easydialingcommands.hrh"
 // ================= MEMBER FUNCTIONS =======================
 EXPORT_C CPhoneState::CPhoneState(
 MPhoneStateMachine* aStateMachine,
 !btAvailable )
 {
 CPhoneBtaaDisconnectHandler::InstanceL()->HandleConnectionLostL();
 }
 else if ( audioOutput == EPEBTAudioAccessory &&
-previousOutput != EPEBTAudioAccessory &&
+		previousOutput > EPENotActive &&
+		previousOutput != EPEBTAudioAccessory &&
 btAvailable )
 {
 CPhoneAccessoryBTHandler* bt = CPhoneAccessoryBTHandler::NewLC(
 iViewCommandHandle, iStateMachine, this );
 bt->ShowBTActivatedL();
 TBool numberEntryUsed = IsNumberEntryUsedL();
 if ( numberEntryUsed && ( aKeyEvent.iRepeats == 0 ||
 aKeyEvent.iScanCode == EStdKeyBackspace ||
 aKeyEvent.iScanCode ==EStdKeyLeftArrow  ||
+aKeyEvent.iScanCode == EStdKeyUpArrow  ||
+aKeyEvent.iScanCode == EStdKeyDownArrow  ||
 aKeyEvent.iScanCode ==EStdKeyRightArrow ))
 {
 // Number entry exists but may be hidden
 KeyEventForExistingNumberEntryL( aKeyEvent, aEventCode );
 }
 __PHONELOG1( EBasic, EPhoneControl, "CPhoneState::IsNoteDismissableL: %d ", dismiss );
 return dismiss;
 }
 // -----------------------------------------------------------
+// CPhoneState::IsDialingExtensionInFocusL
+// -----------------------------------------------------------
+//
+EXPORT_C TBool CPhoneState::IsDialingExtensionInFocusL() const
+{
+__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::IsDialingExtensionInFocusL( ) ");
+return iViewCommandHandle->HandleCommandL(
+EPhoneViewGetEasyDialingInFocusStatus ) ==
+EPhoneViewResponseSuccess;
+}
+// -----------------------------------------------------------
 // CPhoneState::SendKeyEventL
 // -----------------------------------------------------------
 //
 void CPhoneState::SendKeyEventL(
 const TKeyEvent& aKeyEvent,
 }
 }
 else if ( aCategory == KPSUidStartup && aKey == KStartupSimSecurityStatus )
 {
 // Show security note, SIM is not valid.
-if ( aValue == ESimRejected ||  aValue == ESimUnaccepted )
+if ( aValue == ESimRejected
+|| aValue == ESimUnaccepted
+|| aValue == ESimInvalid )
 {
 __PHONELOG( EBasic, EPhoneControl, "CPhoneStateStartup::HandlePropertyChangedL - SimSecurity status received" );
 StartShowSecurityNoteL();
 }
 }
 case EPhoneEmergencyCmdExit:
 {
 //cancel emergency mode.
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( EFalse );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetRetrictedDialer,&booleanParam );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSetRestrictedDialer, &booleanParam );
 }
 // this should be bypasses?
 case EPhoneDialerCallHandling:
 case EPhoneCmdBack:
 BeginTransEffectLC( ENumberEntryClose );
 iCbaManager->SetCbaL( EPhoneEmergencyModeNoteCBA );
 // Set dialer to restricted mode.
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( ETrue );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetRetrictedDialer,&booleanParam );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSetRestrictedDialer, &booleanParam );
 NumberEntryManagerL()->CreateNumberEntryL();
 }
 }
 break;
 case EPhoneCmdVideoCallOutOfMemory:
 ShowVideoCallOutOfMemoryNoteL();
 DisconnectCallL();
 break;
+case EPhoneCmdUpdateCba:
+case EPhoneDialerValidNumber:
+case EPhoneDialerInvalidNumber:
+case EPhoneCmdBlockingDialogLaunched:
+case EPhoneCmdBlockingDialogClosed:
+{
+// these command ids are sent by easydialing to communicate to phone app
+HandleEasyDialingCommandsL( aCommand );
+}
+break;
 default:
 if ( IsOnScreenDialerSupported() )
 {
 // Offer command to view.
+// Easydialing commands are handled in view, too.
 TPhoneViewResponseId resId =
 iViewCommandHandle->HandleCommandL( aCommand );
 if( resId == EPhoneViewResponseFailed )
 {
 commandStatus = EFalse;
 }
 }
 else
 {
 commandStatus = EFalse;
 // -----------------------------------------------------------
 // CPhoneState::DisconnectCallL
 // -----------------------------------------------------------
 //
-EXPORT_C TBool CPhoneState::DisconnectCallL()
+EXPORT_C void CPhoneState::DisconnectCallL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DisconnectCallL( ) ");
 // Fetch active call's id from view
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateConnected );
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 }
 }
-TBool ret = EFalse;
 if( callStateData.CallId() > KErrNotFound )
 {
 // Release the call
 iStateMachine->SetCallId( callStateData.CallId() );
 if( IsVideoCall( callStateData.CallId() ) )
 {
 // Release the call
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageRelease );
 }
-ret = ETrue;
 }
 else
 {
 __PHONELOG( EOnlyFatal, EPhoneControl,
 "CPhoneState::DisconnectCallL has negative call id!" );
 }
+}
-return ret;
-}
 // -----------------------------------------------------------
 // CPhoneState::DisplayIdleScreenL
 // -----------------------------------------------------------
 //
 EPhoneDialerCmdLog );
 return;
 }
 }
 }
-// Get the number entry contents
+// If easydialing has focus, call should be initiated to focused contact.
-HBufC* phoneNumber = PhoneNumberFromEntryLC();
+if ( IsDialingExtensionInFocusL() )
+{
-// Call the number
+iViewCommandHandle->HandleCommandL( EEasyDialingVoiceCall );
-iStateMachine->PhoneEngineInfo()->SetPhoneNumber( *phoneNumber );
+}
+else
-if ( phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength )
+{
-{
+// Get the number entry contents
-// Closing effect is shown when dialer exist.
+HBufC* phoneNumber = PhoneNumberFromEntryLC();
-BeginTransEffectLC( ENumberEntryClose );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
+// Call the number
-EndTransEffect();
+iStateMachine->PhoneEngineInfo()->SetPhoneNumber( *phoneNumber );
-HandleNumberEntryClearedL();
+if ( phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength )
-}
+{
+// Closing effect is shown when dialer exist.
-CleanupStack::PopAndDestroy( phoneNumber );
+BeginTransEffectLC( ENumberEntryClose );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-if ( !iCustomization ||
+EndTransEffect();
-!iCustomization->HandleCallFromNumberEntryL() )
-{
+HandleNumberEntryClearedL();
-// Customization didn't handle call. Dial voice call
+}
-// as normally
-DialVoiceCallL();
+CleanupStack::PopAndDestroy( phoneNumber );
-}
+if ( !iCustomization ||
+!iCustomization->HandleCallFromNumberEntryL() )
+{
+// Customization didn't handle call. Dial voice call
+// as normally
+DialVoiceCallL();
+}
+}
 }
 // -----------------------------------------------------------
 // CPhoneState::DisplayHeaderForCallComingInL
 // -----------------------------------------------------------
 CPhonePubSubProxy::Instance()->Value(
 KPSUidCtsyCallInformation,
 KCTsyCallType ) );
 TInt activeCallId = GetActiveCallIdL();
-if ( activeCallId > KErrNotFound )
+if ( activeCallId > KErrNone )
 {
 if ( iStateMachine->PhoneEngineInfo()->CallALSLine( activeCallId )
 == CCCECallParameters::ECCELineTypeAux )
 {
 incallIndicatorParam.SetLine2( ETrue );
 // display the little bubble. If we don't hide it here then
 // it will appear for a short time. We don't want that.
 incallIndicatorParam.SetLittleBubbleVisible( EFalse );
 }
 }
+}
+// TODO: Refactor -> this looks really dubious.
+else
+{
+incallIndicatorParam.SetLittleBubbleVisible( ETrue );
 }
 // Update the in-call indicator
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateIncallIndicator,
 &incallIndicatorParam );
 // Sim state is valid, check also Sim security status
 switch ( SimSecurityStatus() )
 {
 case ESimRejected:
 case ESimUnaccepted:
+case ESimInvalid:
 retVal = EFalse;
 break;
 default:
 break;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
 &uidParam );
 TInt resourceId ( KErrNone );
-if ( SimSecurityStatus() == ESimRejected )
-{
+switch( SimSecurityStatus() )
-resourceId = CPhoneMainResourceResolver::Instance()->
+{
-ResolveResourceID( EPhoneSimRejected );
+			  case ESimRejected:
-}
+			      {
-else if ( SimState() == EPESimNotPresent )
+			      resourceId = CPhoneMainResourceResolver::Instance()->
-{
+ResolveResourceID( EPhoneSimRejected );
-// insert sim card -note
+break;
-resourceId = CPhoneMainResourceResolver::Instance()->
+			      }
-ResolveResourceID( EPhoneSimRemoved );
+			  case ESimUnaccepted:
-}
+			      {
-else if ( SimSecurityStatus() == ESimUnaccepted )
+			      // insert sim card -note
-{
+resourceId = CPhoneMainResourceResolver::Instance()->
-resourceId = CPhoneMainResourceResolver::Instance()->
+ResolveResourceID( EPhoneSimUnaccepted );
-ResolveResourceID( EPhoneSimUnaccepted );
+			      break;
+			      }
+			  case ESimInvalid:
+			      {
+			      resourceId = CPhoneMainResourceResolver::Instance()->
+ResolveResourceID( EPhoneSIMInvalidUICC );
+			      break;
+			      }
+default:
+	          {
+	          if ( SimState() == EPESimNotPresent )
+{
+// insert sim card -note
+resourceId = CPhoneMainResourceResolver::Instance()->
+ResolveResourceID( EPhoneSimRemoved );
+}
+	          break;
+	          }
 }
 if ( resourceId != KErrNone )
 {
 // Add it to the resource string
 TPhoneCmdParamInteger numberEntryCountParam;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
 &numberEntryCountParam );
 TInt neLength( numberEntryCountParam.Integer() );
-if( iCustomization && iCustomization->AllowAlphaNumericMode() )
+if( neLength == 1 )
 {
-if ( NumberEntryManagerL()->NumberEntryInNumericModeL() )
+TPhoneCmdParamBoolean isSecurityMode;
-{
+iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
-if ( neLength == 0 )
-{
+if ( !isSecurityMode.Boolean() )
-OnlyHashInNumberEntryL();
+{
-}
+OnlyHashInNumberEntryL();
-if ( neLength == 1 )
-{
-NumberEntryClearL();
-}
-}
-NumberEntryManagerL()->NumberEntryToggleAlphaNumericModeL();
-}
-else
-{
-if( neLength == 1 )
-{
-TPhoneCmdParamBoolean isSecurityMode;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
-if ( !isSecurityMode.Boolean() )
-{
-OnlyHashInNumberEntryL();
-}
 }
 }
 }
 // -----------------------------------------------------------
 Sim security statuses:
 ESimSecurityStatusUninitialized = KStartupEnumerationFirstValue,
 ESimRejected,   // The PUK code has been entered incorrectly, so the card is rejected.
 ESimUnaccepted  // The SIM lock is on, so the card is unaccepted.
+ESimInvalid     // The Sim inserted is not same as the one provided by the
+// operator, so card is invalid.
 */
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::SimSecurityStatus()" );
 return CPhonePubSubProxy::Instance()->Value(
 KPSUidStartup, KStartupSimSecurityStatus );
 }
 TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
 EPhoneViewEnableToolbarButton, &integerParam ));
 }
 }
+// ---------------------------------------------------------
+// CPhoneState::HandleEasyDialingCommandsL
+// ---------------------------------------------------------
+//
+void CPhoneState::HandleEasyDialingCommandsL( TInt aCommandId )
+{
+switch ( aCommandId )
+{
+case EPhoneCmdUpdateCba:
+iCbaManager->UpdateInCallCbaL();
+break;
+case EPhoneDialerValidNumber:
+{
+TPhoneCmdParamBoolean command;
+command.SetBoolean( EFalse );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSetInvalidCsPhoneNumberFlag, &command );
+}
+break;
+case EPhoneDialerInvalidNumber:
+{
+TPhoneCmdParamBoolean command;
+command.SetBoolean( ETrue );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSetInvalidCsPhoneNumberFlag, &command );
+}
+break;
+case EPhoneCmdBlockingDialogLaunched:
+{
+TPhoneCmdParamBoolean param;
+param.SetBoolean( ETrue );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSetBlockingDialogStatus, &param );
+}
+break;
+case EPhoneCmdBlockingDialogClosed:
+{
+TPhoneCmdParamBoolean param;
+param.SetBoolean( EFalse );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSetBlockingDialogStatus, &param );
+}
+break;
+default:
+break;
+}
+}
 //  End of File

branch	RCL_3
changeset 3	8871b09be73b
parent 0	5f000ab63145
child 4	24062c24fe38