FCL/sf/app/contacts: comparison phonebookui/Speeddial/VPbkControlSrc/speeddialprivate.cpp

equal deleted inserted replaced

-:5586b4d2ec3e
+:0d28c1c5b6dd
 #include <VPbkEng.rsg>
 #include <AiwContactAssignDataTypes.h>
 #include "SpdiaContainer.h"
+#include <MPbk2FieldPropertyArray2.h>
+#include <MPbk2FieldProperty2.h>
+#include <MPbk2FieldProperty.h>
 // LOCAL CONSTANTS AND MACROS
 //This order is based on 'Standard field ids' (PbkFields.hrh)
 const TUint KFieldIds[] =
 _LIT(KNullCell, "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t%d\t");
 _LIT(KDesTab, "\t");
 _LIT(KDesTab2, "\t\t");
+class TXspIconHelper
+{
+public:
+	TXspIconHelper( TInt aIndex, const TDesC& aLable);
+	TInt IconIndex() const;
+	TDesC& LableText();
+private:
+	TInt iIndex;
+	TBuf<50> iLableText;
+};
+TXspIconHelper::TXspIconHelper(TInt aIndex, const TDesC& aLable):
+iIndex (aIndex),
+iLableText (aLable)
+	{
+	}
+inline TInt TXspIconHelper::IconIndex() const
+	{
+	return iIndex;
+	}
+inline TDesC& TXspIconHelper::LableText()
+	{
+	return iLableText;
+	}
 // ---------------------------------------------------------
 // CSpeedDialPrivate::NewL()
 // ---------------------------------------------------------
 //
 		iContactLinkArray = NULL;
 	    iServiceHandler = CAiwServiceHandler::NewL();
 		iServiceHandler->AttachL( R_SPEEDDIAL_EMAIL_SELECTION_INTEREST );
 		iServiceHandler->AttachL( R_SPDIA_SINGLE_ASSIGN_INTEREST );
 		iWait = new( ELeave )CActiveSchedulerWait();
+iWaitFetchmail = new( ELeave )CActiveSchedulerWait();
 		iError = KErrNone;
 MVPbkContactStoreList& storeList = iContactManager->ContactStoresL();
 if ( iRemoveConfirmQueryDialog )
 {
 delete iRemoveConfirmQueryDialog;
 iRemoveConfirmQueryDialog = NULL;
 }
+ixspIconInfoArray.Close();
 }
 // ---------------------------------------------------------
 // CSpeedDialPrivate::InitializeArray
 //
 			fieldTypeList->AppendL(*fieldType);
 		}
 		MPbk2FieldPropertyArray* aPropertyArray = Pbk2FieldPropertiesFactory::CreateLC(*fieldTypeList,&iContactManager->FsSession() );
