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

equal deleted inserted replaced

-:d189ee25cf9d
+:3533d4323edc
 #include "emailtrace.h"
 #include "ipsplgheaders.h"
-// <qmail> priority const has been removed, interval changed to 0.2 sec
+// Constants and defines
-const TInt KIpsAttaFetchProgressReportInterval = 200000; // 0.2 sec
+const TInt KFetchOpPriority = CActive::EPriorityStandard;
+const TInt KIpsAttaFetchProgressReportInterval = 1000000; // 1 sec
 const TInt KIpsAttaFetchRetryInterval = 1000000; // 1 sec
 const TInt KIpsAttaFetchRetryCount = 30;
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 iAttaOp.ReportProgressL();
 AdjustTimer();
 }
 // ----------------------------------------------------------------------------
-// CIpsPlgImap4FetchAttachmentOp
+// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-// <qmail> aFunctionId removed, CMsvEntrySelection& changed to pointer
-// <qmail> MFSMailRequestObserver& changed to pointer
 CIpsPlgImap4FetchAttachmentOp* CIpsPlgImap4FetchAttachmentOp::NewL(
 CMsvSession& aMsvSession,
 TRequestStatus& aObserverRequestStatus,
+TInt aFunctionId,
 TMsvId aService,
 CIpsPlgTimerOperation& aActivityTimer,
-const CMsvEntrySelection* aSelection,
+const TImImap4GetMailInfo& aGetMailInfo,
+const CMsvEntrySelection& aSel,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver* aFSOperationObserver,
+MFSMailRequestObserver& aFSOperationObserver,
 TInt aFSRequestId )
 {
 FUNC_LOG;
 CIpsPlgImap4FetchAttachmentOp* op = new (
 ELeave) CIpsPlgImap4FetchAttachmentOp(
 aMsvSession,
 aObserverRequestStatus,
+aFunctionId,
 aService,
 aActivityTimer,
-aSelection,
+aGetMailInfo,
 aFSMailBoxId,
 aFSOperationObserver,
 aFSRequestId );
 CleanupStack::PushL( op );
-op->ConstructL();
+op->ConstructL( aSel );
 CleanupStack::Pop( op );
 return op;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// <qmail> priority parameter has been removed
-// <qmail> MFSMailRequestObserver& changed to pointer
 CIpsPlgImap4FetchAttachmentOp::CIpsPlgImap4FetchAttachmentOp(
 CMsvSession& aMsvSession,
 TRequestStatus& aObserverRequestStatus,
+TInt aFunctionId,
 TMsvId aService,
 CIpsPlgTimerOperation& aActivityTimer,
-const CMsvEntrySelection* aSelection,
+const TImImap4GetMailInfo& aGetMailInfo,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver* aFSOperationObserver,
+MFSMailRequestObserver& aFSOperationObserver,
 TInt aFSRequestId )
 :
 CIpsPlgOnlineOperation(
 aMsvSession,
-aObserverRequestStatus,
+KFetchOpPriority,
-aActivityTimer,
+aObserverRequestStatus,
-aFSMailBoxId,
+aActivityTimer,
-aFSOperationObserver,
+aFSMailBoxId,
-aFSRequestId ),
+aFSOperationObserver,
-	iSelection( aSelection ),
+aFSRequestId),
-	iRetryCount( 0 )
+iSelection( NULL ),
+iGetMailInfo(aGetMailInfo),
+iFunctionId(aFunctionId),
+iRetryCount( 0 )
 {
 FUNC_LOG;
 iService = aService;
 iRetryTimer.CreateLocal();
 }
 {
 FUNC_LOG;
 iRetryTimer.Close();
 delete iSelection;
 delete iProgReport;
-delete iFetchErrorProgress;
+}
-}
+// ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
+void CIpsPlgImap4FetchAttachmentOp::ConstructL( const CMsvEntrySelection& aSel )
-void CIpsPlgImap4FetchAttachmentOp::ConstructL()
 {
 FUNC_LOG;
 BaseConstructL( KUidMsgTypeIMAP4 );
+iSelection = aSel.CopyL();
 DoConnectL();
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 {
 FUNC_LOG;
 iState = EStateConnecting;
 iStatus = KRequestPending;
-// <qmail> priority parameter has been removed
 CIpsPlgImap4ConnectOp* connOp = CIpsPlgImap4ConnectOp::NewL(
 iMsvSession,
+KFetchOpPriority,
 iStatus,
 iService,
 *iActivityTimer,
 iFSMailboxId,
-NULL, // no observer for subopertaion
+iFSOperationObserver,
-0,    // no requestId needed
+iFSRequestId,
 NULL, // event handler not needed whin plain connect
-ETrue );
+ETrue,
+EFalse );
-delete iSubOperation;
+delete iOperation;
-iSubOperation = connOp;
+iOperation = connOp;
 SetActive();
 }
 // ----------------------------------------------------------------------------
 FUNC_LOG;
 switch( iState )
 {
 case EStateConnecting:
 {
-// <qmail> Connected() usage
+// get result of connect operation
-if ( !Connected() )
+TInt err = iStatus.Int();
+if( err != KErrNone )
 {
-CompleteObserver( KErrCouldNotConnect );
+CompleteObserver( err == KErrCancel ? err : KErrCouldNotConnect );
 return;
 }
 iRetryCount = 0;
 DoFetchAttachmentL();
 break;
 iRetryTimer.After( iStatus, KIpsAttaFetchRetryInterval );
 SetActive();
 }
 else
 {
-if( err != KErrNone && iSubOperation )
+if( err != KErrNone && iOperation )
 {
-iFetchErrorProgress = iSubOperation->ProgressL().AllocL();
+iFetchErrorProgress = iOperation->ProgressL().AllocL();
 }
 iState = EStateIdle;
 CompleteObserver( err );
 }
 {
 // Completed, but with an error during fetch.
 return *iFetchErrorProgress;
 }
-if ( iSubOperation )
+if ( iOperation )
 {
-iProgress.Copy( iSubOperation->ProgressL() );
+iProgress.Copy( iOperation->ProgressL() );
 }
 else
 {
 TImap4CompoundProgress progg;
 progg.iGenericProgress.iErrorCode = KErrNone;
 void CIpsPlgImap4FetchAttachmentOp::ReportProgressL()
 {
 FUNC_LOG;
 TInt error = KErrNone;
 TFSProgress fsProgress = { TFSProgress::EFSStatus_Waiting, 0, 0, KErrNone };
-if ( iSubOperation && iState == EStateFetching )
+if ( iOperation && iState == EStateFetching )
 {
-TRAP(error, iProgress.Copy( iSubOperation->ProgressL() ) );
+TRAP(error, iProgress.Copy( iOperation->ProgressL() ) );
 }
 if ( error == KErrNone )
 {
 const TImap4GenericProgress& progg = iProgress().iGenericProgress;
 }
 else
 {
 User::Leave( error );
 }
-// <qmail>
+iFSOperationObserver.RequestResponseL( fsProgress, iFSRequestId );
-// signal observer if it exists
-if ( iFSOperationObserver )
-{
-iFSOperationObserver->RequestResponseL( fsProgress, iFSRequestId );
-}
-// </qmail>
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 const TDesC8& CIpsPlgImap4FetchAttachmentOp::GetErrorProgressL(TInt /*aError*/ )
 {
 FUNC_LOG;
 iState = EStateFetching;
 // Switch operations.
-delete iSubOperation;
+delete iOperation;
-iSubOperation = NULL;
+iOperation = NULL;
 iStatus = KRequestPending;
 iProgReport = CIpsFetchProgReport::NewL( *this );
 // Filters are not used when performing 'fetch' operation,
 // use normal getmail info instead
-// <qmail>
+TPckg<TImImap4GetMailInfo> param(iGetMailInfo);
-TPckgBuf<TImImap4GetMailInfo> param;
+InvokeClientMtmAsyncFunctionL( iFunctionId, *iSelection, iService, param );
-TImImap4GetMailInfo& options = param();
-options.iMaxEmailSize = KMaxTInt32;
-options.iGetMailBodyParts = EGetImap4EmailAttachments;
-options.iDestinationFolder = 0; // not used
-InvokeClientMtmAsyncFunctionL( KIMAP4MTMPopulate, *iSelection, param ); // <qmail> 1 param removed
-// </qmail>
 SetActive();
 }
-// <qmail> GetEngineProgress function removed
-// <qmail> new func to this op
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-TIpsOpType CIpsPlgImap4FetchAttachmentOp::IpsOpType() const
+TInt CIpsPlgImap4FetchAttachmentOp::GetEngineProgress( const TDesC8& aProgress )
 {
 FUNC_LOG;
-return EIpsOpTypeFetchAttachmentOp;
+if( !aProgress.Length() )
-}
+{
-// </qmail>
+return KErrNone;
+}
+else
+{
+TPckgBuf<TImap4CompoundProgress> paramPack;
+paramPack.Copy( aProgress );
+const TImap4GenericProgress& progress = paramPack().iGenericProgress;
+return progress.iErrorCode;
+}
+}
 // End of File

branch	RCL_3
changeset 64	3533d4323edc
parent 63	d189ee25cf9d