diff -r e1bea15f9a39 -r 79859ed3eea9 browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp --- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp Thu Aug 19 10:58:56 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp Tue Aug 31 16:17:46 2010 +0300 @@ -16,17 +16,12 @@ */ -#include "browser_platform_variant.hrh" -#include -#include +#include +#include #include "ServerHttpConnection.h" #include "Logger.h" -#ifdef BRDO_OCC_ENABLED_FF -#include -#include -#include -#endif + // ----------------------------------------------------------------------------- // CServerHttpConnection::NewL @@ -103,19 +98,9 @@ // If need be establish the connection. if(!IsConnected()) { -#ifdef BRDO_OCC_ENABLED_FF - TUint32 snapId = 0; //Defaults connects to Internet snap - iConMgr->SetConnectionType(CMManager::EDestination); - iConMgr->SetRequestedSnap(snapId); - if ( !IsPhoneOfflineL() ) - { - // For only feeds, this silent is required - iConMgr->SetOccPreferences(ESilient); - } -#else // Set the default access point. iConMgr->SetRequestedAP( iDefaultAccessPoint ); -#endif + // Open a connection. TRAP(err, err = iConMgr->StartConnectionL(ETrue)); if (err != KErrNone) @@ -200,34 +185,3 @@ { iDefaultAccessPoint = aAccessPoint; } - -#ifdef BRDO_OCC_ENABLED_FF -// --------------------------------------------------------- -// CServerHttpConnection::IsPhoneOfflineL -// -// Checks if phone is in offline mode or not. -// Return ETrue if phone is in offline mode. -// Return EFalse if phone is not in offline mode. -// --------------------------------------------------------- -// -TBool CServerHttpConnection::IsPhoneOfflineL() - { - FeatureManager::InitializeLibL(); - TBool onLineMode = FeatureManager::FeatureSupported( KFeatureIdOfflineMode ); - FeatureManager::UnInitializeLib(); - if ( onLineMode ) - { - CRepository* repository = CRepository::NewLC( KCRUidCoreApplicationUIs ); - TInt connAllowed = 1; - repository->Get( KCoreAppUIsNetworkConnectionAllowed, connAllowed ); - CleanupStack::PopAndDestroy(); //repository - if ( !connAllowed ) - { - //Yes, Phone is in Offline mode - return ETrue; - } - } - //Phone is in Online mode - return EFalse; - } -#endif