FCL/sf/app/commonemail: comparison emailservices/emailserver/cmailhandlerplugin/src/cmailcpshandler.cpp

equal deleted inserted replaced

-:cd2816114bd1
+:e64954c2c8e2
 #include <emailobserverinterface.hrh>
 #include <emailobserverplugin.h>
 #include <memaildata.h>
 #include <memailmailboxdata.h>
+#include <scs/cleanuputils.h> // CleanupResetAndDestroyPushL
 #include "emailtrace.h"
 #include "cfsmailclient.h"
 #include "cfsmailbox.h"
 #include "cfsmailfolder.h"
 #include "cmailcpshandler.h"
 void CMailCpsHandler::InitializeL()
 {
 FUNC_LOG;
 // Get current configuration from settings interface,
 // and pass it on to actual publisher interface
 iLiwIf->SetConfiguration( iSettings->Configuration() );
 TInt iiMax( iSettings->Mailboxes().Count() );
+INFO_1("iSettings->Mailboxes().Count() = %d", iiMax );
 for ( TInt ii = 0; ii < iiMax; ii++ )
 {
 CFSMailBox* mailbox( NULL );
 mailbox = MailClient().GetMailBoxByUidL( iSettings->Mailboxes()[ii] );
 TInt mailboxId(0);
 if (mailbox)
 {
+CleanupStack::PushL( mailbox );
 mailboxId = mailbox->GetId().Id();
-}
+if ( mailboxId )
-if ( mailboxId )
+{
-{
+CMailMailboxDetails* mailboxDetails = CreateMailboxDetailsL( *mailbox );
-CleanupStack::PushL( mailbox );
+CleanupStack::PushL( mailboxDetails );
-CMailMailboxDetails* mailboxDetails = CreateMailboxDetailsL( *mailbox );
-CleanupStack::PushL( mailboxDetails );
+TBuf<KMaxDescLen> cid;
+TInt next(1);
-TBuf<KMaxDescLen> cid;
-TInt next(1);
+// Check if same mailbox is already in iAccountsArray once or more
+for ( TInt i = 0; i < iAccountsArray.Count(); i++ )
-// Check if same mailbox is already in iAccountsArray once or more
+{
-for ( TInt i = 0; i < iAccountsArray.Count(); i++ )
+TInt id = (TInt)iAccountsArray[i]->iMailboxId.Id();
-{
+if (id == mailboxId)
-TInt id = (TInt)iAccountsArray[i]->iMailboxId.Id();
+{
-if (id == mailboxId)
+next++;
-{
+}
-next++;
+}
-}
+iSettings->GetContentId(mailboxId, next, cid);
-}
+mailboxDetails->SetWidgetInstance(cid);
-iSettings->GetContentId(mailboxId, next, cid);
+iAccountsArray.AppendL( mailboxDetails );
-mailboxDetails->SetWidgetInstance(cid);
+CleanupStack::Pop( mailboxDetails );
-iAccountsArray.AppendL( mailboxDetails );
+}
-CleanupStack::Pop( mailboxDetails );
 CleanupStack::PopAndDestroy( mailbox );
 }
 }
+INFO_1("iAccountsArray.Count() = %d", iAccountsArray.Count() );
 }
 // ---------------------------------------------------------
 // CMailCpsHandler::InitializeExternalAccountsL
 // ---------------------------------------------------------
 void CMailCpsHandler::InitializeExternalAccountsL()
 {
 FUNC_LOG;
 // Read external account data from settings
 RPointerArray<CMailExternalAccount> extAccounts;
-CleanupClosePushL( extAccounts );
+CleanupResetAndDestroyPushL( extAccounts );  // owning - GetExtMailboxesL transfers ownership
 iSettings->GetExtMailboxesL( extAccounts );
 // Delete removed plugins
 RemoveUnusedPluginsL( extAccounts );
 // Set accounts under correct pluginProxies
 SelectAndUpdateExtAccountsL( extAccounts );
 __ASSERT_DEBUG( extAccounts.Count() == 0, Panic( ECmailHandlerPluginPanicNoFailedState ) );
-CleanupStack::PopAndDestroy();
+CleanupStack::PopAndDestroy( &extAccounts );
 }
 // ---------------------------------------------------------
 // CMailCpsHandler::RemoveUnusedPluginsL
 // ---------------------------------------------------------
 Reset();
 // Trying to keep callback interface non-leaving
 TRAP_IGNORE( InitializeL() );
 TRAP_IGNORE( InitializeExternalAccountsL() );
 // Update widget contents after settings change
