MCL/sf/mw/phonesrv: comparison convergedcallengine/spsettings/src/spsettingsengine.cpp

equal deleted inserted replaced

-:7d48bed6ce0c
+:987c9837762f
 #include <centralrepository.h>
 #include <e32property.h>
 #include <featmgr.h>
 #include <settingsinternalcrkeys.h>
 #include <cenrepdatabaseutil.h>
 #include "spsettingsengine.h"
 #include "spentry.h"
 #include "spproperty.h"
 CleanupStack::Pop( property );
 }
 }
 void CSPSettingsEngine::CleanupPointerArray(  TAny* aPointer )
-{
+	{
-RIpAppPropArray* array = static_cast<RIpAppPropArray*>( aPointer );
+	RIpAppPropArray* array = static_cast<RIpAppPropArray*>( aPointer );
-array->ResetAndDestroy();
+	array->ResetAndDestroy();
-}
+	}
 // ---------------------------------------------------------------------------
 // Stores new service provider settings entry
 // ---------------------------------------------------------------------------
 //
 {
 XSPSLOGSTRING( "CSPSettingsEngine::AddEntryL() - IN" );
 // check the service name is not empty
 if( aEntry.GetServiceName().Length() == 0 )
-{
+	{
-User::LeaveIfError( KErrArgument );
+	User::LeaveIfError( KErrArgument );
-}
+	}
 // construct RIpAppPropArray
 RIpAppPropArray array;
-TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
+	TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
-CleanupStack::PushL( cleanup );
+	CleanupStack::PushL( cleanup );
 ConvertSpEntryToCenRepArrayL( aEntry, array );
 // Create new unique service ID
 TInt newId = 0;
 TInt CSPSettingsEngine::FindEntryL( TServiceId aServiceId, CSPEntry& aEntry )
 {
 XSPSLOGSTRING2( "CSPSettingsEngine::FindEntryL( %d ) - IN", aServiceId );
 RIpAppPropArray array;
-TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
+	TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
-CleanupStack::PushL( cleanup );
+	CleanupStack::PushL( cleanup );
 TInt err = iCenRepUtils->FindEntryL( aServiceId, array );
 if( err == KErrNone )
 {
 User::Leave( KErrArgument );
 }
 // construct RIpAppPropArray
 RIpAppPropArray array;
-TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
+	TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
-CleanupStack::PushL( cleanup );
+	CleanupStack::PushL( cleanup );
 ConvertSpEntryToCenRepArrayL( aEntry, array );
 TInt err = iCenRepUtils->UpdateEntryL( (TInt) serviceId, array );
 CleanupStack::PopAndDestroy( &array );
 XSPSLOGSTRING( "CSPSettingsEngine::UpdateEntry() - OUT" );
 return err;
 }
 // ---------------------------------------------------------------------------
 // Deletes service provider settings entry by service ID
 // ---------------------------------------------------------------------------
 //
 TInt CSPSettingsEngine::DeleteEntryL( TServiceId aServiceId )
 // ---------------------------------------------------------------------------
 // Search property of service provider settings entry by property name
 // ---------------------------------------------------------------------------
 //
 TInt CSPSettingsEngine::FindPropertyL( TServiceId aServiceId,
-TServicePropertyName aPropertyName,
+								   TServicePropertyName aPropertyName,
-CSPProperty& aProperty )
+								   CSPProperty& aProperty )
 {
 XSPSLOGSTRING2( "CSPSettingsEngine::FindPropertyL(%d) - IN", aServiceId );
 CCenRepDatabaseProperty* cenrepProperty = CCenRepDatabaseProperty::NewLC();
 TInt err = iCenRepUtils->FindPropertyL( aServiceId, aPropertyName, *cenrepProperty );
 // ---------------------------------------------------------------------------
 // Add or update properties of service provider settings entry
 // ---------------------------------------------------------------------------
 //
 TInt CSPSettingsEngine::AddOrUpdatePropertiesL( TServiceId aServiceId,
-const RPropertyArray& aPropertyArray )
+												const RPropertyArray& aPropertyArray )
 {
 XSPSLOGSTRING2( "CSPSettingsEngine::AddOrUpdatePropertiesL(%d) - IN", aServiceId );
 // construct RIpAppPropArray
 RIpAppPropArray array;
-TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
+	TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
-CleanupStack::PushL( cleanup );
+	CleanupStack::PushL( cleanup );
 ConvertSpArrayToCenRepArrayL( aPropertyArray, array );
 TInt err = iCenRepUtils->AddOrUpdatePropertiesL( aServiceId, array );
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 TInt CSPSettingsEngine::FindSubServicePropertiesL( TServiceId aServiceId,
-TSPItemType aPropertyType,
+	TSPItemType aPropertyType,
 RPropertyArray& aPropertyArray )
 {
 XSPSLOGSTRING2(
 "CSPSettingsEngine::FindSubServicePropertiesL( %d ) - IN", aServiceId );
 // ---------------------------------------------------------------------------
 // Deletes service properties
 // ---------------------------------------------------------------------------
 //
 TInt CSPSettingsEngine::DeleteServicePropertiesL( TServiceId aServiceId,
-const RPropertyNameArray& aNameArray  )
+											  const RPropertyNameArray& aNameArray  )
 {
 XSPSLOGSTRING2(
 "CSPSettingsEngine::FindSubServicePropertyL( %d ) - IN", aServiceId );
 RArray<TUint32> nameArray;
 // ---------------------------------------------------------------------------
 // Find service IDs with same properties
 // ---------------------------------------------------------------------------
 //
 void CSPSettingsEngine::FindServiceIdsFromPropertiesL( const RPropertyArray& aPropertyArray,
-RIdArray& aServiceIds )
+													   RIdArray& aServiceIds )
-{
+	{
-XSPSLOGSTRING( "CSPSettingsEngine::FindServiceIdsFromPropertiesL() - IN" );
+	XSPSLOGSTRING( "CSPSettingsEngine::FindServiceIdsFromPropertiesL() - IN" );
 RArray<TInt> entryIds;
 CleanupClosePushL( entryIds );
 RIpAppPropArray array;
-TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
+	TCleanupItem cleanup( CSPSettingsEngine::CleanupPointerArray, &array );
-CleanupStack::PushL( cleanup );
+	CleanupStack::PushL( cleanup );
 // todo custom cleanup stack
 ConvertSpArrayToCenRepArrayL( aPropertyArray, array );
 TInt err = iCenRepUtils->FindEntryIdsFromPropertiesL( array, entryIds );
 }
 CleanupStack::PopAndDestroy( &array );
 CleanupStack::PopAndDestroy( &entryIds );
-XSPSLOGSTRING( "CSPSettingsEngine::FindServiceIdsFromPropertiesL() - OUT" );
+	XSPSLOGSTRING( "CSPSettingsEngine::FindServiceIdsFromPropertiesL() - OUT" );
-}
+	}
 // ---------------------------------------------------------------------------
 // Check feature is supported or not
 // ---------------------------------------------------------------------------
 //
 TBool CSPSettingsEngine::IsFeatureSupportedL( TSPServiceFeature aFeature,
 TBool aWriteAllowed )
