FCL/sf/app/commonemail: comparison emailcontacts/contactactionservice/src/cfscactionutils.cpp

equal deleted inserted replaced

-:c8382f7b54ef
+:726fba06891a
 #include <eikapp.h>
 #include <apgcli.h>
 #include <centralrepository.h>
 #include <CoreApplicationUIsSDKCRKeys.h>
 #include <settingsinternalcrkeys.h>
+//<cmail> Header neither in Cmail nor in the platform
 #include <crcseprofileregistry.h>
+//</cmail>
 #include <NetworkHandlingDomainPSKeys.h>
 #include <MVPbkStoreContact.h>
 #include <MVPbkStoreContactFieldCollection.h>
 #include <MVPbkStoreContactField.h>
 #include <MVPbkFieldType.h>
 #include <TVPbkFieldVersitProperty.h>
 #include <MVPbkContactFieldData.h>
 #include <MVPbkContactFieldTextData.h>
+//<cmail>
 #include "fscactionplugincrkeys.h"
 #include "fsccontactactionservicedefines.h"
+//</cmail>
 #include <FscActionUtils.rsg>
 #include <barsread.h>
 #include <Pbk2ContactNameFormatterFactory.h>
 #include <MPbk2ContactNameFormatter.h>
 #include <CPbk2SortOrderManager.h>
 #include <CVPbkContactManager.h>
 #include <MPbk2FieldProperty.h>
 #include <CVPbkFieldTypeSelector.h>
 #include <CVPbkFieldFilter.h>
 #include <commonphoneparser.h>
-#include <bautils.h>
+#include <bautils.h> // Fix for EMZG-7M23KX
+//<cmail> hardcoded paths removal
 #include <data_caging_path_literals.hrh>
+//</cmail>
 #include "cfscactionutils.h"
 #include "cfsccontactaction.h"
 #include "mfscreasoncallback.h"
 #include <VPbkFieldType.hrh>
 #include "FscPresentationUtils.h"
 }
 const TUint32 KPoCDefaultSettings = 0x199;
 const TInt KMaxLengthOfNumber = 100;
-const TInt KMaxLengthOfAddrData = 255;
-const TInt KMaxLengthOfName = 256; // same as max addr len + extra whitespace
+//Fix for: ECWG-7QYAVS
+const TInt KMaxLengthOfName = 100;
+//end for fix
 _LIT( KSpace, " " );
+//<cmail> hard coded path removed
 _LIT( KFscRscFileName, "fscactionutils.rsc" );
