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

equal deleted inserted replaced

-:e7aa27f58ae1
+:578830873419
 }
 delete iCenRep;
 iIPSSettingsObservers.ResetAndDestroy();
 iIPSSettingsObservers.Close();
 iPropertyObservers.Close();
-delete iSettingsApi;
 iImapFolderIds.Close();
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 void CIpsPlgEventHandler::ConstructL( )
 {
 FUNC_LOG;
-iCenRep = CRepository::NewL( KCRUidExtendedSettingsUid );
+// <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;
-iSettingsApi = CIpsSetDataApi::NewL( *iSession );
 // 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 );
 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 )
 {
-// ignore leave so that other observers get event even if
+observers[i]->EventL(
-// one leaves
-TRAP_IGNORE(observers[i]->EventL(
 event.iEvent,
 event.iAccountId,
 event.iArg1,
 event.iArg2,
-event.iArg3 ));
+event.iArg3 );
 }
-CleanupStack::PopAndDestroy( &observers );
+observers.Close();
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 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;
 if ( tNew.iServiceId == KMsvLocalServiceIndexEntryIdValue
 || tNew.Parent() == KMsvDraftEntryIdValue )
 }
 }
 // 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 );
-CleanupStack::PopAndDestroy( &array );
+array.Close();
 }
 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 );
-CleanupStack::PopAndDestroy( &array );
+array.Close();
 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 );
-CleanupStack::PopAndDestroy( &array );
+array.Close();
 // 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 );
 }
-CleanupStack::PopAndDestroy( &array );
+array.Close();
 }
 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 );
-CleanupStack::PopAndDestroy( &array );
+array.Close();
 }
 else
 {
 //deletion happened under some other service that IPS.
 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()*/ )
 }
 SendDelayedEventL( event,
 mbox, arg1, arg2, arg3 );
 }
-CleanupStack::PopAndDestroy( &array );
+array.Close();
 // 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
 {
-CIpsPlgSettingsObserver* obs =
+// <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 );
+iIPSSettingsObservers.AppendL( obs );*/
+// </qmail>
 }
 observers.Close();
 }
 // ----------------------------------------------------------------------------
 FUNC_LOG;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-void CIpsPlgEventHandler::SaveSyncStatusL( TMsvId aMailboxId, TInt aState )
+void CIpsPlgEventHandler::SaveSyncStatusL( TMsvId aMailboxId, TInt /*aState*/ )
 {
 FUNC_LOG;
 TMsvEntry tEntry;
 TMsvId service;
 if( !iSession )
 }
 TInt err = iSession->GetEntry( aMailboxId, service, tEntry );
 if( err == KErrNone )
 {
-iSettingsApi->SaveSyncStatusL( tEntry, aState );
 }
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 return match;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-void CIpsPlgEventHandler::CollectSubscribedFoldersL( TMsvId aMailboxId )
+void CIpsPlgEventHandler::CollectSubscribedFoldersL( TMsvId /*aMailboxId*/ )
 {
 FUNC_LOG;
 if ( iSession )
 {
-iSettingsApi->GetSubscribedImapFoldersL( aMailboxId, iImapFolderIds );
 }
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

changeset 18	578830873419
parent 0	8466d47a6819
child 20	ecc8def7944a