-		for(count =0; count < aPropertyArray->Count(); ++ count)
+		ixspIconInfoArray.Reset();
+		const TInt arrayCount = aPropertyArray->Count();
+		for(count =0; count < arrayCount; ++ count)
 		{
 		   icon = pbk2IconFactory->CreateIconL(aPropertyArray->At(count).IconId());
 		   aArray->AppendL(icon);
-		}
+		   // Append xSP icon info to helper array
+		   if ( aPropertyArray->At(count).FieldType().FieldTypeResId() == R_VPBK_FIELD_TYPE_IMPP )
+			   {
+			   const MPbk2FieldProperty& property = aPropertyArray->At(count);
+			   MPbk2FieldProperty2* property2 = reinterpret_cast<MPbk2FieldProperty2*>
+			           ( const_cast<MPbk2FieldProperty&> ( property ).FieldPropertyExtension(
+			                KMPbk2FieldPropertyExtension2Uid ) );
+			   TXspIconHelper helper( aArray->Count()-1, property2->XSpName() );
+			   ixspIconInfoArray.AppendL( helper );
+			   }
+		}
 		CleanupStack::PopAndDestroy(aPropertyArray);
 		delete fieldTypeList;
 		delete pbk2IconFactory;
 	}
 // ---------------------------------------------------------
 // CSpeedDialPrivate::VoiceMailL
 //
 // CSpeedDialPrivate::SetIconArrayL
 //
 // ---------------------------------------------------------
 TInt CSpeedDialPrivate::SetIconArrayL(CArrayPtrFlat<CGulIcon>* aArray)
 {
+if ( aArray != NULL )
+{
+aArray->ResetAndDestroy();
+}
+else
+{
+return 0;
+}
+CreateIndexIconsL( aArray );
+CreateFieldIconsL( aArray );
+	TInt existThumb = 0;
+	const TInt count = iSdmArray->Count();
+for (TInt index(0); index < count; index++)
+{
+if (CreateIndexIconL(index, (*iSdmArray)[index], existThumb > 0? EFalse: ETrue))
+{
+++existThumb;
+}
+}
+return existThumb;
+}
+// ---------------------------------------------------------
+// CSpeedDialPrivate::CreateIndexIconsL
+//
+// ---------------------------------------------------------
+TInt CSpeedDialPrivate::CreateIndexIconsL( CArrayPtrFlat<CGulIcon>* aArray )
+	{
 	CFbsBitmap* bitmap,*mask;
 	bitmap = NULL;
 	mask= NULL;
 	MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
-if ( aArray != NULL )
-{
-aArray->ResetAndDestroy();
-}
-else
-{
-return 0;
-}
-	TInt existThumb(0);
 for (TInt index(0); index < iSdmArray->Count(); index++)
 {
 		if(index == 0)
-		{
+		    {
-		 TUid uidVmbx;
+		    TUid uidVmbx;
-		 uidVmbx.iUid =KVmbxUid;
+		    uidVmbx.iUid =KVmbxUid;
-		 AknsUtils::CreateAppIconLC( skinInstance,uidVmbx, EAknsAppIconTypeContext,bitmap ,mask);
+		    AknsUtils::CreateAppIconLC( skinInstance,uidVmbx, EAknsAppIconTypeContext,bitmap ,mask);
-		 CleanupStack::Pop(2);
+		    CleanupStack::Pop(2);
-		}
+		    }
 		else
-		{
+		   {
 		 	if(User::Language() == ELangHindi)
-		 	{
+		 	    {
 		 		AknsUtils::CreateIconL(skinInstance, (*iDialSkinBmp)[index],bitmap,mask,iBmpPath,iDialHindiBmp[index],  iDialHindiBmpMask[index] );
-		 	}
+		 	    }
 		 	else
-		 	 {
+		 	    {
 		 	 	AknsUtils::CreateIconL(skinInstance, (*iDialSkinBmp)[index],bitmap,mask,iBmpPath,iDialBmp[index],  iDialBmpMask[index] );
-		 	 }
+		 	    }
-		}
+		    }
 		CGulIcon* icon = CGulIcon::NewL(bitmap,mask);
-CleanupStack::PushL(icon);
+	    CleanupStack::PushL(icon);
-aArray->AppendL(icon);
+	    aArray->AppendL(icon);
+	    CleanupStack::Pop(); // icon
-if (CreateIndexIconL(index,
+}
-(*iSdmArray)[index], existThumb > 0? EFalse: ETrue))
-{
+	}
-++existThumb;
-}
-CleanupStack::Pop(); // icon
-}
-		CreateFieldIconsL(aArray);
-return existThumb;
-}
 // ---------------------------------------------------------
 // CSpeedDialPrivate::VoiceMailTypeL
 //
 // ---------------------------------------------------------
 //
 	CleanupStack::PopAndDestroy( number );
 				}
 			//Push
 const MVPbkFieldType* fieldType = field->BestMatchingFieldType();
-TInt iconindex = FindIconIndex(fieldType->FieldTypeResId());
+TInt iconindex = FindIconIndex(fieldType->FieldTypeResId(), field );
 (*iSdmArray)[aIndex].SetIconIndex(iconindex);
 //No need to fetch thumbnail now...will be updated while grid is
 // drawn
 (*iSdmArray)[aIndex].SetThumbIndex(-1,NULL);
 CAiwGenericParamList& outParamList = iServiceHandler->OutParamListL();
 iServiceHandler->ExecuteServiceCmdL(KAiwCmdSelect, inParamList,
 outParamList, 0, this);
 }
 );
-iOperationComplete = EFalse;
+iFetchmailComplete = EFalse;
 // Wait till the contact is selected
