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

equal deleted inserted replaced

-:578830873419
+:ecc8def7944a
 * Description:  IMAP4 connect operation
 *
 *
 */
 #include "emailtrace.h"
 #include "ipsplgheaders.h"
 // <qmail>
 const TInt KIpsSetDataHeadersOnly           = -2;
 const TInt KIpsSetDataFullBodyAndAttas      = -1;
 const TInt KIpsSetDataFullBodyOnly          = -3;
 // </qmail>
-_LIT( KIpsPlgIpsConnPanic, "IpsConn" );
+// ----------------------------------------------------------------------------
+// CIpsPlgImap4ConnOp::NewL()
 // ----------------------------------------------------------------------------
-// CIpsPlgImap4ConnectOp::NewL()
+// <qmail> priority parameter has been removed
-// ----------------------------------------------------------------------------
-//
 CIpsPlgImap4ConnectOp* CIpsPlgImap4ConnectOp::NewL(
 CMsvSession& aMsvSession,
-	TInt aPriority,
 TRequestStatus& aObserverRequestStatus,
 TMsvId aService,
 CIpsPlgTimerOperation& aActivityTimer,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver& aFSOperationObserver,
+MFSMailRequestObserver* aFSOperationObserver,
 TInt aFSRequestId,
 CIpsPlgEventHandler* aEventHandler,
-TBool aDoPlainConnect,
+TBool aDoPlainConnect )
-TBool aSignallingAllowed )
 {
 FUNC_LOG;
 CIpsPlgImap4ConnectOp* self = new (ELeave) CIpsPlgImap4ConnectOp(
 aMsvSession,
-aPriority,
 aObserverRequestStatus,
 aService,
 aActivityTimer,
 aFSMailBoxId,
 aFSOperationObserver,
 aFSRequestId,
 aDoPlainConnect,
-aSignallingAllowed,
 aEventHandler );
 CleanupStack::PushL( self );
 self->ConstructL();
 CleanupStack::Pop( self );
 }
 // ----------------------------------------------------------------------------
 // CIpsPlgImap4ConnectOp::CIpsPlgImap4ConnectOp()
 // ----------------------------------------------------------------------------
-//
+// <qmail> priority parameter has been removed
 CIpsPlgImap4ConnectOp::CIpsPlgImap4ConnectOp(
 CMsvSession& aMsvSession,
-	TInt aPriority,
 TRequestStatus& aObserverRequestStatus,
 TMsvId aService,
 CIpsPlgTimerOperation& aActivityTimer,
 TFSMailMsgId aFSMailBoxId,
-MFSMailRequestObserver& aFSOperationObserver,
+MFSMailRequestObserver* aFSOperationObserver,
 TInt aFSRequestId,
 TBool aDoPlainConnect,
-TBool aSignallingAllowed,
 CIpsPlgEventHandler* aEventHandler)
 :
 CIpsPlgOnlineOperation(
 	    aMsvSession,
-	    aPriority,
 	    aObserverRequestStatus,
 	    aActivityTimer,
 	    aFSMailBoxId,
 	    aFSOperationObserver,
-	    aFSRequestId,
+	    aFSRequestId ),
-	aSignallingAllowed ),
+iState( EStateIdle ),
+iSelection( NULL ),
 iDoPlainConnect( aDoPlainConnect ),
 iEventHandler( aEventHandler ),
 iIsSyncStartedSignaled( EFalse )
 {
 FUNC_LOG;
 CIpsPlgImap4ConnectOp::~CIpsPlgImap4ConnectOp()
 {
 FUNC_LOG;
 Cancel();
 delete iSelection;
-iState = EStateIdle;
+// <qmail> setting state in destructor makes no sense
 }
 // ----------------------------------------------------------------------------
 // CIpsPlgImap4ConnectOp::ConstructL()
 // ----------------------------------------------------------------------------
 if ( tentry.iType.iUid != KUidMsvServiceEntryValue )
 {
 User::Panic( KIpsPlgIpsConnPanic, KErrNotSupported );
 }
-	iState = EStateStartConnect;
+// <qmail> moved here from StartL which was removed
+if ( Connected() && iDoPlainConnect )
+{
+// trivial case: connect requested, but already connected
+// (sync is done automatically on background)
+iState = EStateIdle;
+}
+else
+{
+iState = EStateStartConnect;
+}
 iStatus = KRequestPending;
-SetActive();
+// <qmail> SetActive(); moved inside CompleteThis();
 CompleteThis();
 }
 // ----------------------------------------------------------------------------
 // CIpsPlgImap4ConnectOp::ProgressL()
 FUNC_LOG;
 if( iError != KErrNone )
 {
 return GetErrorProgressL( iError );
 }
