FCL/sf/app/phone: comparison phoneengine/phonemodel/inc/cpemessagehandler.h

equal deleted inserted replaced

-:40a3f856b14d
+:41a7f70b3818
 #ifndef CPEMESSAGEHANDLER_H
 #define CPEMESSAGEHANDLER_H
 //  INCLUDES
 #include <pevirtualengine.h>
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
-#include <CPhCltCommandHandler.h>
+#include <cphcltcommandhandler.h>
 #include <cphcltdialdata.h>
 #include "mpecallhandling.h"
+#include "mpecallcontrolif.h"
 // CONSTANTS
 const TInt KModeNormal = 0;  // Normal System mode
 const TInt KModeFligth = 1;  // Flight mode
 const TInt KModePDA    = 2;  // PDA mode
 // Valid characters in an dialing string
 _LIT( KPEClientValidChars, "+0123456789*#pwPW" );
 _LIT( KPEValidDTMFChars, "0123456789*#pwPW" );
 _LIT( KPEValidDTMFStringStopChars, "+pPwW" );
-// DTMF Speed dial substitution
-_LIT( KPEValidSpeedDialChars, "23456789" );
-const TInt KPEDtmfSpeedDialSubstitutionsMax = 2; // prevent infinite loop.
-const TInt KPESpeedDialIndexMin = 2;
-const TInt KPESpeedDialIndexMax = 9;
-// DTMF parsing status for Speed dial location
-enum TPESpeedDialSubstituionStatus
-{
-EPEDtmfSpeedDialOk,
-EPEDtmfSpeedDialPromptUser,
-EPEDtmfSpeedDialNotAssigned,
-EPEDtmfSpeedDialInvalidSpeedDial
-};
 // Invalid characters in an dialing string, these chars can be removed from dial string
 _LIT( KPECharsThatCanBeDelete, "\"/ ().-" );
 // MACROS
 *  Handles phone related messages from the MPEPhoneModelInternal object.
 *
 *  @lib phoneenginebase.dll
 *  @since S60_5.0
 */
-NONSHARABLE_CLASS( CPEMessageHandler ) : public CBase
+NONSHARABLE_CLASS( CPEMessageHandler )
+:
+public CBase,
+public MPECallControlIF
 {
 public:  // Destructor
 /**
 * Two-phased constructor.
 * Handles release message from phone application
 * @param aAutoResumeOption if options for autoresume.
 * @return Return possible error code.
 */
 TInt HandleReleaseCall( TPEHangUpOptions aAutoResumeOption = ETPEHangUpDefault );
-		/**
-* Handles release message from application
-* @return Return possible error code.
-*/
-TInt HandleReleaseConference();
 /**
 * Handles send dtmf message from phone application
 * @return possible error code from the CallHandling subsystem.
 */
 TInt HandleSendDtmf();
 TBool RemoveInvalidChars( TDes& aString,
 const TDesC& aValidChars,
 const TBool aCheckForDelete ) const;
 /**
-* Handles lifetimer data from customa api -> engineinfo.
-* @return TInt possible error code..
-*/
-TInt HandleGetLifeTimerData() const;
-/**
 * Handles EPEMessageDTMFSent message from call handling subsystem
 * @param ECCPErrorNone or KPEDontSendMessage
 */
 TInt HandleDtmfSent();
 * function.
 * @param aAny Pointer to 'this' object.
 * @return error code.
 */
 static TInt CallBackHandleSendDtmf( TAny* aAny );
-/**
-* Handles plus (+) sign in a DTMF string.
-* @param aDtmfString Current DTMF string to process.
-*/
-void HandlePlusSignInDtmf( const TPEDtmfString& aDtmfString );
 /**
 * Called asyncronously from callback.
 * @param aAny Pointer to 'this' object.
 * @return error code.
 * @return Possible error code
 */
 TInt HandleReplaceActive();
 /**
+* Check if phone is locked, if locked leave with ECCPErrorAuthenticationFailed error.
+*/
+void CheckIfPhoneIsLockedL();
+/**
 * Handles unattended transfer request response.
 * @param    aAcceptRequest     ETrue to accept, EFalse to reject request.
 */
 TInt HandleUnattendedTransferRequestResponse( TBool aAcceptRequest );
 /**
 * Handle disable service
 */
 void HandleDisableService();
 /**
 * Adds SIM rejected MO CS call to logs.
 * @param aCallId is the identification number of the call.
 * @return KErrNone if succesfull
 */
 TInt AddSIMRejectedMoCsCallToLog( const TInt aCallId );
+/**
+* Handle dial service call
+*/
+TInt HandleDialServiceCall(
+const TBool aClientCall );
+/**
+* Returns a boolean to indicate whether network connection
+* is allowed or not.
+* @return Return a True or False.
+*/
+TBool IsNetworkConnectionAllowed() const;
 private: // New functions
 /**
 * C++ default constructor.
 */
 * @return TBool.
 */
 TBool AutomaticAnswer( const TInt aCallId ) const;
 /**
-* Returns a boolean to indicate whether emergency call is allowed or not.
-* @return Return a True or False.
-*/
-TBool IsEmergencyAllowed() const;
-/**
 * Handle Client Call Data.
 * @return Return possible error.
 */
 void HandleClientCallData();
 /**
 * Handles dial message from phone application or phone client.
 * @param aClientCall, Informs is the current call client originated or not.
 * @return Return possible error code.
 */
 TInt HandleDialCallL( const TBool aClientCall );
 /**
 * Reset CCCECallParameters to prevent of use a previous call´s parameters
 */
 void ResetClientCallData();
 TTime iTime;
 //Current emergency call state.
 TBool iEmergencyCallActive;
 //
 TBool iBtaaDisconnected;
-		// Flag to associate switch to vid/voice call operation and video call's reconnect operation.
-		// Use to fetch the right SwitchToNumber.
-TBool iSwitchToVidCalReconFlag;
 //Client Information, member variable because emergency call from phone client
 //is not allowed to allocate memory.
 CPEClientInformation* iClientInformation;
-		// Dial Data
+// Dial Data
-		CPhCltDialData* iClientDialData;
+CPhCltDialData* iClientDialData;
 // Instances will contain the results of the parsing
 CPhoneGsmParserResult* iResult;
 // Handles emergency number from the parser.
 // Not owned
 CPEParserEmergencyNumberHandler* iEmergencyNumberHandler;

branch	RCL_3
changeset 61	41a7f70b3818
parent 58	40a3f856b14d
child 62	5266b1f337bd