+TInt count = iLiwIf->GetWidgetInstanceCount();
+for (TInt i = 0; i < count; i++ )
+{
+iLiwIf->SetUpdateNeeded( i, ETrue );
+}
 TRAP_IGNORE( UpdateFullL() );
 CleanWaitingForNewMailbox();
 }
 // ---------------------------------------------------------
+// CMailCpsHandler::SetUpdateNeeded
+// ---------------------------------------------------------
+//
+void CMailCpsHandler::SetUpdateNeeded( const TFSMailMsgId aMailbox )
+{
+FUNC_LOG;
+TInt count = iSettings->WidgetCountByMailbox( aMailbox.Id() );
+for (TInt i = 0; i < count; i++ )
+{
+TBuf<KMaxDescLen> cid;
+iSettings->GetContentId( aMailbox.Id(), i + 1, cid );
+iLiwIf->SetUpdateNeeded( iLiwIf->GetWidgetInstanceId( cid ), ETrue );
+}
+}
+// ---------------------------------------------------------
 // CMailCpsHandler::UpdateFullL
 // ---------------------------------------------------------
 //
 void CMailCpsHandler::UpdateFullL()
 {
 FUNC_LOG;
 for (TInt instance = 0; instance < iLiwIf->GetWidgetInstanceCount(); instance++)
 {
 if ( iLiwIf->AllowedToPublish(instance) )
 {
-UpdateMailboxesL(instance, iLiwIf->iInstIdList[instance]->Des());
+UpdateMailboxesL(instance, iLiwIf->iInstIdList[instance].iCid);
 }
 }
 }
 // ---------------------------------------------------------
 {
 // Publish its data
 plugin->UpdateAccountL( aContentId );
 }
 else // handle internal accounts
 {
-TInt row(1); // start from first row
+if ( iLiwIf->UpdateNeeded( aInstance ) )
-TInt mailbox(0);
+{
-TBool found( EFalse );
+TInt row(1); // start from first row
-// try to find mailbox with matching contentId
+TInt mailbox(0);
-for ( mailbox = 0; mailbox < iAccountsArray.Count(); mailbox++ )
+TBool found( EFalse );
-{
+// try to find mailbox with matching contentId
-if ( !aContentId.Compare( *iAccountsArray[mailbox]->iWidgetInstance ) )
+for ( mailbox = 0; mailbox < iAccountsArray.Count(); mailbox++ )
 {
-INFO_1("iAccountsArray.Count() == %d", iAccountsArray.Count());
+if ( !aContentId.Compare( *iAccountsArray[mailbox]->iWidgetInstance ) )
-found = ETrue;
+{
-break;
+INFO_1("iAccountsArray[mailbox] mailbox = %d", mailbox);
-}
+found = ETrue;
-}
+break;
+}
-// if contentId found from array, update the mailbox
+}
-if ( found )
-{
+// if contentId found from array, update the mailbox
-// Update fields from left to right
+if ( found )
-UpdateMailBoxIconL( mailbox, aInstance, row );
+{
-UpdateMailboxNameL( mailbox, aInstance, row );
+INFO_1("found = TRUE iAccountsArray.Count() == %d", iAccountsArray.Count());
-UpdateIndicatorIconL( mailbox, aInstance, row );
+// Update fields from left to right
-row++;
+UpdateMailBoxIconL( mailbox, aInstance, row );
-UpdateMessagesL( mailbox, aInstance, 1, row);
+UpdateMailboxNameL( mailbox, aInstance, row );
-row++;
+UpdateIndicatorIconL( mailbox, aInstance, row );
-UpdateMessagesL( mailbox, aInstance, 2, row);
+row++;
-}
+UpdateMessagesL( mailbox, aInstance, 1, row);
-else
+row++;
-{
+UpdateMessagesL( mailbox, aInstance, 2, row);
-// Clean mailbox name
+}
-iLiwIf->PublishActiveMailboxNameL( aInstance, 1, KNullDesC );
+else
-// Clean mailbox icon
+{
-TFSMailMsgId mailBoxId; // id not essential here
+INFO_1("found = FALSE iAccountsArray.Count() == %d", iAccountsArray.Count());
-iLiwIf->PublishMailboxIconL( aInstance, 1, KNullIcon, mailBoxId);
+// Clean mailbox name
-// Clean indicator icon
+iLiwIf->PublishActiveMailboxNameL( aInstance, 1, KNullDesC );
-iLiwIf->PublishIndicatorIconL( aInstance, 1, KNullIcon);
+// Clean mailbox icon
-// Clean message rows
+TFSMailMsgId mailBoxId; // id not essential here
-UpdateEmptyMessagesL( aInstance, 2 );
+iLiwIf->PublishMailboxIconL( aInstance, 1, KNullIcon, mailBoxId);
-UpdateEmptyMessagesL( aInstance, 3 );
+// Clean indicator icon
+iLiwIf->PublishIndicatorIconL( aInstance, 1, KNullIcon);
+// Clean message rows
+UpdateEmptyMessagesL( aInstance, 2 );
+UpdateEmptyMessagesL( aInstance, 3 );
+}
+iLiwIf->SetUpdateNeeded( aInstance, EFalse );
 }
 }
 }
 // ---------------------------------------------------------
 {
 TFSMailMsgId mailBoxId;
 mailBoxId = iAccountsArray[aMailBoxNumber]->iMailboxId;
 CFSMailBox* mailbox( NULL );
-mailbox = MailClient().GetMailBoxByUidL( mailBoxId );
+mailbox = MailClient().GetMailBoxByUidL( mailBoxId ); // transferred ownership
 if(mailbox)
 {
 TFSMailMsgId parentFolder( mailbox->GetStandardFolderId( EFSInbox ) );
+delete mailbox;
 // Check that folder is correct
 CFSMailFolder* folder = MailClient().GetFolderByUidL( mailBoxId, parentFolder );
 if ( !folder )
 {
 				UpdateEmptyMessagesL( aWidgetInstance, aRow );
 folder->SetFolderType(EFSInbox);
 // Update folder if provided, otherwise use current folder
 RPointerArray<CFSMailMessage> folderMessages(1);
-CleanupClosePushL( folderMessages );
+CleanupResetAndDestroyPushL( folderMessages ); // owning array, from emailapiutils.h
 TFSMailDetails details( EFSMsgDataEnvelope );
 RArray<TFSMailSortCriteria> sorting;
 CleanupClosePushL( sorting );
 CleanupStack::PopAndDestroy( iterator );
 CleanupStack::PopAndDestroy( &sorting );
 CleanupStack::PopAndDestroy( &folderMessages );
 CleanupStack::PopAndDestroy( folder );
 return;
 }
 TFSMailMsgId msgId = folderMessages[aMessageNumber - 1]->GetMessageId();
 CFSMailMessage* msg( NULL );
 if ( aMailBoxNumber < iAccountsArray.Count() )
 {
 TFSMailMsgId mailBoxId;
 mailBoxId = iAccountsArray[aMailBoxNumber]->iMailboxId;
-if ( iSettings->GetNewMailState( mailBoxId ) )
+if ( iSettings->GetNewMailStateL( mailBoxId, GetUnreadCountL(mailBoxId) ) )
 {
 iLiwIf->PublishIndicatorIconL( aWidgetInstance,
 aRowNumber,
 EMbmCmailhandlerpluginQgn_stat_message_mail_uni );
 }
 else if( !IsOutboxEmptyL(mailBoxId) )
 {
 iLiwIf->PublishIndicatorIconL( aWidgetInstance,
 aRowNumber,
 EMbmCmailhandlerpluginQgn_indi_cmail_outbox_msg);
 break;
 }
 case TFSEventMailboxRenamed:
 {
 HandleMailboxRenamedEventL( aMailbox );
+SetUpdateNeeded( aMailbox );
 UpdateFullL();
 break;
 }
 case TFSEventMailboxDeleted:
 {
 HandleMailboxDeletedEventL( aMailbox );
+SetUpdateNeeded( aMailbox );
 UpdateFullL();
 break;
 }
 case TFSEventNewMail:
 {
 HandleNewMailEventL( aMailbox, aParam1, aParam2 );
+SetUpdateNeeded( aMailbox );
 UpdateFullL();
 break;
 }
 case TFSEventMailDeleted:
 {
 HandleMailDeletedEventL( aMailbox, aParam1, aParam2 );
+SetUpdateNeeded( aMailbox );
 UpdateFullL();
 break;
 }
+case TFSEventMailChanged:
+{
+SetUpdateNeeded( aMailbox );
+UpdateFullL();
+break;
+}
 default:
 {
 break;
 }
 }
 TInt unread (0);
 mailbox = MailClient().GetMailBoxByUidL( aMailbox );
 if(mailbox)
 {
 TFSMailMsgId folderId( mailbox->GetStandardFolderId( EFSInbox ) );
+delete mailbox; // transferred ownership
 // Check that folder is correct
 CFSMailFolder* folder = MailClient().GetFolderByUidL( aMailbox, folderId );
 if ( !folder )
 {
 return KErrNotFound;
 TInt unseen (0);
 mailbox = MailClient().GetMailBoxByUidL( aMailbox );
 if(mailbox)
 {
 TFSMailMsgId folderId( mailbox->GetStandardFolderId( EFSInbox ) );
+delete mailbox; // transferred ownership
 // Check that folder is correct
 CFSMailFolder* folder = MailClient().GetFolderByUidL( aMailbox, folderId );
 if ( !folder )
 {
 return KErrNotFound;
 TInt msgCount(0);
 mailbox = MailClient().GetMailBoxByUidL( aMailbox );
 if(mailbox)
 {
 TFSMailMsgId folderId( mailbox->GetStandardFolderId( EFSOutbox ) );
+delete mailbox; // ownership was transferred
 // Check that folder is correct
 CFSMailFolder* folder = MailClient().GetFolderByUidL( aMailbox, folderId );
 if ( !folder )
 {
 return KErrNotFound;
 MFSMailIterator* iterator = folder->ListMessagesL( details, sorting );
 CleanupStack::PopAndDestroy( &sorting );
 CleanupDeletePushL( iterator );
 RPointerArray<CFSMailMessage> messages;
-CleanupClosePushL( messages );
+CleanupResetAndDestroyPushL( messages ); // owning array
 iterator->NextL( TFSMailMsgId(), msgCount, messages );
 TInt arrayCount(messages.Count());
 for (TInt i = 0; i < arrayCount; i++)
 {
 {
 FUNC_LOG;
 TInt totalMailboxCount( 0 );
 TUid interfaceUid = TUid::Uid( KEmailObserverInterfaceUid );
 RImplInfoPtrArray plugins;
-CleanupClosePushL( plugins );
+CleanupResetAndDestroyPushL(plugins); // CleanupClosePushL does not call ptr destructors
 REComSession::ListImplementationsL( interfaceUid, plugins);
 for ( TInt i = 0; i < plugins.Count(); i++ )
 {
 TUid implUid = plugins[i]->ImplementationUid();
 EmailInterface::CEmailObserverPlugin::NewL( implUid, this );
 MEmailData& data( plugin->EmailDataL() );
 totalMailboxCount += data.MailboxesL().Count();
 }
-CleanupStack::PopAndDestroy(); // plugins
+CleanupStack::PopAndDestroy( &plugins ); // plugins
 return totalMailboxCount;
 }
 // ---------------------------------------------------------------------------
 // CMailCpsHandler::EmailObserverEvent

branch	RCL_3
changeset 35	e64954c2c8e2
parent 34	cd2816114bd1
child 26	67369d1b217f