-else if(iOperation)
+else if( iSubOperation )
 {
-return iOperation->ProgressL();
+return iSubOperation->ProgressL();
 }
 TImap4CompoundProgress& prog = iProgressBuf();
 prog.iGenericProgress.iErrorCode = KErrNone;
 return iProgressBuf;
 // might not never called, but gives something reasonable if called
 TFSProgress result = { TFSProgress::EFSStatus_Waiting, 0, 0, KErrNone };
 result.iError = KErrNone;
 switch( iState )
 {
-case EStateQueryingDetails:
+// <qmail> case EStateQueryingDetails removed
-result.iProgressStatus = TFSProgress::EFSStatus_Authenticating;
-break;
 case EStateStartConnect:
 result.iProgressStatus = TFSProgress::EFSStatus_Started;
 break;
 case EStateConnectAndSync:
 result.iProgressStatus = TFSProgress::EFSStatus_Connecting;
 }
 // ----------------------------------------------------------------------------
 // CIpsPlgImap4ConnectOp::IpsOpType()
 // ----------------------------------------------------------------------------
-//
+// <qmail> return type
-TInt CIpsPlgImap4ConnectOp::IpsOpType() const
+TIpsOpType CIpsPlgImap4ConnectOp::IpsOpType() const
 {
 FUNC_LOG;
 return EIpsOpTypeImap4SyncOp;
 }
 // ----------------------------------------------------------------------------
 //
 void CIpsPlgImap4ConnectOp::DoCancel()
 {
 FUNC_LOG;
-if( iOperation )
+if( iSubOperation )
 {
-iOperation->Cancel();
+iSubOperation->Cancel();
 }
 SignalSyncCompleted( KErrCancel );
 CompleteObserver( KErrCancel );
 }
 // ----------------------------------------------------------------------------
 //
 void CIpsPlgImap4ConnectOp::DoRunL()
 {
 FUNC_LOG;
-TInt err = KErrNone;
+TInt err( KErrNone );
-__ASSERT_DEBUG( !(iOperation && iOperation->IsActive()),
+__ASSERT_DEBUG( !(iSubOperation && iSubOperation->IsActive()),
 User::Panic( KIpsPlgPanicCategory, KErrGeneral ) );
-if ( iOperation )
+if ( iSubOperation )
 {
-err = iOperation->iStatus.Int();
+err = iSubOperation->iStatus.Int();
-delete iOperation;
+delete iSubOperation;
-iOperation = NULL;
+iSubOperation = NULL;
 }
 switch( iState )
 {
-case EStateQueryingDetails:
+// <qmail> removing case EStateQueryingDetails
-if ( KErrNone != err )
-{
-// user might be cancelled query
-// or it IS EMPTY
-iError = err;
-iState = EStateIdle;
-}
-else
-{
-// Retry connect.
-DoConnectOpL();
-}
-break;
 case EStateStartConnect:
-	StartL();
+// <qmail> remove StartL() func and replace it directly with DoConnectOpL
-	break;
+DoConnectOpL();
+break;
 case EStateConnectAndSync:
 // Connection completed
-if( err == KErrImapBadLogon )
+// <qmail> all errors should fail the op
+if( err )
 {
-// Login details are wrong.
+iState = EStateIdle;
-QueryUserPwdL();
+// <qmail> SetActive(); moved inside CompleteThis();
-iState = EStateQueryingDetails;
+CompleteThis();
-err = KErrNone;
 }
-else if ( err == KErrNone )
+else
 {
 // no errors in connection
 if( !iDoPlainConnect )
 {
 DoPopulateAllL();
 }
 else
 {
 // Get on with others using this class for connection only
 iState = EStateIdle;
-SetActive();
+// <qmail> SetActive(); moved inside CompleteThis();
 CompleteThis();
 }
 }
 break;
 case EStatePopulateAllCompleted:
-CIpsPlgSyncStateHandler::SaveSuccessfulSyncTimeL(
+CIpsPlgSyncStateHandler::SaveSuccessfulSyncTimeL( iMsvSession, iService );
-iMsvSession, iService );
 // break command is intentially left out
 case EStateCompleted:
 if ( err == KErrNone )
 {
 iState = EStateIdle;
-SetActive();
+// <qmail> SetActive(); moved inside CompleteThis();
 CompleteThis();
 }
 break;
 case EStateIdle:
 default:
-if ( iOperation )
+if ( iSubOperation )
 {
-delete iOperation;
+delete iSubOperation;
-iOperation = NULL;
+iSubOperation = NULL;
 }
 CompleteObserver();
 break;
 }
 {
 SignalSyncCompleted( err );
 }
 }
-// ----------------------------------------------------------------------------
+// <qmail> CIpsPlgImap4ConnectOp::HandleImapConnectionEvent() removed
-// CIpsPlgImap4ConnectOp::HandleImapConnectionEvent()
-// ----------------------------------------------------------------------------
-//
-void CIpsPlgImap4ConnectOp::HandleImapConnectionEvent(
-TImapConnectionEvent /*aConnectionEvent*/ )
-{
-//not used at the moment
-}
 // ----------------------------------------------------------------------------
 // CIpsPlgImap4ConnectOp::RequestResponseL()
 // ----------------------------------------------------------------------------
 //
 FUNC_LOG;
 iBaseMtm->SwitchCurrentEntryL( iService );
 iSelection->ResizeL(0);
 iSelection->AppendL(iService);
+// <qmail>
+iStatus = KRequestPending;
 if ( iDoPlainConnect && !Connected() )
 {
 TBuf8<1> parameter;
-iStatus = KRequestPending;
 // connect and synchronise starts background sync or idle
-iOperation = iBaseMtm->InvokeAsyncFunctionL(
+iSubOperation = iBaseMtm->InvokeAsyncFunctionL(
 KIMAP4MTMConnect, *iSelection, parameter, iStatus);
-// also set sync started
-SignalSyncStarted();
-iState = EStateConnectAndSync;
-SetActive();
 }
 else if ( Connected() )
 {
 // in this point cant use "connect and do something" commands,
 // use regular sync, when new mails is populated elsewhere.
 TBuf8<1> parameter;
-iStatus = KRequestPending;
+iSubOperation = iBaseMtm->InvokeAsyncFunctionL(
-iOperation = iBaseMtm->InvokeAsyncFunctionL(
+KIMAP4MTMFullSync, *iSelection, parameter, iStatus);
-KIMAP4MTMFullSync, *iSelection, parameter, iStatus);
-// also set sync started
-SignalSyncStarted();
-iState = EStateConnectAndSync;
-SetActive();
 }
 else
 {
-TPckg<MMsvImapConnectionObserver*> parameter(this);
+// the used command requires an observer to be given even though we're not using it
-// connect and synchronise starts background sync or idle
+TPckg<MMsvImapConnectionObserver*> parameter( NULL );
-iStatus = KRequestPending;
+iSubOperation = iBaseMtm->InvokeAsyncFunctionL(
-iOperation = iBaseMtm->InvokeAsyncFunctionL(
+KIMAP4MTMConnectAndSyncCompleteAfterFullSync,
-KIMAP4MTMConnectAndSyncCompleteAfterFullSync,
+*iSelection, parameter, iStatus );
-*iSelection, parameter, iStatus);
+}
 SignalSyncStarted();
 iState = EStateConnectAndSync;
 SetActive();
-}
+// </qmail>
 	}
 // ----------------------------------------------------------------------------
 // CIpsPlgImap4ConnectOp::DoPopulateAll()
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4ConnectOp::DoPopulateAllL()
 {
 FUNC_LOG;
 // construct partial fetch info according to imap settings
-CImImap4Settings* settings = new ( ELeave ) CImImap4Settings();
+// <qmail> new function to wrap settings loading
-CleanupStack::PushL( settings );
+CImImap4Settings* settings = GetImapSettingsLC();
-CEmailAccounts* accounts = CEmailAccounts::NewLC();
-TImapAccount imapAcc;
-accounts->GetImapAccountL(iService, imapAcc );
-accounts->LoadImapSettingsL( imapAcc, *settings );
 TImImap4GetPartialMailInfo info;
 ConstructImapPartialFetchInfo( info, *settings );
 TPckgBuf<TImImap4GetPartialMailInfo> package(info);
-CleanupStack::PopAndDestroy( 2, settings );
+CleanupStack::PopAndDestroy( settings );
+settings = NULL;
+// do populate operation unless only headers should be fetched
 if ( info.iTotalSizeLimit != KIpsSetDataHeadersOnly )
 {
-SignalSyncStarted();
+// Update iSelection (which will be given to populate op)
-CMsvEntry* cEntry = iMsvSession.GetEntryL( iService );
+// <qmail> new function to wrap iSelection populating
-CleanupStack::PushL( cEntry );
+CreateInboxMessagesSelectionL();
-CMsvEntrySelection* childrenSelection = cEntry->ChildrenL();
-CleanupStack::PushL( childrenSelection );
-if ( childrenSelection->Count() )
-{
-// only inbox is set, do we have to populate other folders also
-TMsvId id = (*childrenSelection)[0];
-CMsvEntry* cEntry2 = iMsvSession.GetEntryL( id );
-CleanupStack::PushL( cEntry2 );
-delete iSelection;
-iSelection = NULL;
-iSelection = cEntry2->ChildrenWithTypeL( KUidMsvMessageEntry );
-CleanupStack::PopAndDestroy( cEntry2 );
-}
-CleanupStack::PopAndDestroy( childrenSelection );
 iStatus = KRequestPending;
-CIpsPlgTimerOperation* dummy = NULL;
 iBaseMtm->SwitchCurrentEntryL( iService );
-iOperation = CIpsPlgImap4PopulateOp::NewL(
+// <qmail> priority parameter has been removed
-iMsvSession,
+iSubOperation = CIpsPlgImap4PopulateOp::NewL(
-this->iStatus,
+iMsvSession,
-CActive::EPriorityLow,
+iStatus,
 iService,
-*dummy,
+// <qmail> passing in activity timer; only place where NULL "reference" was used
-info,
+// <qmail> -> can get rid of checking existence of a reference memeber...
-*iSelection,
+iActivityTimer,
-iFSMailboxId,
+info,
-*this,
+*iSelection,
-0,
+iFSMailboxId,
-iEventHandler );
+NULL, // no observer for suboperation
+0, // requestId can be 0
+iEventHandler );
 SetActive();
-CleanupStack::PopAndDestroy( cEntry );
+// <qmail> SignalSyncStarted signal moved to happen later in case something goes wrong
+SignalSyncStarted();
 }
 else
 {
-SetActive();
+// <qmail> SetActive(); moved inside CompleteThis();
 CompleteThis();
 }
 iState = EStatePopulateAllCompleted;
 }
