FCL/sf/app/commonemail: comparison ipsservices/ipssosplugin/src/ipsplgimap4moveremoteop.cpp

equal deleted inserted replaced

-:d189ee25cf9d
+:3533d4323edc
 * Description:
 *       Move a selection of messages that may or may not be complete
 *
 */
 #include "emailtrace.h"
 #include "ipsplgheaders.h"
-// <qmail> priority parameter has been removed
+const TInt KMoveRemoteOpPriority = CActive::EPriorityStandard;
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// <qmail> TImImap4GetMailInfo& -> TMsvId&, aFunctionId removed
-// <qmail> MFSMailRequestObserver& changed to pointer
 CIpsPlgImap4MoveRemoteOp* CIpsPlgImap4MoveRemoteOp::NewL(
 CMsvSession& aMsvSession,
 TRequestStatus& aObserverRequestStatus,
+TInt aFunctionId,
 TMsvId aService,
 CIpsPlgTimerOperation& aActivityTimer,
-const TMsvId& aDestinationFolderId,
+const TImImap4GetMailInfo& aGetMailInfo,
-const CMsvEntrySelection& aSelection,
+const CMsvEntrySelection& aSel,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver* aFSOperationObserver,
+MFSMailRequestObserver& aFSOperationObserver,
 TInt aFSRequestId )
 {
 FUNC_LOG;
 CIpsPlgImap4MoveRemoteOp* op = new (ELeave) CIpsPlgImap4MoveRemoteOp(
 aMsvSession,
 aObserverRequestStatus,
+aFunctionId,
 aService,
 aActivityTimer,
-aDestinationFolderId,
+aGetMailInfo,
 aFSMailBoxId,
 aFSOperationObserver,
 aFSRequestId );
 CleanupStack::PushL( op );
-op->ConstructL( aSelection );
+op->ConstructL( aSel );
 CleanupStack::Pop( op );
 return op;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// <qmail> TImImap4GetMailInfo& -> TMsvId&, aFunctionId removed, priority param removed
-// <qmail> MFSMailRequestObserver& changed to pointer
 CIpsPlgImap4MoveRemoteOp::CIpsPlgImap4MoveRemoteOp(
 CMsvSession& aMsvSession,
 TRequestStatus& aObserverRequestStatus,
+TInt aFunctionId,
 TMsvId aService,
 CIpsPlgTimerOperation& aActivityTimer,
-const TMsvId& aDestinationFolderId,
+const TImImap4GetMailInfo& aGetMailInfo,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver* aFSOperationObserver,
+MFSMailRequestObserver& aFSOperationObserver,
 TInt aFSRequestId )
 :
 CIpsPlgOnlineOperation(
 aMsvSession,
-aObserverRequestStatus,
+KMoveRemoteOpPriority,
-aActivityTimer,
+aObserverRequestStatus,
-aFSMailBoxId,
+aActivityTimer,
-aFSOperationObserver,
+aFSMailBoxId,
-aFSRequestId ),
+aFSOperationObserver,
-// <qmail>
+aFSRequestId ),
-iState( EIdle ),
+iFunctionId(aFunctionId),
-iDestinationFolderId( aDestinationFolderId )
+iGetMailInfo(aGetMailInfo)
-// </qmail>
 {
 FUNC_LOG;
 iService = aService;
 }
 // ----------------------------------------------------------------------------
 CIpsPlgImap4MoveRemoteOp::~CIpsPlgImap4MoveRemoteOp()
 {
 FUNC_LOG;
 delete iRemoteSel;
-// <qmail>
-delete iMoveErrorProgress;
-// </qmail>
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4MoveRemoteOp::ConstructL( const CMsvEntrySelection& aSel )
 {
 FUNC_LOG;
 iState = EConnecting;
 iStatus = KRequestPending;
-// <qmail> priority parameter has been removed
 CIpsPlgImap4ConnectOp* connOp = CIpsPlgImap4ConnectOp::NewL(
 iMsvSession,
+KMoveRemoteOpPriority,
 iStatus,
 iService,
 *iActivityTimer,
 iFSMailboxId,
-NULL, // no operationobserver for suboperation
+iFSOperationObserver,
-0,    // no requestId needed
+iFSRequestId,
 NULL, // event handler not needed whin plain connect
-ETrue ); // do only connect
+ETrue,
+EFalse );
-delete iSubOperation;
+delete iOperation;
-iSubOperation = connOp;
+iOperation = connOp;
 SetActive();
 }
 // ----------------------------------------------------------------------------
 TInt err = iStatus.Int();
 switch(iState)
 {
 case EConnecting:
 {
-// <qmail> Connected() usage
+TBool connected = STATIC_CAST(CIpsPlgImap4ConnectOp*, iOperation)->Connected();
-if ( !Connected() )
+if( !connected )
 {
 CompleteObserver( KErrCouldNotConnect );
 return;
 }
 DoMoveRemoteL();
 DoMoveRemoteL();
 }
 break;
 case ERemoteMsgs:
 // Remote move complete.
-if( err != KErrNone && iSubOperation )
+if( err != KErrNone && iOperation )
 {
-iMoveErrorProgress = iSubOperation->ProgressL().AllocL();
+iMoveErrorProgress = iOperation->ProgressL().AllocL();
 }
 iState = EIdle;
 // to be considered
 // if this fails, should we move the messages back to local
 // directory
 {
 id = aSel[count];
 err = iMsvSession.GetEntry( id, service, tEntry );
 if( KErrNone == err )
 {
 iRemoteSel->AppendL( id );
+}
 }
 }