-{
+	{
 XSPSLOGSTRING( "CSPSettingsEngine::IsFeatureSupportedL() - IN" );
 TBool ret = EFalse;
-// First check P&S key, if P&S key is defined, use the value from P&S key.
+	// First check P&S key, if P&S key is defined, use the value from P&S key.
-// if not defined, then walk through all the sevices and check there is any service match
+	// if not defined, then walk through all the sevices and check there is any service match
-TInt mask = 0;
+	TInt mask = 0;
-TInt value = 0;
+	TInt value = 0;
-TInt psFlag = 0;
+	TInt psFlag = 0;
-TInt retProperty = 0;
+	TInt retProperty = 0;
 switch( aFeature )
-{
+	{
-case ESupportInternetCallFeature:
+	case ESupportInternetCallFeature:
-{
+		{
-retProperty = RProperty::Get( KUidSystemCategory, KSPSupportInternetCallKey, psFlag );
+		retProperty = RProperty::Get( KUidSystemCategory, KSPSupportInternetCallKey, psFlag );
-if( retProperty == KErrNone && psFlag != KSPInitFeatureValue )
+		if( retProperty == KErrNone && psFlag != KSPInitFeatureValue )
-{
+			{
-ret = psFlag;
+			ret = psFlag;
-}
+			}
-else
+		else
-{
+			{
-mask = ESupportsInternetCall | ESupportsAlphanumericAddressing | EIsVisibleInCallMenu;
+				mask = ESupportsInternetCall | ESupportsAlphanumericAddressing | EIsVisibleInCallMenu;
-value = mask;
+				value = mask;
-ret = CheckFeatureL( mask, value );
+				ret = CheckFeatureL( mask, value );
-if ( aWriteAllowed )
+				if ( aWriteAllowed )
-{
+				    {
-User::LeaveIfError( RProperty::Set( KUidSystemCategory,
+				    User::LeaveIfError( RProperty::Set( KUidSystemCategory,
-KSPSupportInternetCallKey, ret ) );
+				        KSPSupportInternetCallKey, ret ) );
-}
+				    }
-}
+			}
-break;
+		break;
-}
+		}
-case ESupportCallOutFeature:
+	case ESupportCallOutFeature:
-{
+		{
-retProperty = RProperty::Get( KUidSystemCategory, KSPSupportCallOutKey, psFlag );
+		retProperty = RProperty::Get( KUidSystemCategory, KSPSupportCallOutKey, psFlag );
-if( retProperty == KErrNone && psFlag != KSPInitFeatureValue )
+		if( retProperty == KErrNone && psFlag != KSPInitFeatureValue )
-{
+			{
-ret = psFlag;
+			ret = psFlag;
-}
+			}
-else
+		else
-{
+			{
-mask = ESupportsInternetCall | ESupportsMSISDNAddressing | EIsVisibleInCallMenu;
+				mask = ESupportsInternetCall | ESupportsMSISDNAddressing | EIsVisibleInCallMenu;
-value = mask;
+				value = mask;
-ret = CheckFeatureL( mask, value );
+				ret = CheckFeatureL( mask, value );
-if ( aWriteAllowed )
+				if ( aWriteAllowed )
-{
+				    {
-User::LeaveIfError( RProperty::Set(
+				User::LeaveIfError( RProperty::Set(
-KUidSystemCategory,
+				    KUidSystemCategory,
-KSPSupportCallOutKey, ret ) );
+				    KSPSupportCallOutKey, ret ) );
-}
+				    }
-}
+			}
-break;
+		break;
-}
+		}
-case ESupportVoIPSSFeature:
+	case ESupportVoIPSSFeature:
-{
+		{
-retProperty = RProperty::Get( KUidSystemCategory, KSPSupportVoIPSSKey, psFlag );
+		retProperty = RProperty::Get( KUidSystemCategory, KSPSupportVoIPSSKey, psFlag );
-if( retProperty == KErrNone && psFlag != KSPInitFeatureValue )
+		if( retProperty == KErrNone && psFlag != KSPInitFeatureValue )
-{
+			{
-ret = psFlag;
+			ret = psFlag;
-}
+			}
-else
+		else
-{
+			{
-mask = ESupportVoIPSS;
+				mask = ESupportVoIPSS;
-value = mask;
+				value = mask;
-ret = CheckFeatureL( mask, value );
+				ret = CheckFeatureL( mask, value );
-if ( aWriteAllowed )
+				if ( aWriteAllowed )
-{
+				    {
-User::LeaveIfError( RProperty::Set(
+				User::LeaveIfError( RProperty::Set(
-KUidSystemCategory,
+				    KUidSystemCategory,
-KSPSupportVoIPSSKey, ret ) );
+				    KSPSupportVoIPSSKey, ret ) );
-}
+				    }
-}
+			}
-break;
+		break;
-}
+		}
-case ESupportVoIPFeature:
+	case ESupportVoIPFeature:
-{
+		{
-TBool bFeatureMgr = EFalse;
+		TBool bFeatureMgr = EFalse;
-TBool bDynVoIP = EFalse;
+		TBool bDynVoIP = EFalse;
-TBool bSubVoIP = EFalse;
+		TBool bSubVoIP = EFalse;
-//check FeatureManager
+		//check FeatureManager
-FeatureManager::InitializeLibL();
+		FeatureManager::InitializeLibL();
-bFeatureMgr = FeatureManager::FeatureSupported( KFeatureIdCommonVoip );
+		bFeatureMgr = FeatureManager::FeatureSupported( KFeatureIdCommonVoip );
-FeatureManager::UnInitializeLib();
+		FeatureManager::UnInitializeLib();
-//check dynamic voip flag
+		//check dynamic voip flag
-CRepository* repository = CRepository::NewLC( KCRUidTelephonySettings );
+			CRepository* repository = CRepository::NewLC( KCRUidTelephonySettings );
-TInt value = 0;
+			TInt value = 0;
-TInt err = repository->Get( KDynamicVoIP, value );
+			TInt err = repository->Get( KDynamicVoIP, value );
-if( value != 0 )
+			if( value != 0 )
-{
+				{
-bDynVoIP = ETrue;
+				bDynVoIP = ETrue;
-}
+				}
-CleanupStack::PopAndDestroy( repository );
+			CleanupStack::PopAndDestroy( repository );
-//check subservice voip
+		//check subservice voip
-RIdArray serviceIds;
+			RIdArray serviceIds;
-CleanupClosePushL( serviceIds );
+			CleanupClosePushL( serviceIds );
-FindServiceIdsL( serviceIds );
+			FindServiceIdsL( serviceIds );
-CSPProperty* property = CSPProperty::NewLC();
+			CSPProperty* property = CSPProperty::NewLC();
-for( TInt i = 0; i < serviceIds.Count(); i++ )
+			for( TInt i = 0; i < serviceIds.Count(); i++ )
-{
+				{
-TServiceId serviceId = serviceIds[i];
+				TServiceId serviceId = serviceIds[i];
-TInt retProperty = FindPropertyL( serviceId, EPropertyVoIPSubServicePluginId, *property );
+				TInt retProperty = FindPropertyL( serviceId, EPropertyVoIPSubServicePluginId, *property );
-if( retProperty == KErrNone )
+				if( retProperty == KErrNone )
-{
+					{
-bSubVoIP = ETrue;
+					bSubVoIP = ETrue;
-break;
+					break;
-}
+					}
-}
+				}
-CleanupStack::PopAndDestroy( property );
+			CleanupStack::PopAndDestroy( property );
-CleanupStack::PopAndDestroy( &serviceIds );
+			CleanupStack::PopAndDestroy( &serviceIds );
-ret = bFeatureMgr && bDynVoIP && bSubVoIP;
+			ret = bFeatureMgr && bDynVoIP && bSubVoIP;
-break;
+		break;
-}
+		}
-default:
+		default:
-{
+			{
-User::Leave( KErrNotSupported );
+			User::Leave( KErrNotSupported );
-}
+			}
-}
+	}
 XSPSLOGSTRING( "CSPSettingsEngine::IsFeatureSupportedL() - OUT" );
 return ret;
-}
+	}
 // ---------------------------------------------------------------------------
 // When service table is changed, update the P&S key
 // ---------------------------------------------------------------------------
 //
 void CSPSettingsEngine::UpdateSupportFeaturePSKeyL()
