equal
deleted
inserted
replaced
19 #include <e32math.h> |
19 #include <e32math.h> |
20 #include <hash.h> |
20 #include <hash.h> |
21 #include <commdb.h> |
21 #include <commdb.h> |
22 #include <es_enum.h> |
22 #include <es_enum.h> |
23 #include <centralrepository.h> |
23 #include <centralrepository.h> |
|
24 #include <cmconnectionmethodext.h> |
24 #include <cmconnectionmethoddef.h> |
25 #include <cmconnectionmethoddef.h> |
25 #include <cmpluginpacketdatadef.h> |
26 #include <cmpluginpacketdatadef.h> |
26 #include <cmdestination.h> |
27 #include <cmdestinationext.h> |
27 #include <http/thttpevent.h> |
28 #include <http/thttpevent.h> |
28 #include "dataretriever.h" |
29 #include "dataretriever.h" |
29 #include "GbaCommon.h" |
30 #include "GbaCommon.h" |
30 #include "GBALogger.h" |
31 #include "GBALogger.h" |
31 #include "bootstrap.h" |
32 #include "bootstrap.h" |
100 // |
101 // |
101 void CDataRetriever::ConstructL() |
102 void CDataRetriever::ConstructL() |
102 { |
103 { |
103 iHttpHandler = C3GPPBootstrapHttpHandler::NewL( this, iBootstrapCallBack ); |
104 iHttpHandler = C3GPPBootstrapHttpHandler::NewL( this, iBootstrapCallBack ); |
104 iInternalState = EReadyForRequest; |
105 iInternalState = EReadyForRequest; |
105 iCmManager.OpenL(); |
106 iCmManagerExt.OpenL(); |
106 } |
107 } |
107 |
108 |
108 |
109 |
109 // --------------------------------------------------------------------------- |
110 // --------------------------------------------------------------------------- |
110 // CDataRetriever::~CDataRetriever() |
111 // CDataRetriever::~CDataRetriever() |
117 delete iHttpHandler; |
118 delete iHttpHandler; |
118 iHTTPTransaction.Close(); |
119 iHTTPTransaction.Close(); |
119 iHTTPSession.Close(); |
120 iHTTPSession.Close(); |
120 iConnection.Close(); |
121 iConnection.Close(); |
121 iSockServ.Close(); |
122 iSockServ.Close(); |
122 iCmManager.Close(); |
123 iCmManagerExt.Close(); |
123 |
124 |
124 if ( iInternalState == EMakeRequestCalled ) |
125 if ( iInternalState == EMakeRequestCalled ) |
125 { |
126 { |
126 GBA_TRACE_DEBUG(("CDataRetriever::~CDataRetriever EMakeRequestCalled")); |
127 GBA_TRACE_DEBUG(("CDataRetriever::~CDataRetriever EMakeRequestCalled")); |
127 User::RequestComplete(iCallerRequestStatus, KErrCancel); |
128 User::RequestComplete(iCallerRequestStatus, KErrCancel); |
353 TInt CleanupCounter = 0; |
354 TInt CleanupCounter = 0; |
354 |
355 |
355 RArray<TUint32> destIdArray; |
356 RArray<TUint32> destIdArray; |
356 CleanupClosePushL( destIdArray ); |
357 CleanupClosePushL( destIdArray ); |
357 CleanupCounter++; |
358 CleanupCounter++; |
358 iCmManager.AllDestinationsL( destIdArray ); |
359 iCmManagerExt.AllDestinationsL( destIdArray ); |
359 |
360 |
360 for ( TInt i = 0; i< destIdArray.Count(); i++ ) |
361 for ( TInt i = 0; i< destIdArray.Count(); i++ ) |
361 { |
362 { |
362 RCmDestination dest = iCmManager.DestinationL( destIdArray[i] ); |
363 RCmDestinationExt dest = iCmManagerExt.DestinationL( destIdArray[i] ); |
363 CleanupClosePushL( dest ); |
364 CleanupClosePushL( dest ); |
364 CleanupCounter++; |
365 CleanupCounter++; |
365 |
366 |
366 for ( TInt j=0; j < dest.ConnectionMethodCount(); j++ ) |
367 for ( TInt j=0; j < dest.ConnectionMethodCount(); j++ ) |
367 { |
368 { |
406 TInt CleanupCounter = 0; |
407 TInt CleanupCounter = 0; |
407 |
408 |
408 RArray<TUint32> destIdArray; |
409 RArray<TUint32> destIdArray; |
409 CleanupClosePushL( destIdArray ); |
410 CleanupClosePushL( destIdArray ); |
410 CleanupCounter++; |
411 CleanupCounter++; |
411 iCmManager.AllDestinationsL( destIdArray ); |
412 iCmManagerExt.AllDestinationsL( destIdArray ); |
412 |
413 |
413 for ( TInt i = 0; i< destIdArray.Count(); i++ ) |
414 for ( TInt i = 0; i< destIdArray.Count(); i++ ) |
414 { |
415 { |
415 RCmDestination dest = iCmManager.DestinationL( destIdArray[i] ); |
416 RCmDestinationExt dest = iCmManagerExt.DestinationL( destIdArray[i] ); |
416 CleanupClosePushL( dest ); |
417 CleanupClosePushL( dest ); |
417 CleanupCounter++; |
418 CleanupCounter++; |
418 |
419 |
419 if ( dest.MetadataL( ESnapMetadataInternet ) ) |
420 if ( dest.MetadataL( ESnapMetadataInternet ) ) |
420 { |
421 { |