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

equal deleted inserted replaced

-:ecc8def7944a
+:2dc6caa42ec3
 }
 delete iCenRep;
 iIPSSettingsObservers.ResetAndDestroy();
 iIPSSettingsObservers.Close();
 iPropertyObservers.Close();
+// <qmail> iConnOpCallbacks, iSettingsApi members removed
 iImapFolderIds.Close();
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 void CIpsPlgEventHandler::ConstructL( )
 {
 FUNC_LOG;
 // <qmail>
 // commented out from qmail when extented settings
 // cen rep not exist in environment
 //iCenRep = CRepository::NewL( KCRUidExtendedSettingsUid );
 // </qmail>
 iPluginId = iBasePlugin.PluginId();
 RegisterPropertyObserverL( this );
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgEventHandler::CompleteConstructL( CMsvSession* aSession )
 {
 FUNC_LOG;
 iSession = aSession;
+// <qmail> iSettingsApi member removed
 // this collects all folderids to array from mailboxes that
 // have registered observers, this is need to do here because
 // observers might be registered before calling complete construct
 RArray<TMsvId> mboxes( KEventGranularity );
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-void CIpsPlgEventHandler::NotifyPropertyEventL( TIpsPlgPropertyEvent aEvent )
+void CIpsPlgEventHandler::NotifyPropertyEventL(
+TIpsPlgPropertyEvent aEvent )
 {
 FUNC_LOG;
 INFO_1("pluginid == 0x%x", iPluginId);
 //<qmail> not used: TBool doNotify = ETrue;
 switch ( aEvent.iEvent )
 event.iArg1 = aArg1;
 event.iArg2 = aArg2;
 event.iArg3 = aArg3;
 RPointerArray<MFSMailEventObserver> observers;
+CleanupClosePushL( observers );
 if( aEvent == TFSEventNewMailbox ||
 aEvent == TFSEventMailboxRenamed ||
 aEvent == TFSEventMailboxDeleted )
 {
 //other events go to mailbox specific observers
 MailboxObserversL( aMailbox, observers );
 }
 for( TInt i = 0; i < observers.Count(); ++i )
 {
-observers[i]->EventL(
+// ignore leave so that other observers get event even if
+// one leaves
+TRAP_IGNORE(observers[i]->EventL(
 event.iEvent,
 event.iAccountId,
 event.iArg1,
 event.iArg2,
-event.iArg3 );
+event.iArg3 ));
 }
-observers.Close();
+CleanupStack::PopAndDestroy( &observers );
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 void CIpsPlgEventHandler::IPSAccountsL()
 tNew.iDetails,
 mbox ) );
 SendDelayedEventL( event, mbox,
 arg1, arg2 , arg3 );
 }
-if ( type == KUidMsvMessageEntry )
+// discard any new mail events if message is marked as deleted in imap
+const TMsvEmailEntry& emlEntry(tNew);
+TBool isMarkedAsDeleted = EFalse;
+if ( mbox.PluginId() == KIpsPlgImap4PluginUid
+&& (EDisconnectedDeleteOperation == emlEntry.DisconnectedOperation()
+|| emlEntry.DeletedIMAP4Flag()) )
+{
+isMarkedAsDeleted = ETrue;
+}
+if ( type == KUidMsvMessageEntry && !isMarkedAsDeleted )
 {
 TMsvId* parent = static_cast<TMsvId*>(aArg2);
 // NOTE: assumed that event contains only one new message
 event = TFSEventNewMail;
 TFSMailMsgId mbox;
 }
 }
 // set entries array pointer
 RArray<TFSMailMsgId> array(KEventGranularity);
+CleanupClosePushL( array );
 FillFSMessageArray(
 array,
 static_cast<const CMsvEntrySelection*>(aArg1),
 tNew.iMtm.iUid );
 TFSMailMsgId tfsid( iPluginId, *parent);
 arg2 = static_cast<TAny*>(&tfsid);
 SendDelayedEventL( event, mbox,
 arg1, arg2 , arg3 );
-array.Close();
+CleanupStack::PopAndDestroy( &array );
 }
 else if ( type == KUidMsvFolderEntry )
 {
 event = TFSEventNewFolder;
 mbox = SymId2FsId( tNew.iServiceId, tNew.iMtm.iUid );
 // set entries array pointer
 RArray<TFSMailMsgId> array(1);
+CleanupClosePushL( array );
 array.Append( SymId2FsId( tNew ) );
 arg1 = &array;
 // set parent pointer
 TMsvId* parent = static_cast<TMsvId*>(aArg2);
 arg2 = static_cast<TAny*>(&tfsid);
 SendDelayedEventL( event, mbox,
 arg1, arg2 , arg3 );
-array.Close();
+CleanupStack::PopAndDestroy( &array );
 if( tNew.iMtm.iUid == KSenduiMtmImap4UidValue )
 {
 SetFolderIdToArrayL( tNew.Id() );
 }
 TAny* arg3=NULL;
 TFSMailEvent event( TFSMailboxUnavailable );
 RArray<TFSMailMsgId> array(KEventGranularity);
+CleanupClosePushL( array );
 FillFSMessageArray(
 array,
 static_cast<const CMsvEntrySelection*>(aArg1),
 tMoved.iMtm.iUid );
 mbox,
 arg1,
 arg2,
 arg3 );
