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

equal deleted inserted replaced

-:dcf0eedfc1a3
+:d189ee25cf9d
 #include "emailtrace.h"
 #include "ipsplgheaders.h"
-// Constants and defines
+// <qmail> priority const has been removed, interval changed to 0.2 sec
-const TInt KFetchOpPriority = CActive::EPriorityStandard;
+const TInt KIpsAttaFetchProgressReportInterval = 200000; // 0.2 sec
-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 TImImap4GetMailInfo& aGetMailInfo,
+const CMsvEntrySelection* aSelection,
-const CMsvEntrySelection& aSel,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver& aFSOperationObserver,
+MFSMailRequestObserver* aFSOperationObserver,
 TInt aFSRequestId )
 {
 FUNC_LOG;
 CIpsPlgImap4FetchAttachmentOp* op = new (
 ELeave) CIpsPlgImap4FetchAttachmentOp(
 aMsvSession,
 aObserverRequestStatus,
-aFunctionId,
 aService,
 aActivityTimer,
-aGetMailInfo,
+aSelection,
 aFSMailBoxId,
 aFSOperationObserver,
 aFSRequestId );
 CleanupStack::PushL( op );
-op->ConstructL( aSel );
+op->ConstructL();
 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 TImImap4GetMailInfo& aGetMailInfo,
+const CMsvEntrySelection* aSelection,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver& aFSOperationObserver,
+MFSMailRequestObserver* aFSOperationObserver,
 TInt aFSRequestId )
 :
 CIpsPlgOnlineOperation(
 aMsvSession,
-KFetchOpPriority,
+aObserverRequestStatus,
-aObserverRequestStatus,
+aActivityTimer,
-aActivityTimer,
+aFSMailBoxId,
-aFSMailBoxId,
+aFSOperationObserver,
-aFSOperationObserver,
+aFSRequestId ),
-aFSRequestId),
+	iSelection( aSelection ),
-iSelection( NULL ),
+	iRetryCount( 0 )
-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,
-iFSOperationObserver,
+NULL, // no observer for subopertaion
-iFSRequestId,
+0,    // no requestId needed
 NULL, // event handler not needed whin plain connect
-ETrue,
+ETrue );
-EFalse );
-delete iOperation;
+delete iSubOperation;
-iOperation = connOp;
+iSubOperation = connOp;
 SetActive();
 }
 // ----------------------------------------------------------------------------
 FUNC_LOG;
 switch( iState )
 {
 case EStateConnecting:
 {
-// get result of connect operation
+// <qmail> Connected() usage
-TInt err = iStatus.Int();
+if ( !Connected() )
-if( err != KErrNone )
 {
-CompleteObserver( err == KErrCancel ? err : KErrCouldNotConnect );
+CompleteObserver( KErrCouldNotConnect );
 return;
 }
 iRetryCount = 0;
 DoFetchAttachmentL();
 break;
 iRetryTimer.After( iStatus, KIpsAttaFetchRetryInterval );
 SetActive();
 }
 else
 {
-if( err != KErrNone && iOperation )
+if( err != KErrNone && iSubOperation )
 {
-iFetchErrorProgress = iOperation->ProgressL().AllocL();
+iFetchErrorProgress = iSubOperation->ProgressL().AllocL();
 }
 iState = EStateIdle;
 CompleteObserver( err );
 }
 {
 // Completed, but with an error during fetch.
 return *iFetchErrorProgress;
 }
-if ( iOperation )
+if ( iSubOperation )
 {
-iProgress.Copy( iOperation->ProgressL() );
+iProgress.Copy( iSubOperation->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 ( iOperation && iState == EStateFetching )
+if ( iSubOperation && iState == EStateFetching )
 {
-TRAP(error, iProgress.Copy( iOperation->ProgressL() ) );
+TRAP(error, iProgress.Copy( iSubOperation->ProgressL() ) );
 }
 if ( error == KErrNone )
 {
 const TImap4GenericProgress& progg = iProgress().iGenericProgress;
 }
 else
 {
 User::Leave( error );
 }
-iFSOperationObserver.RequestResponseL( fsProgress, iFSRequestId );
+// <qmail>
+// 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 iOperation;
+delete iSubOperation;
-iOperation = NULL;
+iSubOperation = NULL;
 iStatus = KRequestPending;
 iProgReport = CIpsFetchProgReport::NewL( *this );
 // Filters are not used when performing 'fetch' operation,
 // use normal getmail info instead
-TPckg<TImImap4GetMailInfo> param(iGetMailInfo);
+// <qmail>
-InvokeClientMtmAsyncFunctionL( iFunctionId, *iSelection, iService, param );
+TPckgBuf<TImImap4GetMailInfo> 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-TInt CIpsPlgImap4FetchAttachmentOp::GetEngineProgress( const TDesC8& aProgress )
+TIpsOpType CIpsPlgImap4FetchAttachmentOp::IpsOpType() const
 {
 FUNC_LOG;
-if( !aProgress.Length() )
+return EIpsOpTypeFetchAttachmentOp;
-{
+}
-return KErrNone;
+// </qmail>
-}
-else
-{
-TPckgBuf<TImap4CompoundProgress> paramPack;
-paramPack.Copy( aProgress );
-const TImap4GenericProgress& progress = paramPack().iGenericProgress;
-return progress.iErrorCode;
-}
-}
 // End of File

branch	RCL_3
changeset 24	d189ee25cf9d
parent 17	67369d1b217f
child 25	3533d4323edc