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

equal deleted inserted replaced

-:dcf0eedfc1a3
+:d189ee25cf9d
 */
 #include "emailtrace.h"
 #include "ipsplgheaders.h"
-// Constants and defines
+// <qmail> priority const has been removed
-const TInt KFetchOpPriority = CActive::EPriorityStandard;
-const TInt KIpsPlgSelectionGra = 16;
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
+// <qmail> priority parameter has been removed
-// ----------------------------------------------------------------------------
+// <qmail> MFSMailRequestObserver& changed to pointer
 EXPORT_C CIpsPlgImap4PopulateOp* CIpsPlgImap4PopulateOp::NewL(
 CMsvSession& aMsvSession,
 TRequestStatus& aObserverRequestStatus,
-TInt aPriority,
 TMsvId aService,
 CIpsPlgTimerOperation& aActivityTimer,
 const TImImap4GetPartialMailInfo& aPartialMailInfo,
 const CMsvEntrySelection& aSel,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver& aFSOperationObserver,
+MFSMailRequestObserver* aFSOperationObserver,
 TInt aFSRequestId,
 CIpsPlgEventHandler* aEventHandler,
 TBool aDoFilterSelection )
 {
 FUNC_LOG;
 CIpsPlgImap4PopulateOp* op = new (ELeave) CIpsPlgImap4PopulateOp(
 aMsvSession,
 aObserverRequestStatus,
-aPriority,
 aService,
 aActivityTimer,
 aPartialMailInfo,
 aFSMailBoxId,
 aFSOperationObserver,
 return op;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
+// <qmail> priority parameter has been removed
 CIpsPlgImap4PopulateOp::CIpsPlgImap4PopulateOp(
 CMsvSession& aMsvSession,
 TRequestStatus& aObserverRequestStatus,
-TInt aPriority,
 TMsvId aService,
 CIpsPlgTimerOperation& aActivityTimer,
 const TImImap4GetPartialMailInfo& aPartialMailInfo,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver& aFSOperationObserver,
+MFSMailRequestObserver* aFSOperationObserver,
 TInt aFSRequestId,
 CIpsPlgEventHandler* aEventHandler )
 :
 CIpsPlgOnlineOperation(
 aMsvSession,
-aPriority,
+aObserverRequestStatus,
-aObserverRequestStatus,
+aActivityTimer,
-aActivityTimer,
+aFSMailBoxId,
-aFSMailBoxId,
+aFSOperationObserver,
-aFSOperationObserver,
+aFSRequestId ),
-aFSRequestId),
+iState( EStateIdle ),
 iPartialMailInfo(aPartialMailInfo),
-iSelection( KIpsPlgSelectionGra ),
+iSelection( NULL ),
-iEventHandler( aEventHandler )
+iTempSelection( NULL ),
+iEventHandler( aEventHandler ),
+iFetchErrorProgress( NULL )
 {
 FUNC_LOG;
 iService = aService;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 CIpsPlgImap4PopulateOp::~CIpsPlgImap4PopulateOp()
 {
 FUNC_LOG;
+delete iSelection;
-Cancel();
-iSelection.Close();
 if ( iTempSelection )
 	{
 	iTempSelection->Reset();
-	delete iTempSelection;
+		delete iTempSelection;
 	}
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 TBool aDoFilterSelection )
 {
 FUNC_LOG;
 BaseConstructL( KUidMsgTypeIMAP4 );
+// <qmail> instantiation moved here
+iSelection = new ( ELeave ) CMsvEntrySelection();
+iTempSelection = new ( ELeave ) CMsvEntrySelection();
 if ( aDoFilterSelection )
 {
 FilterSelectionL( aSel );
 }
-else
+else // no filtering; populate all
 {
+// first entry in selection is serviceId
 for ( TInt i = 1; i < aSel.Count(); i++ )
 {
 if ( aSel[i] != iService )
 {
-iSelection.AppendL( aSel.At(i) );
+iSelection->AppendL( aSel.At(i) );
 }
 }
 }
-iTempSelection = new ( ELeave ) CMsvEntrySelection();
 DoConnectL();
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-TInt CIpsPlgImap4PopulateOp::IpsOpType() const
+// <qmail> return type changed: TInt -> TIpsOpType
+TIpsOpType CIpsPlgImap4PopulateOp::IpsOpType() const
 {
 FUNC_LOG;
 return EIpsOpTypeImap4PopulateOp;
 }
 {
 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 suboperations
-iFSRequestId,
+0,    // requestId not needed
 iEventHandler,
-ETrue, // Do plain connect
+ETrue ); // Do plain connect
-EFalse );
-delete iOperation;
+delete iSubOperation;
-iOperation = connOp;
+iSubOperation = connOp;
 SetActive();
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4PopulateOp::DoRunL()
 {
 FUNC_LOG;
 TInt err = iStatus.Int();
-delete iOperation;
+delete iSubOperation;
-iOperation = NULL;
+iSubOperation = NULL;
 switch( iState )
 {
 case EStateConnecting:
 {
 DoPopulateL();
 break;
 }
 case EStateFetching:
 {
-if( err != KErrNone && iOperation )
+if( err != KErrNone && iSubOperation )
 {
-iFetchErrorProgress = iOperation->ProgressL().AllocL();
+iFetchErrorProgress = iSubOperation->ProgressL().AllocL();
 iState = EStateIdle;
 Complete();
 }
-else
-{
-}
 break;
 }
 case EStateInfoEntryChange:
 {
-TMsvEntry tentry;
+DoPopulateL();
-TMsvId service;
-iMsvSession.GetEntry( iService, service, tentry );
-if( err == KErrNone && tentry.Connected() )
-	{
-	DoPopulateL();
-	}
-else
-	{
-	iState = EStateIdle;
-	CompleteObserver( err );
-	}
 break;
 }
 case EStateIdle:
 default:
 break;
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4PopulateOp::DoCancel()
 {
 FUNC_LOG;
-if( iOperation )
+if( iSubOperation )
 {
-iOperation->Cancel();
+iSubOperation->Cancel();
 }
 CompleteObserver( KErrCancel );
 }
 // ----------------------------------------------------------------------------
 FUNC_LOG;
 if(iFetchErrorProgress && (iState == EStateIdle))
 {
 // Completed, but with an error during fetch.
 return *iFetchErrorProgress;
 }
-TImap4SyncProgress progg;
+else
-progg.iFoldersNotFound = 0;
+{
-progg.iErrorCode = KErrNone;
+TImap4SyncProgress progg;
-TPckgBuf<TImap4SyncProgress> param(progg);
+	progg.iFoldersNotFound = 0;
-iSyncProgress.Copy(param);
+progg.iErrorCode = KErrNone;
-return iSyncProgress;
+TPckgBuf<TImap4SyncProgress> param(progg);
+iSyncProgress.Copy(param);
+return iSyncProgress;
+}
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 const TDesC8& CIpsPlgImap4PopulateOp::GetErrorProgressL(TInt /*aError*/ )
 result.iError = KErrCancel;
 }
 return result;
 }
-// ----------------------------------------------------------------------------
+// <qmail> removed CIpsPlgImap4PopulateOp::GetEngineProgress( const TDesC8& aProgress )
-// ----------------------------------------------------------------------------
-TInt CIpsPlgImap4PopulateOp::GetEngineProgress( const TDesC8& aProgress )
-{
-FUNC_LOG;
-if( !aProgress.Length() )
-{
-return KErrNone;
-}
-else
-{
-TPckgBuf<TImap4CompoundProgress> paramPack;
-paramPack.Copy( aProgress );
-const TImap4GenericProgress& progress = paramPack().iGenericProgress;
-return progress.iErrorCode;
-}
-}
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4PopulateOp::Complete()
 {
 User::RequestComplete(observer, KErrNone);
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-void CIpsPlgImap4PopulateOp::FilterSelectionL(
+void CIpsPlgImap4PopulateOp::FilterSelectionL( const CMsvEntrySelection& aSelection )
-const CMsvEntrySelection& aSelection )
+{
-{
+FUNC_LOG;
-FUNC_LOG;
+iSelection->Reset();
-iSelection.Reset();
 TMsvId messageId;
 // NOTE: this code is taken from symbian os source IMPCMTM.CPP
 // filter selection is in here because messages are
 // fetched separately then we dont have to make unneccessery imap
 // client mtm calls
 for (TInt i=0; i<aSelection.Count(); i++)
 {
 messageId = (aSelection)[i];
 if ( messageId == iService )
 {
-continue;
+continue; // ignore serviceId
 }
 TMsvEmailEntry entry;
 TMsvId service = KMsvNullIndexEntryId;
 User::LeaveIfError(iMsvSession.GetEntry(messageId, service, entry));
 if( IsPartialPopulate( )
 && !isComplete
 && entry.iType == KUidMsvMessageEntry )
 {
-iSelection.AppendL(messageId);
+iSelection->AppendL( messageId );
 }
 else if ( isMsgEntry && isSizeUnderMax && !isParentComp )
 {
-iSelection.AppendL(messageId);
+iSelection->AppendL( messageId );
 }
 }
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 TBool CIpsPlgImap4PopulateOp::IsPartialPopulate( )
 {
+// <qmail> cleaned up code and took one "always true" condition out from the if statement
 FUNC_LOG;
 // NOTE: this code is taken from symbian os source IMPCMTM.CPP
 // code is modified to this class purpose
+TBool isPartialPopulate( EFalse );
-TBool isPartialPopulate = EFalse;
+if ( iPartialMailInfo.iPartialMailOptions == ENoSizeLimits &&
-if(iPartialMailInfo.iPartialMailOptions == ENoSizeLimits &&
+iPartialMailInfo.iTotalSizeLimit == KMaxTInt &&
-iPartialMailInfo.iTotalSizeLimit == KMaxTInt &&
+iPartialMailInfo.iBodyTextSizeLimit == KMaxTInt &&
-iPartialMailInfo.iBodyTextSizeLimit == KMaxTInt &&
+iPartialMailInfo.iAttachmentSizeLimit == KMaxTInt )
-iPartialMailInfo.iAttachmentSizeLimit == KMaxTInt &&
-(iPartialMailInfo.iGetMailBodyParts == EGetImap4EmailHeaders ||
-iPartialMailInfo.iGetMailBodyParts == EGetImap4EmailBodyText ||
-iPartialMailInfo.iGetMailBodyParts == EGetImap4EmailBodyTextAndAttachments ||
-iPartialMailInfo.iGetMailBodyParts == EGetImap4EmailAttachments ||
-iPartialMailInfo.iGetMailBodyParts == EGetImap4EmailBodyAlternativeText) )
 {
 isPartialPopulate = EFalse;
 }
 else
 {
 isPartialPopulate = ETrue;
 }
 return isPartialPopulate;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4PopulateOp::DoPopulateL( )
 {
 FUNC_LOG;
-if ( iSelection.Count() > 0 )
+if ( iSelection->Count() > 0 )
 {
 TMsvEmailEntry tEntry;
 TMsvId dummy;
-TInt lastIndex = iSelection.Count()-1;
+TInt lastIndex = iSelection->Count()-1;
-User::LeaveIfError( iMsvSession.GetEntry(
+User::LeaveIfError( iMsvSession.GetEntry( iSelection->At(lastIndex), dummy, tEntry ) );
-iSelection[lastIndex], dummy, tEntry ) );
 iState = EStateFetching;
 iTempSelection->Reset();
 iTempSelection->AppendL( iService );
-iTempSelection->AppendL( iSelection[lastIndex] );
+iTempSelection->AppendL( iSelection->At( lastIndex ) );
-iSelection.Remove(lastIndex);
+iSelection->Delete( lastIndex );
-iStatus = KRequestPending;
 // Filters are not used when performing 'fetch'
 // operation, use normal getmail info instead
-TPckg<TImImap4GetPartialMailInfo> param(iPartialMailInfo);
+TPckg<TImImap4GetPartialMailInfo> param( iPartialMailInfo );
 iBaseMtm->SwitchCurrentEntryL( iService );
-iOperation = iBaseMtm->InvokeAsyncFunctionL(
+iSubOperation = iBaseMtm->InvokeAsyncFunctionL(
 KIMAP4MTMPopulateMailSelectionWhenAlreadyConnected,
-*iTempSelection, param, this->iStatus);
+*iTempSelection, param, iStatus );
 iState = EStateInfoEntryChange;
 SetActive();
-if ( iEventHandler )
-{
-iEventHandler->SetNewPropertyEvent(
-iService, KIpsSosEmailSyncStarted, KErrNone );
-}
 }
 else
 {
 iState = EStateIdle;
 CompleteObserver();
-if ( iEventHandler )
-{
-iEventHandler->SetNewPropertyEvent(
-iService, KIpsSosEmailSyncCompleted, KErrNone );
-}
 }
 }
 // End of File

branch	RCL_3
changeset 24	d189ee25cf9d
parent 23	dcf0eedfc1a3
child 25	3533d4323edc