FCL/sf/app/messaging: comparison messagingapp/msgappfw/plugins/msgplugin/src/ccsmsghandler.cpp

equal deleted inserted replaced

-:35b64624a9e7
+:36f374c67aa8
 // USER INCLUDES
 #include "ccsmsghandler.h"
 #include "msgbiouids.h"
+#include "ccsdefs.h"
 // SYSTEM INCLUDES
 #include <smsclnt.h>
 #include <mmsclient.h>
 #include <mtclreg.h>
 // ----------------------------------------------------------------------------
 //
 CCsMsgHandler::~CCsMsgHandler()
 {
 PRINT ( _L("Enter CCsMsgHandler::~CCsMsgHandler") );
+if(iIdle)
+{
+iIdle->Cancel();
+delete iIdle;
+iIdle=NULL;
+}
 if(iMsgPluginUtility)
 {
 delete iMsgPluginUtility;
 iMsgPluginUtility = NULL;
 }
 {
 delete iSession;
 iSession = NULL;
 }
-if ( iRootEntry )
-{
-delete iRootEntry;
-iRootEntry = NULL;
-}
-if ( iMessages )
-{
-	    iMessages->Reset();
-delete iMessages;
-iMessages = NULL;
-}
 if(iMessageArray)
 {
 iMessageArray->Reset();
 iMessageArray->Close();
 delete iMessageArray;
 iSession = CMsvSession::OpenSyncL(*this);
 iMsgPluginUtility = CCsMsgPluginUtility::NewL();
-iConverstationEntryList = new(ELeave)RPointerArray<CCsConversationEntry>();
+iConverstationEntryList = new(ELeave) RPointerArray<CCsConversationEntry>(1);
 iMtmRegistry = CClientMtmRegistry::NewL( *iSession );
 iSmsMtm = static_cast<CSmsClientMtm*>( iMtmRegistry->
 NewMtmL( KSenduiMtmSmsUid ) );
 NewMtmL( KSenduiMtmMmsUid ) );
 iState = EReadInbox;
 iMessageArray = new (ELeave)RArray <TMsvId>(KMessageArrayGranularity);
-iMessageCount = 0;
 PRINT ( _L("End CCsMsgHandler::ConstructL") );
 }
 // ----------------------------------------------------------------------------
 if ( entry.Parent() == KMsvGlobalInBoxIndexEntryIdValue ||
 entry.Parent() == KMsvSentEntryIdValue ||
 entry.Parent() == KMsvGlobalOutBoxIndexEntryIdValue )
 {
+CleanupResetAndDestroyPushL(addressList);
 iMsgPluginUtility->CreateContactL(iSession, entry, addressList);
 //process entry
 ExtractAddressesL(entry, ERead, addressList);
-addressList.ResetAndDestroy();
+// Cleanup addressList
+CleanupStack::PopAndDestroy(&addressList);
 }
 PRINT ( _L("Exit CCsMsgHandler::ProcessResultsL") );
 }
 {
 // sent/inbox/Outbox entry
 if ( aParent == KMsvSentEntryIdValue ||
 aParent == KMsvGlobalInBoxIndexEntryIdValue )
 {
+CleanupResetAndDestroyPushL(addressList);
 // currently server needs number, so getting it from header
 iMsgPluginUtility->CreateContactL(iSession, entry,
 addressList);
 //process entry
 // entry created in sent already exists, hence an update
 ExtractAddressesL(entry, EUpdate, addressList);
-addressList.ResetAndDestroy();
+CleanupStack::PopAndDestroy(&addressList);
 }
 //for drafts and outbox, the entry changes multiple times,
 // so making a check if entry has changed
 else if(aParent == KMsvGlobalOutBoxIndexEntryIdValue)
 // if the entry state is sent, we dont need to process it
 // as it is going to appear in sent items
 if( ECsSendStateSent != iMsgPluginUtility->GetSendState(entry) )
 {
+CleanupResetAndDestroyPushL(addressList);
 // currently server needs number, so getting it from header
 iMsgPluginUtility->CreateContactL(iSession, entry,
 addressList);
 //process entry
 // entry created in sent already exists, hence an update
 ExtractAddressesL(entry, EUpdate, addressList);
 iPrevEntry = entry;
-addressList.ResetAndDestroy();
+CleanupStack::PopAndDestroy(&addressList);
 }
 }//end check changed entry
 }
 }
 }//end for loop
 HBufC* contact = NULL;
 HBufC* sDescription = NULL;
 if (aContact.Length()>0)
 {
-contact = aContact.AllocL();
+contact = aContact.AllocLC();
-CleanupStack::PushL(contact);
 }
 if (aDescription.Length()>0)
 {
-sDescription = aDescription.AllocL();
+sDescription = aDescription.AllocLC();
-CleanupStack::PushL(sDescription);
 }
 //use utility to create conversation entry
 CCsConversationEntry *conversationEntry = iMsgPluginUtility->CreateConversationEntryL(
 contact,
 if ( (aEntry.iBioType &&
 	      aEntry.iBioType != KUidMsgSubTypeMmsAudioMsg.iUid ) ||
 		  aEntry.iMtm == KSenduiMtmBtUid )
 {
-tmpBuffer = aEntry.iDescription.AllocL();
+tmpBuffer = aEntry.iDescription.AllocLC();
 description.Set( tmpBuffer->Des() );
 }
 else if ( aEntry.iMtm == KSenduiMtmSmsUid )
 {
 iSmsMtm->SwitchCurrentEntryL( aEntry.Id() );
 iSmsMtm->LoadMessageL();
 CRichText& body = iSmsMtm->Body();
 TInt smsLength = body.DocumentLength();
-tmpBuffer = HBufC::NewL(smsLength);
+tmpBuffer = HBufC::NewLC(smsLength);
 TPtr ptr(tmpBuffer->Des());
 body.Extract(ptr, 0);
 description.Set( tmpBuffer->Des() );
 }
 else if ( aEntry.iMtm == KSenduiMtmMmsUid  ||
 	          aEntry.iMtm == KSenduiMMSNotificationUid)
 {
-tmpBuffer = aEntry.iDescription.AllocL();
+tmpBuffer = aEntry.iDescription.AllocLC();
 description.Set( tmpBuffer->Des() );
 iMmsMtm->SwitchCurrentEntryL( aEntry.Id() );
 iMmsMtm->LoadMessageL();
 else
 {
 // Unknown
 ProcessEntryL(aEvent, KNullDesC, description, aEntry);
 }
-delete tmpBuffer;
+//Cleanup tmpBuffer
+if ( tmpBuffer )
+{
+		 CleanupStack::PopAndDestroy();
+}
 PRINT ( _L("Exit CCsMsgHandler::ExtractAddressesL") );
 }
 // -----------------------------------------------------------------------------
 // CCsMsgHandler::UploadMsgL()
 // State machine to upload all messages
 // -----------------------------------------------------------------------------
 //
 TInt CCsMsgHandler::UploadMsgL()
 {
+//Release scheduler for scheduling.
+User::After(1);
 switch ( iState )
 {
 case EReadInbox:
 {
-iRootEntry = iSession->GetEntryL(KMsvGlobalInBoxIndexEntryId);
+UpdateMessageArrayL(KMsvGlobalInBoxIndexEntryId);
-// Set sort order
-TMsvSelectionOrdering order;
-order.SetSorting(EMsvSortById);
-iRootEntry->SetSortTypeL(order);
-iMessages = iRootEntry->ChildrenL();
-iMessageCount = iRootEntry->Count();
-if(iMessageCount)
-{
-for(int i = 0; i < iMessageCount; i ++)
-{
-iMessageArray->Append(iMessages->At(i));
-}
-}
 iState = EReadSent;
-CleanupL();
 return 1;
 }
 case EReadSent:
 {
-iRootEntry = iSession->GetEntryL(KMsvSentEntryId);
+UpdateMessageArrayL(KMsvSentEntryId);
-// Set sort order
-TMsvSelectionOrdering order;
-order.SetSorting(EMsvSortById);
-iRootEntry->SetSortTypeL(order);
-iMessages = iRootEntry->ChildrenL();
-iMessageCount = iRootEntry->Count();
-if(iMessageCount)
-{
-for(int i = 0; i < iMessageCount; i++ )
-{
-iMessageArray->Append(iMessages->At(i));
-}
-}
 iState = EReadOutbox;
-CleanupL();
 return 1;
 }
 case EReadOutbox:
 {
-iRootEntry = iSession->GetEntryL(KMsvGlobalOutBoxIndexEntryId);
+UpdateMessageArrayL(KMsvGlobalOutBoxIndexEntryId);
+iState = ESortEntries;
-// Set sort order
-TMsvSelectionOrdering order;
-order.SetSorting(EMsvSortById);
-iRootEntry->SetSortTypeL(order);
-iMessages = iRootEntry->ChildrenL();
-iMessageCount = iRootEntry->Count();
-if(iMessageCount)
-{
-for(int i = 0; i < iMessageCount; i ++)
-{
-iMessageArray->Append(iMessages->At(i));
-}
-iMessageCount=0;
-}
-iState = ESortEntries;
-CleanupL();
 return 1;
 }
 case ESortEntries:
 {
 //Sort the elements in the array by descending order of TMsvId's
 TLinearOrder<TMsvId> order(CompareOrder);
 iMessageArray->Sort(order);
 iState = EProcessEntries;
 return 1;
 }
 case EProcessEntries:
 {
 //Process one entry at a time in sequence
 //Process the first element in the array on each call, till the end
 if(iMessageArray->Count())
 {
-ProcessResultsL(iSession->GetEntryL(iMessageArray->operator[](0))->Entry());
+CMsvEntry* msvEntry= iSession->
+GetEntryL(iMessageArray->operator[](0));
+CleanupStack::PushL(msvEntry);
+ProcessResultsL(msvEntry->Entry());
+CleanupStack::PopAndDestroy(msvEntry);
 iMessageArray->Remove(0);
 }
 else
 {
+iMessageArray->Reset();
 iMsgObserver->HandleCachingCompleted();
 return 0; //DONE
 }
 iState = EProcessEntries;
 return 1;
 }
 }
 return 0;
 {
 PRINT ( _L("Enter CCsMsgHandler::Start") );
 iState = EReadInbox;
 TCallBack callback = TCallBack(UploadMsg, (TAny*) this);
-iIdle = CIdle::NewL(CActive::EPriorityLow);
+if(iIdle)
+{
+delete iIdle;
+iIdle = NULL;
+}
+iIdle = CIdle::NewL(CActive::EPriorityIdle);
 iIdle->Start(callback);
 PRINT ( _L("End CCsMsgHandler::Start") );
-}
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::CleanupL()
-// Helper function for state machine cleanup
-// -----------------------------------------------------------------------------
-//
-void CCsMsgHandler::CleanupL()
-{
-if ( iRootEntry )
-{
-delete iRootEntry;
-iRootEntry = NULL;
-}
-if ( iMessages )
-{
-	    iMessages->Reset();
-delete iMessages;
-iMessages = NULL;
-}
-iMessageCount = 0;
 }
 // -----------------------------------------------------------------------------
 // CCsMsgHandler::IsMtmSupported()
 //
 type = ECsUnknown;
 break;
 }
 return (type);
 }