-while ( !iOperationComplete )
+while ( !iFetchmailComplete )
 {
-Wait();
+WaitFetchMail();
 }
 iFetchmail = EFalse;
 return iMail;
 }
 	{
 TInt length = paramMail->Value().AsDes().Length();
 iMail = HBufC::NewL(length);
 iMail->Des().Append(paramMail->Value().AsDes());
 	}
-	            iOperationComplete = ETrue;
-	    		Release();
+if( iFetchmail )
+{
+iFetchmailComplete = ETrue;
+ReleaseFetchMail();
+}
+else
+{
+iOperationComplete = ETrue;
+Release();
+}
 }
 else if (aEventId == KAiwEventCanceled)
 {
 	iError = KErrCancel;
-	            iOperationComplete = ETrue;
-	    		Release();
+if( iFetchmail )
+{
+iFetchmailComplete = ETrue;
+ReleaseFetchMail();
+}
+else
+{
+iOperationComplete = ETrue;
+Release();
+	                }
 }
 else if (aEventId == KAiwEventError)
 	{
 	   	iError = KErrInUse;
 	           	iOperationComplete = ETrue;
 	    MVPbkStoreContactField* field = (*iSdmArray)[aIndex].Field();
 		if(field)
 		{
 			fieldId = field->BestMatchingFieldType()->FieldTypeResId();
 		}
-	    aSdmData.SetIconIndex(FindIconIndex(fieldId));
+	    aSdmData.SetIconIndex(FindIconIndex(fieldId, field ));
 		// check for the functionality, why he is checking has thumbnail before adding
 		if (iImageManager->HasImage(*aSdmData.Contact(),*iThumbNailFieldType))
 		{
 // CSpeedDialPrivate::FindIconIndex
 //
 // ---------------------------------------------------------
 //
-TInt CSpeedDialPrivate::FindIconIndex(TInt aId) const
+TInt CSpeedDialPrivate::FindIconIndex( TInt aId, MVPbkStoreContactField* aField ) //const
 {
 TInt index(KNullIndexData);
-for (TInt n(0); index == KNullIndexData && n < (sizeof KFieldIds/sizeof KFieldIds[0]); ++n)
-{
+	// If impp field, find xSP icon info from helper
-if ((TUint)aId == KFieldIds[n] )
+if ( aField && ( aId == R_VPBK_FIELD_TYPE_IMPP ) )
+	{
+	TPtrC scheme = MVPbkContactFieldUriData::Cast( aField->FieldData()).Scheme();
+	const TInt count = ixspIconInfoArray.Count();
+	for ( TInt i=0; i < count; i++ )
+		{
+		if ( !scheme.CompareF( ixspIconInfoArray[i].LableText() ) )
+			{
+			index = ixspIconInfoArray[i].IconIndex();
+			break;
+			}
+		}
+	}
+// If not impp field, calculate icon index as below
+else
+	{
+for (TInt n(0); index == KNullIndexData && n < (sizeof KFieldIds/sizeof KFieldIds[0]); ++n)
 {
-index = n + iSdmCount;
+if ((TUint)aId == KFieldIds[n] )
+{
+index = n + iSdmCount;
+}
 }
-}
+	}
 return index;
 }
 // ---------------------------------------------------------
 	iWait->Start();
 }
 // ---------------------------------------------------------
+// CSpeedDialPrivate::WaitFetchMail
+//
+// ---------------------------------------------------------
+//
+void CSpeedDialPrivate::WaitFetchMail()
+{
+if ( !( iWaitFetchmail->IsStarted() ) )
+{
+iWaitFetchmail->Start();
+}
+}
+// ---------------------------------------------------------
+// CSpeedDialPrivate::ReleaseFetchMail
+//
+// ---------------------------------------------------------
+//
+void CSpeedDialPrivate::ReleaseFetchMail()
+{
+if ( iWaitFetchmail->IsStarted() )
+{
+iWaitFetchmail->AsyncStop();
+}
+}
+// ---------------------------------------------------------
 // CSpeedDialPrivate::Cancel
 // To cancel the aiw event
 // ---------------------------------------------------------
 //
 TBool CSpeedDialPrivate::Cancel()

branch	RCL_3
changeset 26	0d28c1c5b6dd
parent 3	04ab22b956c2
child 32	2828b4d142c0