-// ----------------------------------------------------------------------------
+// <qmail> remove CIpsPlgImap4ConnectOp::StartL()
-// CIpsPlgImap4ConnectOp::StartL()
+// <qmail> remove CIpsPlgImap4ConnectOp::QueryUserPwdL()
-// ----------------------------------------------------------------------------
+// <qmail> remove CIpsPlgImap4ConnectOp::GetOperationErrorCodeL()
-//
-void CIpsPlgImap4ConnectOp::StartL()
-{
-FUNC_LOG;
-if ( Connected() && iDoPlainConnect )
-{
-// sync is done background, no explicit supported
-iState = EStateIdle;
-SetActive();
-CompleteThis();
-}
-else
-{
-DoConnectOpL();
-}
-}
-// ----------------------------------------------------------------------------
-// CIpsPlgImap4ConnectOp::QueryUserPwdL()
-// ----------------------------------------------------------------------------
-//
-void CIpsPlgImap4ConnectOp::QueryUserPwdL()
-{
-iEventHandler->QueryUsrPassL( iService, this );
-}
-// ----------------------------------------------------------------------------
-// CIpsPlgImap4ConnectOp::GetOperationErrorCodeL()
-// ----------------------------------------------------------------------------
-//
-/*TInt CIpsPlgImap4ConnectOp::GetOperationErrorCodeL( )
-{
-if ( !iOperation )
-{
-return KErrNotFound;
-}
-if ( !iOperation->IsActive() && iOperation->iStatus.Int() != KErrNone )
-{
-return iOperation->iStatus.Int();
-}
-TPckgBuf<TImap4CompoundProgress> paramPack;
-paramPack.Copy( iOperation->ProgressL() );
-const TImap4CompoundProgress& comProgg = paramPack();
-return comProgg.iGenericProgress.iErrorCode;
-}*/
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4ConnectOp::SignalSyncStarted()
 {
 if ( iEventHandler && !iIsSyncStartedSignaled )
 {
 // mark that sync is signaled to prevent
 // sending necessary event
 iIsSyncStartedSignaled = ETrue;
-iEventHandler->SetNewPropertyEvent(
+iEventHandler->SetNewPropertyEvent( iService, KIpsSosEmailSyncStarted, KErrNone );
-iService, KIpsSosEmailSyncStarted, KErrNone );
 }
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4ConnectOp::SignalSyncCompleted( TInt aError )
 {
 FUNC_LOG;
-if ( iEventHandler && aError == KErrImapBadLogon )
+// <qmail> don't test for aError code; all situations should complete op
-{
+if ( iEventHandler )
-iEventHandler->SetNewPropertyEvent(
+{
-iService, KIpsSosEmailSyncCompleted, aError );
+iEventHandler->SetNewPropertyEvent( iService, KIpsSosEmailSyncCompleted, aError );
 iIsSyncStartedSignaled = EFalse;
 }
 }
+// <qmail> Removing CIpsPlgImap4ConnectOp::CredientialsSetL
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-void CIpsPlgImap4ConnectOp::CredientialsSetL( TInt aEvent )
-{
-FUNC_LOG;
-if ( aEvent == EIPSSosCredientialsCancelled )
-{
-CompleteObserver( KErrCancel );
-}
-//password has been set, continue with operation
-SetActive();
-CompleteThis();
-}
 // <qmail>
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgImap4ConnectOp::ConstructImapPartialFetchInfo(
-TImImap4GetPartialMailInfo& aInfo, CImImap4Settings& aImap4Settings )
+TImImap4GetPartialMailInfo& aInfo,
+const CImImap4Settings& aImap4Settings )
 {
 FUNC_LOG;
 TInt sizeLimit = aImap4Settings.BodyTextSizeLimit();
 if ( sizeLimit == KIpsSetDataHeadersOnly )
 aInfo.iGetMailBodyParts = EGetImap4EmailBodyAlternativeText;
 }
 else
 {
 aInfo.iTotalSizeLimit = sizeLimit*1024;
-// set zero when it not documentated does total size overrides these
 aInfo.iAttachmentSizeLimit = 0;
 aInfo.iMaxEmailSize = sizeLimit*1024;
 aInfo.iBodyTextSizeLimit = sizeLimit*1024;
 aInfo.iPartialMailOptions = EBodyAlternativeText;
 aInfo.iGetMailBodyParts = EGetImap4EmailBodyAlternativeText;
 }
 }
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+CImImap4Settings* CIpsPlgImap4ConnectOp::GetImapSettingsLC()
+{
+FUNC_LOG;
+CImImap4Settings* settings = new ( ELeave ) CImImap4Settings();
+CleanupStack::PushL( settings );
+CEmailAccounts* accounts = CEmailAccounts::NewLC();
+TImapAccount imapAcc;
+accounts->GetImapAccountL(iService, imapAcc );
+accounts->LoadImapSettingsL( imapAcc, *settings );
+CleanupStack::PopAndDestroy( accounts );
+return settings;
+}
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+void CIpsPlgImap4ConnectOp::CreateInboxMessagesSelectionL()
+{
+FUNC_LOG;
+// get children of service entry
+CMsvEntry* cEntry = iMsvSession.GetEntryL( iService );
+CleanupStack::PushL( cEntry );
+CMsvEntrySelection* childrenSelection = cEntry->ChildrenL();
+CleanupStack::PopAndDestroy( cEntry );
+cEntry = NULL;
+CleanupStack::PushL( childrenSelection );
+if ( childrenSelection->Count() )
+{
+TMsvId id = (*childrenSelection)[0]; // index 0 == inbox
+cEntry = iMsvSession.GetEntryL( id ); // reusing cEntry pointer for Inbox entry
+CleanupStack::PushL( cEntry );
+delete iSelection;
+iSelection = NULL;
+// get message-type children of inbox
+iSelection = cEntry->ChildrenWithTypeL( KUidMsvMessageEntry );
+CleanupStack::PopAndDestroy( cEntry );
+}
+CleanupStack::PopAndDestroy( childrenSelection );
+}
 // </qmail>
-// End of File

changeset 20	ecc8def7944a
parent 18	578830873419
child 23	2dc6caa42ec3