-}
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4MoveRemoteOp::Complete()
 {
 iStatus = KRequestPending;
 // first element of the CMsvEntrySelection is the service which is then
 // followed by any messages
 if( iRemoteSel->Count() > 1 )
 {
-// <qmail> deletion of iSubOperation is done inside InvokeClientMtmAsyncFunctionL </qmail>
+// Switch operations.
+delete iOperation;
+iOperation = NULL;
 // Filters are not used when performing 'move' operation, use normal
 // getmail info instead
-		// <qmail>
+TPckg<TImImap4GetMailInfo> param( iGetMailInfo );
-TPckgBuf<TImImap4GetMailInfo> paramBuf;
+InvokeClientMtmAsyncFunctionL( iFunctionId, *iRemoteSel, iService, param );
-TImImap4GetMailInfo& mailInfo = paramBuf();
-mailInfo.iMaxEmailSize = KMaxTInt32;
-mailInfo.iGetMailBodyParts = EGetImap4EmailBodyTextAndAttachments;
-mailInfo.iDestinationFolder = iDestinationFolderId;
-// <qmail> Parameters changed
-InvokeClientMtmAsyncFunctionL( KIMAP4MTMMoveMailSelectionWhenAlreadyConnected, *iRemoteSel, paramBuf );
-// </qmail>
 SetActive();
 }
 else
 {
-// <qmail> SetActive(); moved inside CompleteThis();
+SetActive();
 CompleteThis();
 }
 }
-// <qmail> removed CIpsPlgImap4MoveRemoteOp::GetEngineProgress( const TDesC8& aProgress )
-// <qmail> new func to this op
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-TIpsOpType CIpsPlgImap4MoveRemoteOp::IpsOpType() const
+TInt CIpsPlgImap4MoveRemoteOp::GetEngineProgress( const TDesC8& aProgress )
 {
 FUNC_LOG;
-return EIpsOpTypeMoveRemoteOp;
+if( !aProgress.Length() )
-}
+{
-// </qmail>
+return KErrNone;
+}
+else
+{
+TPckgBuf<TImap4CompoundProgress> paramPack;
+paramPack.Copy( aProgress );
+const TImap4GenericProgress& progress = paramPack().iGenericProgress;
+return progress.iErrorCode;
+}
+}
 // class CIpsPlgImap4MoveRemoteOpObserver
 //
 // ----------------------------------------------------------------------------

branch	RCL_3
changeset 64	3533d4323edc
parent 63	d189ee25cf9d