diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h --- a/phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h Thu Aug 19 09:54:27 2010 +0300 +++ b/phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h Tue Aug 31 15:14:29 2010 +0300 @@ -12,12 +12,12 @@ * Contributors: * * Description: -* Class that does processing for Phone Engine messages that are common -* for all GSM states. Most of the GSM states are intressed of these -* messages but due to the class architecture they don't have any single -* state class to be put into. This class exists to minimize duplicate -* code so that not every GSM class need to implement these same handlings -* for the same messages. +* Class that does processing for Phone Engine messages that are common +* for all GSM states. Most of the GSM states are intressed of these +* messages but due to the class architecture they don't have any single +* state class to be put into. This class exists to minimize duplicate +* code so that not every GSM class need to implement these same handlings +* for the same messages. * */ @@ -42,16 +42,16 @@ * */ class CPhoneErrorMessagesHandler : public CBase, - public MPhoneErrorMessagesHandler + public MPhoneErrorMessagesHandler { public: - /** + /** * Creates the error handler instance * @return an instance of class CPhoneErrorMessagesHandler */ static CPhoneErrorMessagesHandler* NewL( - MPhoneViewCommandHandle* aViewCommandHandle, - MPhoneStateMachine* aStateMachine ); + MPhoneViewCommandHandle* aViewCommandHandle, + MPhoneStateMachine* aStateMachine ); public: //From MPhoneErrorMessagesHandler /** @@ -66,40 +66,44 @@ */ IMPORT_C void ShowErrorSpecificNoteL( const TPEErrorInfo& aErrorInfo ); - protected: + protected: /** * By default EPOC constructor is private. */ IMPORT_C CPhoneErrorMessagesHandler( - MPhoneViewCommandHandle* aViewCommandHandle, - MPhoneStateMachine* aStateMachine ); - + MPhoneViewCommandHandle* aViewCommandHandle, + MPhoneStateMachine* aStateMachine ); + /** * Two phase construction - Second phase. * @return None */ void ConstructL(); - + /** * Show global InfoNote * @param aResourceId resource id to be resolved */ - IMPORT_C void SendGlobalInfoNoteL( TInt aResourceId ); + IMPORT_C void SendGlobalInfoNoteL( TInt aResourceId, + TBool aNotificationDialog = EFalse ); /** * Show global ErrorNote * @param aResourceId resource id to be resolved */ - IMPORT_C void SendGlobalErrorNoteL( TInt aResourceId ); + IMPORT_C void SendGlobalErrorNoteL( TInt aResourceId, + TBool aNotificationDialog = EFalse ); /** * Show global WarningNote * @param aResourceId resource id to be resolved */ - IMPORT_C void SendGlobalWarningNoteL( TInt aResourceId ); + IMPORT_C void SendGlobalWarningNoteL( + TInt aResourceId, + TBool aNotificationDialog = EFalse ); - private: + private: /** * Return SimState. */ @@ -114,16 +118,26 @@ * Return ETrue if voice call. */ TBool IsVoiceCall( const TInt aCallId ) const; - + + /** + * Gets cause code and resource id. + */ + TBool GetCauseCode( TInt &aCauseCode, + TInt &aResourceId, TBool &aNotification ) const; + protected: - - /** - * Handle for sending view commands. - */ - MPhoneViewCommandHandle* iViewCommandHandle; - - MPhoneStateMachine* iStateMachine; - + + /** + * Handle for sending view commands. + */ + MPhoneViewCommandHandle* iViewCommandHandle; + + MPhoneStateMachine* iStateMachine; + + TBool iCauseCodeVariation; + + TInt iCallId; + }; #endif // __CPHONEERRORMESSAGESHANDLER_H