-{
+	{
-TInt mask = 0;
+	TInt mask = 0;
-TInt value = 0;
+	TInt value = 0;
-TBool ret = EFalse;
+	TBool ret = EFalse;
-//ESupportInternetCallFeature
+	//ESupportInternetCallFeature
-//ESupportsInternetCall + ESupportsAlphanumericAddressing + EIsVisibleInCallMenu
+	//ESupportsInternetCall + ESupportsAlphanumericAddressing + EIsVisibleInCallMenu
-mask = ESupportsInternetCall | ESupportsAlphanumericAddressing | EIsVisibleInCallMenu;
+	mask = ESupportsInternetCall | ESupportsAlphanumericAddressing | EIsVisibleInCallMenu;
-value = mask;
+	value = mask;
-ret = CheckFeatureL( mask, value );
+	ret = CheckFeatureL( mask, value );
-User::LeaveIfError( RProperty::Set( KUidSystemCategory, KSPSupportInternetCallKey, ret ) );
+	User::LeaveIfError( RProperty::Set( KUidSystemCategory, KSPSupportInternetCallKey, ret ) );
-//ESupportCallOutFeature
+	//ESupportCallOutFeature
-//ESupportsInternetCall + ESupportsMSISDNAddressing + EIsVisibleInCallMenu
+	//ESupportsInternetCall + ESupportsMSISDNAddressing + EIsVisibleInCallMenu
-mask = ESupportsInternetCall | ESupportsMSISDNAddressing | EIsVisibleInCallMenu;
+	mask = ESupportsInternetCall | ESupportsMSISDNAddressing | EIsVisibleInCallMenu;
-value = mask;
+	value = mask;
-ret = CheckFeatureL( mask, value );
+	ret = CheckFeatureL( mask, value );
-User::LeaveIfError( RProperty::Set( KUidSystemCategory, KSPSupportCallOutKey, ret ) );
+	User::LeaveIfError( RProperty::Set( KUidSystemCategory, KSPSupportCallOutKey, ret ) );
-//ESupportVoIPSSFeature
+	//ESupportVoIPSSFeature
-//ESupportVoIPSS
+	//ESupportVoIPSS
-mask = ESupportVoIPSS;
+	mask = ESupportVoIPSS;
-value = mask;
+	value = mask;
-ret = CheckFeatureL( mask, value );
+	ret = CheckFeatureL( mask, value );
-User::LeaveIfError( RProperty::Set( KUidSystemCategory, KSPSupportVoIPSSKey, ret ) );
+	User::LeaveIfError( RProperty::Set( KUidSystemCategory, KSPSupportVoIPSSKey, ret ) );
-}
+	}
 // ---------------------------------------------------------------------------
 // Walk through all the sevices and check there is any service match
 // ---------------------------------------------------------------------------
 //
 TBool CSPSettingsEngine::CheckFeatureL( TInt aMask, TInt aValue )
