MCL/sf/mw/phonesrv: comparison cellular/SSSettings/src/RCustomerServiceProfileCache.cpp

equal deleted inserted replaced

-:7d48bed6ce0c
+:987c9837762f
 // INCLUDE FILES
 #include    <bldvariant.hrh> // for feature definitions
 #include    <etel.h>
-#include    <sssettingsprivatepskeys.h>
+#include    <SSSettingsPrivatePSKeys.h>
 #include    <centralrepository.h>
 #include    <mmtsy_names.h>
 #include    <featmgr.h>
-#include    "rcustomerserviceprofilecache.h"
+#include    "RCustomerServiceProfileCache.h"
-#include    "sssettingslogger.h"
+#include    "SSSettingsLogger.h"
 // CONSTANTS
 #define KSSSettingsTSYName KMmTsyModuleName
 const TInt KCspCacheTSYNameMaxLength( 80 );
 const TInt KCspCacheETelRetryCount(8);
 // -----------------------------------------------------------------------------
 // Constructor
 // -----------------------------------------------------------------------------
 EXPORT_C RCustomerServiceProfileCache::RCustomerServiceProfileCache()
-{
+	:iData( NULL ),iOldCspFile(NULL)
-iData = NULL;
+{
 }
 // -----------------------------------------------------------------------------
 // Destructor
 // -----------------------------------------------------------------------------
 EXPORT_C void RCustomerServiceProfileCache::Close()
 {
 __SSSLOGSTRING("[SSS]--> RCustomerServiceProfileCache::Close");
 if ( iData == NULL )
 {
+delete iOldCspFile;
+iOldCspFile = NULL;
 return;
 }
 iData->iPhone.Close();
 iData->iEtel.Close();
 {
 User::Leave( error );
 }
 User::LeaveIfError(
 CspCacheDoOpenEtelConnection( iData->iEtel, iData->iPhone ) );
+if( iOldCspFile )
+	{
+	delete iOldCspFile;
+	iOldCspFile = NULL;
+	}
 // Create and reset old CSP file variable.
 iOldCspFile = new ( ELeave ) RMobilePhone::TMobilePhoneCspFileV1;
 DoResetOldCspFile();
 __SSSLOGSTRING("[SSS] <-- RCustomerServiceProfileCache::DoOpenL");
 }
 if ( error == KErrNotFound && aGroup == ESsCspGroup1 )
 {
 error = DefineAndSetValue( KPSUidSSConfig, KSettingsCspCache1, value );
 }
 else if ( error == KErrNotFound && aGroup == ESsCspGroup2 )
-{
+	{
-error = DefineAndSetValue( KPSUidSSConfig, KSettingsCspCache2, value );
+	error = DefineAndSetValue( KPSUidSSConfig, KSettingsCspCache2, value );
-}
+	}
 if ( error == KErrNone )
 {
 if ( value != KCspCacheNoFile )
-{
+	{
-__SSSLOGSTRING("[SSS] ---> GetCustomerServiceProfile");
+	__SSSLOGSTRING("[SSS] ---> GetCustomerServiceProfile");
-TRequestStatus status;
+	        TRequestStatus status;
-// GetCustomerServiceProfile status returns KErrNotFound if CSP product profile is OFF.
+	        // GetCustomerServiceProfile status returns KErrNotFound if CSP product profile is OFF.
-iData->iPhone.GetCustomerServiceProfile(
+	        iData->iPhone.GetCustomerServiceProfile(
-status ,
+	           status ,
-iData->iCspFilePckg );
+	           iData->iCspFilePckg );
-User::WaitForRequest( status );
+	        User::WaitForRequest( status );
-error = status.Int();
+	        error = status.Int();
-__SSSLOGSTRING1("[SSS] <--- GetCustomerServiceProfile: error: %d", error);
+	        __SSSLOGSTRING1("[SSS] <--- GetCustomerServiceProfile: error: %d", error);
-if (( error == KErrNotReady ) || ( error == KErrServerBusy ))
+	        if (( error == KErrNotReady ) || ( error == KErrServerBusy ))
-{
+		        {
-return error;
+		        return error;
-}
+		        }
-}
+	}
 else // CSP has been read return value, if value is KCspCacheNoFile then return KErrNotSupported.
-{
+	{
-__SSSLOGSTRING("[SSS] CSP file cannot be found from SIM");
+	__SSSLOGSTRING("[SSS] CSP file cannot be found from SIM");
-return KErrNotSupported;
+			return KErrNotSupported;
-}
+	}
 if ( error == KErrNone )
 {
 if ( aGroup == ESsCspGroup1 )
 {
 }
 aValue = value;
 }
 else
 {
-value = KCspCacheNoFile;
+	value = KCspCacheNoFile;
 error = KErrNotSupported;
 }
 }
 if (( error == KErrNone ) || ( error == KErrNotSupported ))
 __SSSLOGSTRING("[SSS]   DefineAndSetValue -> KSettingsCspCache2");
 defError = DefineAndSetValue( KPSUidSSConfig, KSettingsCspCache2, value );
 }
 // Do not set error if defError is KErrNone. If Define/Set failed then error value is set.
-if  ( defError != KErrNone )
+if	( defError != KErrNone )
-{
+	{
-error = defError;
+	error = defError;
-}
+	}
 }
 __SSSLOGSTRING1("[SSS]    RCustomerServiceProfileCache::DoGetValues: error: %d", error);
 __SSSLOGSTRING("[SSS] <-- RCustomerServiceProfileCache::DoGetValues");
 return error;

branch	RCL_3
changeset 20	987c9837762f
parent 19	7d48bed6ce0c