supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h Wed Sep 15 12:40:28 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h Wed Oct 13 15:01:35 2010 +0300
@@ -33,7 +33,6 @@
class COMASuplFallBackHandler;
class COMASUPLProtocolManager1;
class COMASuplDialogTimer;
-class CRepository;
/**
* Class for doing asynchronous service i.e. used for Sending Packet to Socket.
*
@@ -41,7 +40,9 @@
* @since S60 v3.1
*/
-class COMASuplConnRequestor : public CActive
+class COMASuplConnRequestor : public CActive,
+ public MOMASuplUICompletionObserver,
+ public MOMASuplDialogTimeOutNotifier
{
enum TConnState
@@ -93,18 +94,6 @@
*/
void CreateConnectionL(TInt aDialogTimeOutDelay);
-
- /**
- * CreateConnection Method Overload. Creates the Socket required to
- * communicate with the SLP. Called in case of NI case.
- * @since
- * @param aPrompt used to show connection dialog using OCC Api's.
- * @param aWlanOnly used to connect server using wlan only.
- * @return None
- * Added CreateConnectionL with aPrompt and aWLANOnly for OCC.
- */
- void CreateConnectionL(TBool aPrompt,TBool aWlanOnly);
-
/**
* SendPacket Method.
* @since Series 60 3.1
@@ -183,7 +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);
@@ -217,7 +208,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
@@ -274,28 +271,29 @@
//For trying for once with newly generated HSLP.
TBool iTLSAuthenticationFailed;
- //SUPLSettings,Ownership is with the object
+ //SUPLSettings
CSuplSettingsInternal *iSuplSettings;
- CRepository* iRepository;//Ownership is with the object
-
//Trace Utility
- COMASuplTrace* iTrace; //Ownership is with the object
+ COMASuplTrace* iTrace;
TBool iIsHSLPGenerated;
TBool iHslpAddrFromImsiUsed;
TInt iLastConnectionError;
- COMASuplFallBackHandler* iFallBackHandler;//Ownership is with the object
+ COMASuplFallBackHandler* iFallBackHandler;
TBool iIsSettingInitilized;
TInt64 iCurrentSLPId;
- TBool iPrompt;
+
+ COMASuplDialogTimer* iDialogTimer;
- TBool iWlanOnly;
+ TBool iIapDialogShown;
- TBool iIsStaleLocIdPresent;
+ TBool iIapDlgTimerExpired;
+
+ TBool iIsTimeoutDialogTimerStarted;
};