diff -r 10852b179f64 -r ea98413ce11f supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h --- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h Wed Sep 15 12:40:28 2010 +0300 +++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h Wed Oct 13 15:01:35 2010 +0300 @@ -40,7 +40,9 @@ * @since S60 v3.1 */ -class COMASuplConnRequestor : public CActive +class COMASuplConnRequestor : public CActive, + public MOMASuplUICompletionObserver, + public MOMASuplDialogTimeOutNotifier { enum TConnState @@ -170,6 +172,9 @@ void GetUsedServerAddress(TDes& aHSLPAddressUsed); + void SettingsUICompletedL(TInt aError); + void SettingsUsageUICompletedL(TInt /*aError*/) {} + void SettingsTimeOutUICompletedL(TInt /*aError*/) {} TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId); void UpdateNetInfo(const TTime& aLastTimeUsed,TInt& aMcc,TInt& aMnc, TInt& aCid,TInt& aLac,TInt& aType,TInt& aErrorCode); @@ -209,7 +214,13 @@ void SaveAccessPoint(const TDesC& aIapName); - + /** + * Dialog Timeout Notifier Method. + * @since Series 60 9.1 TB + * @param None + * @return None + */ + virtual void DialogTimerExpiredL(); protected : // Functions from CActive /** * From CActive @@ -282,7 +293,15 @@ TInt64 iCurrentSLPId; - TBool iTriggerSession; + COMASuplDialogTimer* iDialogTimer; + + TBool iIapDialogShown; + + TBool iIapDlgTimerExpired; + + TBool iIsTimeoutDialogTimerStarted; + + TBool iTriggerSession; };