-array.Close();
+CleanupStack::PopAndDestroy( &array );
 // set null to prevent later usage in framework side
 // causes kern exec 3 panic...
 arg1 = arg2 = arg3 = NULL;
 }
 }
 	            }
 // message in remote folder (inbox)
 TFSMailMsgId mbox(iPluginId, tEntry.iServiceId );
 RArray<TFSMailMsgId> array( KEventGranularity );
+CleanupClosePushL( array );
 TFSMailMsgId parentId( iPluginId, tEntry.Id() );
 if ( tEntry.iMtm.iUid == KSenduiMtmImap4UidValue )
 {
 isFolderId = MatchFolderIdFound( deletedId );
 }
 arg1,
 arg2,
 arg3 );
 }
-array.Close();
+CleanupStack::PopAndDestroy( &array );
 }
 else if ( tEntry.iMtm.iUid == KSenduiMtmSmtpUidValue )
 {
 // seems that case when deleding from draft, symbian
 // sends event that contains some child part's id of
 // Should be panic at this point?
 return;
 }
 RArray<TFSMailMsgId> array(1);
+CleanupClosePushL( array );
 array.Append( msg );
 arg1 = &array;
 arg2 = &parent;
 event = TFSEventMailDeleted;
 SendDelayedEventL(
 event,
 mbox,
 arg1,
 arg2,
 arg3 );
-array.Close();
+CleanupStack::PopAndDestroy( &array );
 }
 else
 {
 //deletion happened under some other service that IPS.
 return;
 FUNC_LOG;
 TAny* arg1=NULL;
 TAny* arg2=NULL;
 TAny* arg3=NULL;
+TInt errorCode( KErrNone ); // <qmail>
 TUid uId;
 TMsvEntry tChanged;
 if ( !IsEventFromIpsSourceL( aArg1, uId, tChanged ) )
 {
 return;
 }
 TFSMailEvent event = static_cast<TFSMailEvent>( KErrNotFound );
 RArray<TFSMailMsgId> array(1);
+CleanupClosePushL( array );
 if ( tChanged.iType == KUidMsvMessageEntry )
 {
 TMsvEmailEntry emailEntry(tChanged);
 if( emailEntry.DeletedIMAP4Flag() /*|| tChanged.Deleted()*/ )
 {
 event = TFSEventMailboxOnline;
 }
 else
 {
+// <qmail> add error code
 event = TFSEventMailboxOffline;
+const CMsvEntrySelection* selection = static_cast<CMsvEntrySelection*>( aArg1 );
+TFSMailMsgId mailboxId( iPluginId, selection->At(0) );
+if ( !(iBasePlugin.HasOperations( mailboxId )) && iBasePlugin.ActivityTimerL( mailboxId ).IsActive() )
+{
+// considering this disconnection event as unexpected
+errorCode = KErrDisconnected;
+arg1 = &errorCode;
+}
+// </qmail>
 }
 }
 else if( IsAccountNameChangeL( aArg1, aArg2 ) )
 {
 event = TFSEventMailboxRenamed;
 }
 SendDelayedEventL( event,
 mbox, arg1, arg2, arg3 );
 }
-array.Close();
+CleanupStack::PopAndDestroy( &array );
 // set null to prevent later usage in framework side
 // causes kern exec 3 panic...
 arg1 = arg2 = arg3 = NULL;
 }
 //<cmail>
 {
 iIPSSettingsObservers[find]->SetKeyAndActivateL( aSettingKey, observers );
 }
 else
 {
 // <qmail>
 // commented out from qmail when extented settings
 // cen rep not exist in environment
 /*CIpsPlgSettingsObserver* obs =
 CIpsPlgSettingsObserver::NewL( aAccount, *iCenRep, *this );
 obs->SetKeyAndActivateL( aSettingKey, observers );
 iIPSSettingsObservers.AppendL( obs );*/
 // </qmail>
 }
 observers.Close();
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 TSSMailSyncState CIpsPlgEventHandler::ConvertCompletionCode( TInt aCompletionCode )
 {
 FUNC_LOG;
+INFO_1("completioncode == %d", aCompletionCode);
 switch ( aCompletionCode )
 {
 case KErrNone:
 return FinishedSuccessfully;
 case KErrCancel:
 case KErrImapBadLogon:
 case KPop3InvalidUser:
 case KPop3InvalidLogin:
 case KPop3InvalidApopLogin:
 return PasswordNotVerified;
+case -5120: // (DndTimedOut) wrong server name in settings
+case KErrHostUnreach: // wrong port number
+return ServerConnectionError;
+case KErrTimedOut:
 default:
 return SyncError;
 }
 }
 // </qmail>
 //    TSSMailSyncState state = PasswordNotVerified;
 //
 //    SendDelayedEventL( event, aMailboxId, &state, NULL , NULL );
 //    }
 // </qmail>
+// End of File

changeset 23	2dc6caa42ec3
parent 20	ecc8def7944a
child 44	c2d07d913565