+// -----------------------------------------------------------------------------
+// void CCsMsgHandler::UpdateMessageArrayL(const TMsvId& aFolderId)
+// Update iMessageArray with the message ID before upload message to csserver.
+// -----------------------------------------------------------------------------
+//
+void CCsMsgHandler::UpdateMessageArrayL(const TMsvId& aFolderId)
+{
+CMsvEntry* msvEntry = iSession->GetEntryL(aFolderId);
+CleanupStack::PushL(msvEntry);
+// Set sort order
+TMsvSelectionOrdering order;
+order.SetSorting(EMsvSortById);
+msvEntry->SetSortTypeL(order);
+CMsvEntrySelection* messages = msvEntry->ChildrenL();
+// Cleanup msvEntry
+CleanupStack::PopAndDestroy(msvEntry);
+CleanupStack::PushL(messages);
+TInt messageCount = messages->Count();
+// In case of large number of message caching
+// to avoid multiple reallocation alloc memory
+// one shot.
+if( messageCount > KMessageArrayGranularity)
+iMessageArray->Reserve(messageCount);
+for(int i = 0; i < messageCount; i ++)
+{
+TMsvId msgId=messages->At(i);
+iMessageArray->Append(msgId);
+}
+// Cleanup messages
+CleanupStack::PopAndDestroy(messages);
+}
 // End of file

changeset 44	36f374c67aa8
parent 34	84197e66a4bd
child 52	12db4185673b