+//</cmail>
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // CFscActionUtils::NewL
 {
 FUNC_LOG;
 delete iRep;
 if ( iRCSEProfileRegistry != NULL )
 {
+//<cmail>
 delete iRCSEProfileRegistry;
+//</cmail>
 }
 }
 // ---------------------------------------------------------------------------
 // CFscActionUtils::ContactManager
 void CFscActionUtils::ShowInfoNoteL( TInt aNote, const HBufC* aContactName )
 {
 FUNC_LOG;
 HBufC* noteText = NULL;
+// Fix for EMZG-7M23KX
 TInt offset = FindAndAddResourceFileL();
 if ( aContactName )
 {
 noteText = StringLoader::LoadL( aNote, *aContactName );
 void CFscActionUtils::ShowInfoNoteL( TInt aNote, TInt aCounter )
 {
 FUNC_LOG;
 HBufC* noteText = NULL;
+// Fix for EMZG-7M23KX
 TInt offset = FindAndAddResourceFileL();
 noteText = StringLoader::LoadL( aNote, aCounter );
 CleanupStack::PushL( noteText );
 //
 void CFscActionUtils::ShowCnfNoteL( TInt aNote, const HBufC* aName )
 {
 FUNC_LOG;
+// Fix for EMZG-7M23KX
 TInt offset = FindAndAddResourceFileL();
 HBufC* noteText = NULL;
 if ( aName )
 // CFscActionUtils::GetContactNameL
 // ---------------------------------------------------------------------------
 HBufC* CFscActionUtils::GetContactNameL( MVPbkStoreContact& aStoreContact )
 {
 FUNC_LOG;
+HBufC* contactName = HBufC::NewLC( KMaxLengthOfName + 1 ); // one ' ' char
-TBuf<KMaxLengthOfName> contactName;
+// Search for the contact name
+// Fix for EMZG-7M23KX
 TInt offset = FindAndAddResourceFileL();
-TInt err( KErrNone );
+TResourceReader selectorReader;
-TRAP( err, AppendFieldToContactL(
+CCoeEnv::Static()->CreateResourceReaderLC( selectorReader,
-contactName, R_FSC_FIRST_NAME_SELECTOR, aStoreContact ) );
+R_FSC_FIRST_NAME_SELECTOR );
-if ( err == KErrNone )
-{
+CVPbkFieldTypeSelector* fieldTypeSelector = CVPbkFieldTypeSelector::NewL(
-TRAP( err, AppendFieldToContactL(
+selectorReader, iContactManager.FieldTypes() );
-contactName, R_FSC_LAST_NAME_SELECTOR, aStoreContact,
+CleanupStack::PopAndDestroy(); // selectorReader
-ETrue ) );
-}
+CVPbkFieldFilter::TConfig config(
-if ( err == KErrNone && contactName.Length() <= 0 )
+const_cast<MVPbkStoreContactFieldCollection&> (
-{
+aStoreContact.Fields() ), fieldTypeSelector, NULL );
-// If no first or last name was found, try to append company name
-TRAP_IGNORE( AppendFieldToContactL(
+CVPbkFieldFilter* fieldFilter = CVPbkFieldFilter::NewL( config );
-contactName, R_FSC_COMPANY_NAME_SELECTOR, aStoreContact ) );
+TInt fieldCount = fieldFilter->FieldCount();
-}
+const MVPbkStoreContactField* field = NULL;
+if ( fieldCount == 1 )
-// If there was an error or the contact name is zero length, use
+{
-// pre-defined unnamed string instead..
+field = fieldFilter->FieldAtLC(0);
-if ( err != KErrNone || contactName.Length() <= 0 )
+contactName->Des().Append(
-{
+MVPbkContactFieldTextData::Cast(
+field->FieldData() ).Text() );
+CleanupStack::PopAndDestroy();//field
+}
+delete fieldFilter;
+delete fieldTypeSelector;
+// Search for the contact second name
+CCoeEnv::Static()->CreateResourceReaderLC( selectorReader,
+R_FSC_LAST_NAME_SELECTOR );
+fieldTypeSelector = CVPbkFieldTypeSelector::NewL( selectorReader,
+iContactManager.FieldTypes() );
+CleanupStack::PopAndDestroy();//selectorReader
+config.iFieldSelector = fieldTypeSelector;
+fieldFilter = CVPbkFieldFilter::NewL( config );
+fieldCount = fieldFilter->FieldCount();
+if ( fieldCount == 1 )
+{
+field = fieldFilter->FieldAtLC(0);
+if ( contactName->Des().Length() > 0 )
+{
+contactName->Des().Append( KSpace );
+}
+contactName->Des().Append(
+MVPbkContactFieldTextData::Cast(
+field->FieldData() ).Text() );
+CleanupStack::PopAndDestroy();//field
+}
+// If first or second name hasn't been found -> find company name
+if ( contactName->Des().Length() <= 0 )
+{
+delete fieldFilter;
+delete fieldTypeSelector;
+CCoeEnv::Static()->CreateResourceReaderLC( selectorReader,
+R_FSC_COMPANY_NAME_SELECTOR );
+fieldTypeSelector = CVPbkFieldTypeSelector::NewL( selectorReader,
+iContactManager.FieldTypes() );
+CleanupStack::PopAndDestroy();//selectorReader
+config.iFieldSelector = fieldTypeSelector;
+fieldFilter = CVPbkFieldFilter::NewL( config );
+fieldCount = fieldFilter->FieldCount();
+if ( fieldCount == 1 )
+{
+field = fieldFilter->FieldAtLC(0);
+contactName->Des().Append(
+MVPbkContactFieldTextData::Cast(
+field->FieldData() ).Text() );
+CleanupStack::PopAndDestroy();//field
+}
+}
+// no first or second name, nor company name -> return "unnamed" string
+if ( contactName->Des().Length() <= 0 )
+{
+//append (Unnamed)
 HBufC* unnamed = StringLoader::LoadL( R_QTN_FS_UNNAMED );
-contactName.Zero();
+contactName->Des().Append( *unnamed );
-contactName.Append( *unnamed );
 delete unnamed;
 }
+delete fieldFilter;
+delete fieldTypeSelector;
+CleanupStack::Pop( contactName );
 CCoeEnv::Static()->DeleteResourceFile( offset );
-return contactName.AllocL();
+return contactName;
 }
 // ---------------------------------------------------------------------------
 // CFscActionUtils::OpenSelectDialogL
 // ---------------------------------------------------------------------------
 iContactManager.FieldTypes(), *sortOrderManager );
 CFscFieldPropertyArray* fieldProperties =
 CFscFieldPropertyArray::NewL( iContactManager.FieldTypes() );
+// Fix for EMZG-7M23KX
 TInt offset = FindAndAddResourceFileL();
 // Create resource reader for new resource
 TResourceReader resReader;
 case R_FSC_MSG_SELECT:
 {
 defaultPrioritiesArray.Append( EVPbkDefaultTypeSms );
 defaultPrioritiesArray.Append( EVPbkDefaultTypeMms );
+// Fix for ELWG-7SPH5H
 params.SetUseDefaultDirectly( ETrue );
 break;
 }
 case R_FSC_EMAIL_SELECT:
 {
 aNumber.Copy( phoneNumberFieldData );
 }
 // Format phone number
+//Fix for: MHOA-7SQF6T
 CommonPhoneParser::ParsePhoneNumber( aNumber,
 CommonPhoneParser::EPlainPhoneNumber );
+//end for fix
 }
 // Destroy objects
 delete selectedField;
 {
 aNumber.Copy( phoneNumberFieldData );
 }
 // Format phone number
+//Fix for: MHOA-7SQF6T
 CommonPhoneParser::ParsePhoneNumber( aNumber,
 CommonPhoneParser::EPlainPhoneNumber );
+//end for fix
 }
 // Destroy objects
 delete selectedField;
 ret = KErrNotFound;
 }
 }
 // Format phone number
