--- a/phonebookui/Phonebook2/NamesListExtension/src/cpbk2openmycardcmd.cpp	Fri Mar 12 15:41:25 2010 +0200
+++ b/phonebookui/Phonebook2/NamesListExtension/src/cpbk2openmycardcmd.cpp	Mon Mar 15 12:39:26 2010 +0200
@@ -18,16 +18,27 @@
 
 // INCLUDE FILES
 #include "cpbk2openmycardcmd.h"
+#include "cpbk2mycard.h"
 #include <CPbk2NamesListControl.h>
 #include <MPbk2CommandObserver.h>
 #include <MVPbkBaseContact.h>
 #include <ccappmycardpluginuids.hrh>
+#include <spbcontactdatamodel.h>
+#include <pbk2exnameslistres.rsg>
+#include <CPbk2FieldPropertyArray.h>
+#include <CPbk2StoreSpecificFieldPropertyArray.h>
+#include <CPbk2PresentationContact.h>
+#include <CPbk2StorePropertyArray.h>
+#include <MVPbkContactStoreProperties.h>
+#include <MVPbkContactStore.h>
 
 //Cca
 #include <mccaparameter.h>
 #include <mccaconnection.h>
 #include <ccafactory.h>
 
+#include <s32mem.h>
+
 // Debugging headers
 #include <Pbk2Debug.h>
 #include <Pbk2Profile.h>
@@ -38,11 +49,13 @@
 //
 CPbk2OpenMyCardCmd::CPbk2OpenMyCardCmd(
     MPbk2ContactUiControl* aUiControl,
+    CPbk2MyCard* aMyCard,
     MCCAConnection*& aCCAConnection ) :
         CActive( EPriorityStandard ),
         iUiControl( aUiControl ),
         iConnectionRef(aCCAConnection),
-        iViewUid( TUid::Uid( KCCAMyCardPluginImplmentationUid ) ) // default mycard view
+        iViewUid( TUid::Uid( KCCAMyCardPluginImplmentationUid ) ), // default mycard view
+        iMyCard( aMyCard )
     {
     CActiveScheduler::Add( this );
     }
@@ -61,6 +74,9 @@
         {
         iUiControl->RegisterCommand( NULL );
         }
+    delete iPresentationContact;
+    delete iSpecificFieldProperties;
+    delete iFieldProperties;
     }
 
 // --------------------------------------------------------------------------
@@ -69,10 +85,11 @@
 //
 CPbk2OpenMyCardCmd* CPbk2OpenMyCardCmd::NewL(
     MCCAConnection*& aCCAConnection,
+    CPbk2MyCard* aMyCard,
     MPbk2ContactUiControl* aUiControl )
     {
-    CPbk2OpenMyCardCmd* self = new ( ELeave ) CPbk2OpenMyCardCmd
-        ( aUiControl, aCCAConnection );
+    CPbk2OpenMyCardCmd* self = new ( ELeave ) CPbk2OpenMyCardCmd(
+        aUiControl, aMyCard, aCCAConnection );
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
@@ -146,6 +163,41 @@
     CleanupClosePushL( *parameter );
     parameter->SetConnectionFlag( MCCAParameter::ENormal );
     parameter->SetLaunchedViewUid( iViewUid );
+    
+    if( iMyCard )
+        {
+        // Speed up mycard launching by constructing the view model here.
+        // This information is not mandatory for mycard launching however.
+        CBufFlat* buffer = CBufFlat::NewL( KKilo );
+        CleanupStack::PushL( buffer );
+        RBufWriteStream stream( *buffer );
+        CleanupClosePushL( stream );
+
+        // create model and dump it into stream
+        CSpbContactDataModel* model = CSpbContactDataModel::NewL( 
+            iMyCard->ContactManager(), *CCoeEnv::Static(), 
+            R_PBK2_MYCARD_FIELD_CLIP_SELECTOR );
+        CleanupStack::PushL( model );
+
+        if( iMyCard->MyCardState() == CPbk2MyCard::EExisting )
+            {
+            // preset contact data model to contain my cards data.
+            CPbk2PresentationContact* contact = PresentationContactL();
+            if( contact )
+                {
+                model->SetDataL( *contact, NULL );
+                }
+            }
+        model->ExternalizeL( stream );
+        CleanupStack::PopAndDestroy( 2, &stream ); // model
+
+        // set model dump as parameter
+        TPtrC8 buf( buffer->Ptr( 0 ) );
+        TPtrC16 data( (TUint16*)buf.Ptr(), ( buf.Size() + 1 ) / 2 );
+        parameter->SetContactDataFlag( MCCAParameter::EContactDataModel );
+        parameter->SetContactDataL( data );
+        CleanupStack::PopAndDestroy( buffer ); 
+        }
 
     // Sync call
     iConnectionRef->LaunchAppL( *parameter );
@@ -166,6 +218,59 @@
     SetActive();
     }
 
+// ---------------------------------------------------------------------------
+// CPbk2OpenMyCardCmd::PresentationContactL
+// ---------------------------------------------------------------------------
+//
+CPbk2PresentationContact* CPbk2OpenMyCardCmd::PresentationContactL()
+    {
+    if( !iPresentationContact )
+        {
+        if( !iMyCard )
+            {
+            return NULL;
+            }
+            
+        MVPbkStoreContact* storeContact = iMyCard->MyCardStoreContact();
+        if( !storeContact )
+            {
+            return NULL;
+            }
+        
+        const MVPbkContactStoreProperties& storeProperties =
+            storeContact->ParentStore().StoreProperties();
+        const MVPbkFieldTypeList& supportedFieldTypes =
+            storeProperties.SupportedFields();
+    
+        if( !iFieldProperties )
+            {
+            iFieldProperties = CPbk2FieldPropertyArray::NewL(
+                supportedFieldTypes, CCoeEnv::Static()->FsSession() );
+            }
+    
+        // Create a field property list of the supported
+        // field types of the used store
+        CPbk2StorePropertyArray* pbk2StoreProperties = CPbk2StorePropertyArray::NewL();
+        CleanupStack::PushL( pbk2StoreProperties );
+    
+        if( !iSpecificFieldProperties )
+            {
+            iSpecificFieldProperties = CPbk2StoreSpecificFieldPropertyArray::NewL(
+                *iFieldProperties,
+                *pbk2StoreProperties,
+                supportedFieldTypes,
+                storeContact->ParentStore() );
+            }
+    
+        iPresentationContact = CPbk2PresentationContact::NewL( 
+            *storeContact, *iSpecificFieldProperties );
+        
+        CleanupStack::PopAndDestroy( pbk2StoreProperties );
+        }
+    return iPresentationContact;
+    }
+
+
 // --------------------------------------------------------------------------
 // CPbk2OpenMyCardCmd::IssueRequest
 // --------------------------------------------------------------------------