-{
+	{
-RArray<TInt> entryIds;
+	RArray<TInt> entryIds;
-CleanupClosePushL( entryIds );
+	CleanupClosePushL( entryIds );
-iCenRepUtils->FindEntryIdsL( entryIds );
+	iCenRepUtils->FindEntryIdsL( entryIds );
-CCenRepDatabaseProperty* property = CCenRepDatabaseProperty::NewLC();
+	CCenRepDatabaseProperty* property = CCenRepDatabaseProperty::NewLC();
-TBool ret = EFalse;
+	TBool ret = EFalse;
-for( TInt i = 0; i < entryIds.Count(); i++ )
+	for( TInt i = 0; i < entryIds.Count(); i++ )
-{
+		{
-TInt entryId = entryIds[i];
+		TInt entryId = entryIds[i];
-if( entryId == KSPDefaultVoIPServiceId )
+		if( entryId == KSPDefaultVoIPServiceId )
-{
+		    {
-continue;
+		    continue;
-}
+		    }
-TInt retProperty = iCenRepUtils->FindPropertyL( entryId, EPropertyServiceAttributeMask, *property );
+		TInt retProperty = iCenRepUtils->FindPropertyL( entryId, EPropertyServiceAttributeMask, *property );
-if( retProperty == KErrNone )
+		if( retProperty == KErrNone )
-{
+			{
-TInt maskValue = 0;
+			TInt maskValue = 0;
-TInt err = property->GetValue( maskValue );
+			TInt err = property->GetValue( maskValue );
-if( err == KErrNone )
+			if( err == KErrNone )
-{
+				{
-if( ( maskValue & aMask ) == (aValue & aMask) )
+				if( ( maskValue & aMask ) == (aValue & aMask) )
-{
+					{
-// Find matched servcie
+					// Find matched servcie
-ret = ETrue;
+					ret = ETrue;
-break;
+					break;
-}
+					}
-}
+				}
-}
+			}
-}
+		}
-CleanupStack::PopAndDestroy( property );
+	CleanupStack::PopAndDestroy( property );
-CleanupStack::PopAndDestroy( &entryIds );
+	CleanupStack::PopAndDestroy( &entryIds );
-return ret;
+	return ret;
-}
+	}
 // ---------------------------------------------------------------------------
 // Check if it is VoIP Service ID
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 // Get Name array from Property array
 // ---------------------------------------------------------------------------
 //
 void CSPSettingsEngine::NameArrayFromPropertyArrayL( RPropertyNameArray& aNameArray,
-const RPropertyArray& aPropertyArray )
+												const RPropertyArray& aPropertyArray )
 {
 aNameArray.Reset();
 for( TInt i = 0; i < aPropertyArray.Count(); i++ )
 {

branch	RCL_3
changeset 20	987c9837762f
parent 19	7d48bed6ce0c