diff -r d189ee25cf9d -r 3533d4323edc ipsservices/ipssosplugin/src/ipsplgimap4plugin.cpp --- a/ipsservices/ipssosplugin/src/ipsplgimap4plugin.cpp Tue Aug 31 15:04:17 2010 +0300 +++ b/ipsservices/ipssosplugin/src/ipsplgimap4plugin.cpp Wed Sep 01 12:28:57 2010 +0100 @@ -15,10 +15,13 @@ * */ + + #include "emailtrace.h" #include "ipsplgheaders.h" +#include // CleanupResetAndDestroyPushL -// priority const has been removed +const TInt KConnectOpPriority = CActive::EPriorityStandard; // --------------------------------------------------------------------------- // CIpsPlgImap4Plugin::CIpsPlgImap4Plugin() @@ -31,6 +34,7 @@ // none } + // --------------------------------------------------------------------------- // CIpsPlgImap4Plugin::ConstructL() // --------------------------------------------------------------------------- @@ -41,6 +45,7 @@ BaseConstructL(); } + // --------------------------------------------------------------------------- // CIpsPlgImap4Plugin::NewL() // --------------------------------------------------------------------------- @@ -53,6 +58,7 @@ return self; } + // --------------------------------------------------------------------------- // CIpsPlgImap4Plugin::NewLC() // --------------------------------------------------------------------------- @@ -141,8 +147,7 @@ void CIpsPlgImap4Plugin::RefreshNowL( const TFSMailMsgId& aMailBoxId, MFSMailRequestObserver& aOperationObserver, - TInt aRequestId, - const TBool /*aSilentConnection*/ ) + TInt aRequestId ) { FUNC_LOG; @@ -151,14 +156,14 @@ CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewL( *this ); CleanupStack::PushL( watcher ); - // priority parameter has been removed CIpsPlgBaseOperation* op = CIpsPlgImap4ConnectOp::NewL( *iSession, + KConnectOpPriority, watcher->iStatus, service, ActivityTimerL( aMailBoxId ), aMailBoxId, - &aOperationObserver, + aOperationObserver, aRequestId, iEventHandler ); @@ -295,16 +300,16 @@ info.iAttachmentSizeLimit = 0; info.iDestinationFolder = aFolderId.Id(); - // priority parameter has been removed CIpsPlgBaseOperation* op = CIpsPlgImap4PopulateOp::NewL( *iSession, watcher->iStatus, + CActive::EPriorityStandard, aMailBoxId.Id(), ActivityTimerL( aMailBoxId ), info, *sel, aMailBoxId, - &aObserver, + aObserver, aRequestId, iEventHandler, EFalse ); // do not filter mail selection @@ -351,8 +356,12 @@ { sel->AppendL( aMessageIds[i].Id() ); } - - // TImImap4GetMailInfo options not needed + + TPckgBuf optionsBuf; + TImImap4GetMailInfo& options = optionsBuf(); + options.iMaxEmailSize = KMaxTInt32; + options.iGetMailBodyParts = EGetImap4EmailHeaders; + options.iDestinationFolder = aDestinationFolderId.Id(); CIpsPlgImap4MoveRemoteOpObserver* observer = CIpsPlgImap4MoveRemoteOpObserver::NewL( *iSession, *iEventHandler, @@ -360,16 +369,16 @@ watcher->SetRequestObserver( observer ); // Synchronous operation - // following constructor's parameters have changed - CIpsPlgBaseOperation* op = CIpsPlgImap4MoveRemoteOp::NewL( + CIpsPlgBaseOperation* op = CIpsPlgImap4MoveRemoteOp::NewL( *iSession, watcher->iStatus, + KIMAP4MTMMoveMailSelectionWhenAlreadyConnected, service, ActivityTimerL( aMailBoxId ), - aDestinationFolderId.Id(), + options, *sel, aMailBoxId, - NULL, // no observer, async not supported + *observer, // async not supported 0 ); // async not supported watcher->SetOperation( op ); @@ -433,17 +442,17 @@ options.iGetMailBodyParts = EGetImap4EmailBodyTextAndAttachments; options.iDestinationFolder = aDestinationFolderId.Id(); - // following constructor's parameters have changed - CIpsPlgBaseOperation* op = CIpsPlgImap4MoveRemoteOp::NewL( + CIpsPlgBaseOperation* op = CIpsPlgImap4MoveRemoteOp::NewL( *iSession, watcher->iStatus, + KIMAP4MTMMoveMailSelectionWhenAlreadyConnected, service, ActivityTimerL( aMailBoxId ), - aDestinationFolderId.Id(), + options, *sel, aMailBoxId, - &aOperationObserver, // async not supported - 0 ); // async not supported + aOperationObserver, + aRequestId ); watcher->SetOperation( op ); CleanupStack::PopAndDestroy( sel ); @@ -524,23 +533,21 @@ } } - - // TImImap4GetMailInfo options removed + + TPckgBuf optionsBuf; + TImImap4GetMailInfo& options = optionsBuf(); + options.iMaxEmailSize = KMaxTInt32; + options.iGetMailBodyParts = EGetImap4EmailAttachments; + options.iDestinationFolder = 0; // not used + CIpsPlgBaseOperation* op = CIpsPlgImap4FetchAttachmentOp::NewL( - *iSession, - watcher->iStatus, - aMailBoxId.Id(), - ActivityTimerL( aMailBoxId ), - sel, // ownership is transferred - aMailBoxId, - &aOperationObserver, - aRequestId ); + *iSession, watcher->iStatus, KIMAP4MTMPopulate, aMailBoxId.Id(), + ActivityTimerL( aMailBoxId ), options, *sel, aMailBoxId, + aOperationObserver, aRequestId ); watcher->SetOperation( op ); + CleanupStack::PopAndDestroy( sel ); iOperations.AppendL( watcher ); -// - CleanupStack::Pop( sel ); -// CleanupStack::Pop( watcher ); } @@ -578,15 +585,13 @@ accounts->GetImapAccountL( aMailboxId.Id(), imapAcc ); accounts->LoadImapSettingsL( imapAcc, *settings ); TImImap4GetPartialMailInfo info; -// Get TImImap4GetPartialMailInfo based on settings - CIpsPlgImap4ConnectOp::ConstructImapPartialFetchInfo( info, *settings ); + CIpsSetDataApi::ConstructImapPartialFetchInfo( info, *settings ); CleanupStack::PopAndDestroy( 2, settings ); - + if ( info.iTotalSizeLimit == KIpsSetDataHeadersOnly ) { return; } -// TPckgBuf package(info); @@ -598,17 +603,17 @@ sel->AppendL( aMailboxId.Id() ); sel->AppendL( aNewId ); - // priority parameter has been removed CIpsPlgBaseOperation* op = CIpsPlgImap4PopulateOp::NewL( *iSession, watcher->iStatus, + KIMAP4MTMPopulateMailSelectionWhenAlreadyConnected, aMailboxId.Id(), ActivityTimerL( aMailboxId ), info, *sel, aMailboxId, - NULL, // no operation observer - 0, // no use for requestId + *this, + KErrNotFound, iEventHandler, EFalse ); // do not block entry changed and created events