diff -r abb636afedf7 -r a1df79fa35b4 webservices/wshttpchanneltransportplugin/inc/senhttpchannelimpl.h --- a/webservices/wshttpchanneltransportplugin/inc/senhttpchannelimpl.h Fri Apr 16 16:07:50 2010 +0300 +++ b/webservices/wshttpchanneltransportplugin/inc/senhttpchannelimpl.h Fri Jun 11 14:42:58 2010 +0300 @@ -107,7 +107,7 @@ TInt CancelTransaction(const TInt aTxnId); void CancelAllTransactions(); - void SetExplicitIapDefined(TBool aExplicitIapDefined); + virtual void SetExplicitIapDefined(TBool aExplicitIapDefined); /* * Getter for currently effective IAP ID * @param aIapId will be assigned to hold @@ -131,6 +131,8 @@ void EnableTimeOutL(TInt aTxnId, TInt aTimeOutSec); void DisableTimeOutL(TInt aTxnId); virtual TInt32 UsedIap(); + virtual void ResetIapId(); + virtual void ResetUsedIapId(); protected: CSenHttpChannelImpl(MSenIdentityManager& aManager); @@ -160,8 +162,10 @@ private: // New functions - - + + TInt SetID(TUint32 aIapId, TBool aDialogPref, RConnection& aConnection, RSocketServ& aSocketServer, TBool aSNAP = EFalse); + TInt GetS60PlatformVersion(TUint& aMajor, TUint& aMinor); + TBool IsOCCImplementedSDK(); TPtrC8 SoapActionL(MSenElement& aSoapEnvelope); TInt SubmitRequestL(MSenResponseObserver& aObserver, const TDesC8& aUri, @@ -210,6 +214,9 @@ TBool iHasHttpContentType; SenMultiPartUtils::TMultiPartContentType iMultiPartContentType; // content type of MultiPart response RHTTPTransaction iHttpTransaction ; +#ifndef __ENABLE_ALR__ + TBool iOCCenabled ; +#endif }; #endif //SEN_HTTP_CHANNEL_IMPL_H