+//Fix for: MHOA-7SQF6T
 CommonPhoneParser::ParsePhoneNumber( aVoipAddress,
 CommonPhoneParser::EPlainPhoneNumber );
+//end for fix
 // Destroy objects
 delete selectedField;
 return ret;
 }
 TInt ret = KErrNone;
 // Search for conference number
+// Fix for EMZG-7M23KX
 TInt offset = FindAndAddResourceFileL();
 TResourceReader selectorReader;
 CCoeEnv::Static()->CreateResourceReaderLC( selectorReader,
 R_FSC_CONF_NUMBER_SELECTOR );
 return ret;
 }
 // ---------------------------------------------------------------------------
-// CFscActionUtils::GetMessageAddressL
+// CFscActionUtils::GetEmailAddressL
 // ---------------------------------------------------------------------------
 //
 TInt CFscActionUtils::GetMessageAddressL( MVPbkStoreContact& aStoreContact,
 TDes& aMsgAddress )
 {
 {
 // Copy message address from selected field
 TPtrC msgAddress = MVPbkContactFieldTextData::Cast(
 selectedField->FieldData() ).Text();
-if ( msgAddress.Length() &&
+if ( msgAddress.Length() )
-msgAddress.Length() <= KMaxLengthOfAddrData )
 {
 aMsgAddress.Copy( msgAddress );
 }
 else
 {
 {
 // Copy email address from selected field
 TPtrC emailAddress = MVPbkContactFieldTextData::Cast(
 selectedField->FieldData() ).Text();
-if ( emailAddress.Length() &&
+if ( emailAddress.Length() )
-emailAddress.Length() <= KMaxLengthOfAddrData )
 {
 aEmailAddress.Copy( emailAddress );
 }
 else
 {
 FUNC_LOG;
 TBool available( EFalse );
 // Search for the contact name
+// Fix for EMZG-7M23KX
 TInt offset = FindAndAddResourceFileL();
 TResourceReader selectorReader;
 CVPbkFieldTypeSelector* fieldTypeSelector = NULL;
 CVPbkFieldFilter* fieldFilter = NULL;
+TInt fieldCount = 0;
 TInt selector = 0;
 switch ( aContactNumberType )
 {
 case ETypeVoiceCallNumber:
 CCoeEnv::Static()->CreateResourceReaderLC( selectorReader, selector );
 fieldTypeSelector = CVPbkFieldTypeSelector::NewL( selectorReader,
 iContactManager.FieldTypes() );
 CleanupStack::PopAndDestroy(); // selectorReader
-CleanupStack::PushL( fieldTypeSelector );
 CVPbkFieldFilter::TConfig config(
 const_cast<MVPbkStoreContactFieldCollection&> (
 aStoreContact.Fields() ), fieldTypeSelector, NULL);
 fieldFilter = CVPbkFieldFilter::NewL( config );
-CleanupStack::PushL( fieldFilter );
+fieldCount = fieldFilter->FieldCount();
-if ( fieldFilter->FieldCount() )
+if ( fieldCount )
 {
 if ( selector == R_FSC_CONF_NUMBER_SELECTOR )
 {
 TBuf<KMaxLengthOfNumber> confNum;
 const MVPbkStoreContactField* field = NULL;
 field = fieldFilter->FieldAtLC(0);
 confNum.Append( MVPbkContactFieldTextData::Cast(
 field->FieldData() ).Text() );
-CleanupStack::PopAndDestroy(); // field
+CleanupStack::PopAndDestroy();//field
 if ( CommonPhoneParser::IsValidPhoneNumber( confNum,
 CommonPhoneParser::EContactCardNumber ) )
 {
 available = ETrue;
 else
 {
 available = ETrue;
 }
 }
-CleanupStack::PopAndDestroy( 2 ); // fieldFilter, fieldTypeSelector
+delete fieldFilter;
+delete fieldTypeSelector;
 }
 CCoeEnv::Static()->DeleteResourceFile( offset );
 return available;
 {
 TInt settingsId;
 TInt err = cenRep->Get( KPoCDefaultSettings, settingsId );
 if ( err == KErrNone )
 {
-result = ( settingsId != KErrNotFound );
+result = (settingsId != KErrNotFound );
 }
 delete cenRep;
 }
 return result;
 TBool configured = EFalse;
 if ( iRCSEProfileRegistry != NULL )
 {
 RArray<TUint32> ids;
 CleanupClosePushL( ids );
+//<cmail>
 iRCSEProfileRegistry->GetAllIdsL( ids );
+//</cmail>
 configured = ids.Count() > 0;
 CleanupStack::PopAndDestroy( &ids );
 }
 return configured;
 FUNC_LOG;
 TRAP_IGNORE( iRep = CRepository::NewL( KCRUidFsContactActionService ) );
 if ( FeatureManager::FeatureSupported( KFeatureIdCommonVoip ) )
 {
+//<cmail>
 TRAP_IGNORE( iRCSEProfileRegistry = CRCSEProfileRegistry::NewL() );
-}
+//</cmail>
+}
+//<cmail>
+//iRCSEProfileRegistry = NULL;
+//</cmail>
 }
 // ---------------------------------------------------------------------------
 // CFscActionUtils::GetFileDir
 // ---------------------------------------------------------------------------
 fileName.Append( aFilePath );
 return fileName;
 }
+// Fix for EMZG-7M23KX
 // ---------------------------------------------------------------------------
 // CFscActionUtils::FindAndAddResourceFileL
 // ---------------------------------------------------------------------------
 //
 TInt CFscActionUtils::FindAndAddResourceFileL()
 {
 FUNC_LOG;
+//<cmail> hardcoded removed
 TFileName resourceFileName( KDC_RESOURCE_FILES_DIR );
-resourceFileName.Append( KFscRscFileName );
+resourceFileName.Append(KFscRscFileName);
+//</cmail>
 BaflUtils::NearestLanguageFile( CCoeEnv::Static()->FsSession(), resourceFileName );
-return CCoeEnv::Static()->AddResourceFileL( resourceFileName );
+TInt offset = CCoeEnv::Static()->AddResourceFileL( resourceFileName );
+return offset;
 }
 // ---------------------------------------------------------------------------
 // CFscActionUtils::CloseSelectDialogL
 // ---------------------------------------------------------------------------
 //
 {
 iAddressSelect->AttemptExitL( EFalse );
 }
 }
-// ---------------------------------------------------------------------------
-// CFscActionUtils::AppendFieldToContactL
+// ======== GLOBAL FUNCTIONS ========
-// ---------------------------------------------------------------------------
-//
-void CFscActionUtils::AppendFieldToContactL( TDes& aContact,
-TInt aFieldResourceId,
-MVPbkStoreContact& aStoreContact,
-TBool aAddSpace )
-{
-FUNC_LOG;
-TResourceReader selectorReader;
-CCoeEnv::Static()->CreateResourceReaderLC( selectorReader,
-aFieldResourceId );
-CVPbkFieldTypeSelector* fieldTypeSelector = CVPbkFieldTypeSelector::NewL(
-selectorReader, iContactManager.FieldTypes() );
-CleanupStack::PopAndDestroy(); // selectorReader
-CleanupStack::PushL( fieldTypeSelector );
-CVPbkFieldFilter::TConfig config(
-const_cast<MVPbkStoreContactFieldCollection&> (
-aStoreContact.Fields() ), fieldTypeSelector, NULL );
-CVPbkFieldFilter* fieldFilter = CVPbkFieldFilter::NewL( config );
-CleanupStack::PushL( fieldFilter );
-if ( fieldFilter->FieldCount() == 1 )
-{
-if ( aAddSpace && aContact.Length() > 0 )
-{
-if ( aContact.Length() < KMaxLengthOfName )
-{
-aContact.Append( KSpace );
-}
-else
-{
-User::Leave( KErrOverflow );
-}
-}
-MVPbkStoreContactField* field = fieldFilter->FieldAtLC( 0 );
-TPtrC castFieldText = MVPbkContactFieldTextData::Cast(
-field->FieldData() ).Text();
-if ( ( aContact.Length() + castFieldText.Length() ) > KMaxLengthOfName )
-{
-User::Leave( KErrOverflow );
-}
-aContact.Append( castFieldText );
-CleanupStack::PopAndDestroy( field );
-}
-CleanupStack::PopAndDestroy( 2 ); // fieldFilter, fieldTypeSelector
-}

branch	RCL_3
changeset 80	726fba06891a
parent 73	c8382f7b54ef