MCL/sf/app/commonemail: comparison emailuis/emailui/src/FreestyleEmailUiMailListVisualiser.cpp

equal deleted inserted replaced

-:e7aa27f58ae1
+:e1b6206813b4
 #include <AknUtils.h>
 #include <gulicon.h>
 #include <StringLoader.h>
 #include <FreestyleEmailUi.rsg>
 #include <featmgr.h>
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
-#include "CFSMailBox.h"
+#include "cfsmailbox.h"
-#include "CFSMailFolder.h"
+#include "cfsmailfolder.h"
 #include "fscontrolbar.h"
 #include "fscontrolbuttoninterface.h"
 #include "fstreelist.h"
 #include "fstreevisualizerbase.h"
 #include "fstreeplainonelinenodedata.h"
 #include "fstreeplainonelinenodevisualizer.h"
 #include "fstreeplaintwolineitemdata.h"
 #include "fstreeplaintwolineitemvisualizer.h"
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
 #include "ceuiemaillisttouchmanager.h"
 #include "FSEmailBuildFlags.h"
 #include "cfsccontactactionmenu.h"
 #include "mfsccontactactionmenumodel.h"
 #include <alf/alfstatic.h>
 #include <aknnotewrappers.h>
 #include <msvapi.h>
 #include <akntitle.h>
-#include "ESMailSettingsPluginUids.hrh"
+#include "esmailsettingspluginuids.hrh"
-#include "ESMailSettingsPlugin.h"
+#include "esmailsettingsplugin.h"
-#include "MFSMailBrandManager.h"
+#include "mfsmailbrandmanager.h"
 #include <AknWaitDialog.h>
 #include <aknlayoutscalable_apps.cdl.h>
 #include <layoutmetadata.cdl.h>
 #include <csxhelp/cmail.hlp.hrh>
 // Meeting request
 #include "FreestyleEmailUi.hrh"
 #include "FreestyleEmailUiTextureManager.h"
 #include "FreestyleEmailUiMailListControl.h"
 #include "FreestyleEmailUiMailViewerVisualiser.h"
 #include "FreestyleEmailUiStatusIndicator.h"
-#include "FreestyleEmailCenRepHandler.h"
+#include "freestyleemailcenrephandler.h"
 #include "FreestyleEmailUiFolderListVisualiser.h"
 #include "FreestyleEmailUiShortcutBinding.h"
 #include "FreestyleEmailUiMsgDetailsVisualiser.h"
 #include "FreestyleEmailDownloadInformationMediator.h"
 #include "FreestyleEmailUiContactHandler.h"
 CFreestyleEmailUiAppUi* aAppUi, CAlfControlGroup& aMailListControlGroup )
 : CFsEmailUiViewBase( aMailListControlGroup, *aAppUi ),
 iEnv( aEnv ),
 iListMarkItemsState( ETrue ), //Initlly list has no markings
 iMoveToFolderOngoing( EFalse ),
-iConsumeStdKeyYes_KeyUp( EFalse ) // use to prevent Call application execution if call for contact processed
+iConsumeStdKeyYes_KeyUp( EFalse ), // use to prevent Call application execution if call for contact processed
+iMailOpened(EFalse)
 	{
 FUNC_LOG;
 	}
 // ---------------------------------------------------------------------------
 iMailList->SetFocusedItemL( iTreeItemArray[0].iListItemId );
 }
 }
 SetListAndCtrlBarFocusL();
 iAppUi.StartMonitoringL();
+TIMESTAMP( "Locally stored messages fetched for message list" );
 }
 // ---------------------------------------------------------------------------
 // @see CMailListModelUpdater::MObserver::UpdateCancelled
 // ---------------------------------------------------------------------------
 CFSEmailUiMailListModelItem* newItem =
 CFSEmailUiMailListModelItem::NewLC( aNewMessage, ETypeMailItem );
 TInt idx = KErrNotFound;
 TFsTreeItemId parentId = KFsTreeRootID;
 TInt childIdx = KErrNotFound;
+TInt moveViewPortPosition = 0;
 if ( !iNodesInUse )
 {
 // Simple case: nodes are not in use. Just insert to correct place under root node.
 idx = iModel->GetInsertionPointL( *newItem );
 static_cast<CFSEmailUiMailListModelItem*>( iModel->Item(idx) );
 TFsTreeItemId nextNodeId = nextNode->CorrespondingListId();
 TInt nodeIdxUnderRoot = iMailList->ChildIndex( KFsTreeRootID, nextNodeId );
 InsertNodeItemL( idx-1, nodeIdxUnderRoot, aAllowRefresh );
 }
+moveViewPortPosition += iAppUi.LayoutHandler()->OneLineListItemHeight();
 }
 else
 {
 // Suitable parent node exists and was found
 parentNode = static_cast<CFSEmailUiMailListModelItem*>( iModel->Item(parentIdx) );
 // Insert the model item
 iModel->InsertL( newItem, idx );
 CleanupStack::Pop( newItem );
 // Insert the tree list item
-InsertListItemL( idx, parentId, childIdx, aAllowRefresh );
+TPoint viewPortCenterPos = iMailTreeListVisualizer->ViewPosition();
+TPoint viewPortTopPos = iMailTreeListVisualizer->ViewPortTopPosition();
+TInt itemPos = iMailTreeListVisualizer->GetItemWorldPosition( idx );
+TBool refresh = viewPortTopPos.iY != 0 && itemPos < viewPortCenterPos.iY;
+if( refresh )
+	{
+		InsertListItemL( idx, parentId, childIdx, EFalse );
+		// viewPort update needed
+		moveViewPortPosition += iAppUi.LayoutHandler()->TwoLineListItemHeight(); // add mail item height
+		viewPortCenterPos.iY += moveViewPortPosition;
+		iMailTreeListVisualizer->ViewPositionChanged( viewPortCenterPos, EFalse, 1 );
+	}
+else
+	{
+	InsertListItemL( idx, parentId, childIdx, aAllowRefresh );
+	}
 // Move focus after insertion if necessary
 if ( firstItemWasFocused )
 {
 TFsTreeItemId firstItemId = iMailList->Child( KFsTreeRootID, 0 );
 void CFSEmailUiMailListVisualiser::ChildDoActivateL(const TVwsViewId& aPrevViewId,
 TUid aCustomMessageId,
 const TDesC8& aCustomMessage)
 	{
 FUNC_LOG;
+TIMESTAMP( "Opening message list view" );
 iShowReplyAll = EFalse;
 	if ( !iFirstStartCompleted )
 	    {
 	    DoFirstStartL();
 iCurrentClientRect = clientRect;
 	iThisViewActive = ETrue;
 	// Set email indicator off.. user has checked the new emails
-	TFsEmailUiUtility::ToggleEmailIconL(EFalse);
+	TFsEmailUiUtility::ToggleEmailIconL(EFalse, activationData.iMailBoxId );
 	iShiftDepressed = EFalse; // clear state just in case
 	// Inform MR observer if needed, special MR case, returning from attachment list
 	iAppUi.MailViewer().CompletePendingMrCommand();
 	    iControlBarControl->MakeSelectorVisible( iAppUi.IsFocusShown() );
 	    }
 	UpdateButtonTextsL();
 	FocusVisibilityChange( iAppUi.IsFocusShown() );
 	iAppUi.ShowTitlePaneConnectionStatus();
+	TIMESTAMP( "Message list view opened" );
 	}
 // ---------------------------------------------------------------------------
 // Sets status bar layout
 // ---------------------------------------------------------------------------
 	    currentFolderType = iMailFolder->GetFolderType();
 	    }
 // MAIN MENU ***************************************************************************
 	if ( aResourceId == R_FSEMAILUI_MAILLIST_MENUPANE )
-		{
+	    {
+// Sync/cancel sync
+	    CFSMailBox* activeMailbox = iAppUi.GetActiveMailbox();
+	    TBool supportsSync = activeMailbox->HasCapability( EFSMBoxCapaSupportsSync );
+// flag to hide or show SyncButton
+TBool hideSync = GetLatestSyncState();
+if(activeMailbox->CurrentSyncState()==StartingSync) hideSync=EFalse;
+// hide or show options: Sync/cancel sync
+if ( !supportsSync )
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdCancelSync, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdSync, ETrue );
+}
+else if ( hideSync || iMailListModelUpdater->IsUpdating() )
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdSync, ETrue );
+}
+else
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdCancelSync, ETrue );
+}
 		// Saves a focus visibility.
 		iLastFocus = EFalse;
 		if( iFocusedControl == EMailListComponent && IsFocusShown() )
 		    {
 		    iLastFocus = ETrue;
 	{
 FUNC_LOG;
 	iMailList->RemoveAllL();
 	iTreeItemArray.Reset();
+// when we get refresh mail list updates should be fully enabled
+iMailOpened = EFalse;
 	RefreshListItemsL();
 	if ( !iModel->Count() )
 		{
 		iFocusedControl = EControlBarComponent;
 // HandleForegroundEventL
 // Function checks in foregroundevent that whether settings have changed and
 // If there is a need to refresh the list.
 // ---------------------------------------------------------------------------
 //
-void CFSEmailUiMailListVisualiser::HandleForegroundEventL()
+void CFSEmailUiMailListVisualiser::HandleForegroundEventL( TBool aForeground )
 	{
 FUNC_LOG;
-	if ( iFirstStartCompleted ) // Safety
+if( iMailFolder )
+{
+TFsEmailUiUtility::ToggleEmailIconL(EFalse, iMailFolder->GetMailBoxId() );
+}
+if ( aForeground && iFirstStartCompleted ) // Safety
 	    {
 	    // Update mail list settings and date formats, is done every time
 	    // the user might have changed these in settings, so the list needs to refresh
 	    // Store previous modes
 	    TInt prevListMode = iListMode;
 // ---------------------------------------------------------------------------
 //
 void CFSEmailUiMailListVisualiser::HandleCommandL( TInt aCommand )
 {
 FUNC_LOG;
+TIMESTAMP( "Message list command for handling" );
 CompletePendingRefresh();
 // custom command handling for launching plugin settings
 	if ( EFsEmailUiCmdSettingsBaseCommandId <= aCommand
 		 && EFsEmailUiCmdSettingsBaseCommandIdMax > aCommand )
 switch( aCommand )
 {
 	case EAknSoftkeyOpen:
 {
+TIMESTAMP( "Open email selected from message list" );
 if( !iAppUi.IsFocusShown() )
 {
 iAppUi.SetFocusVisibility( ETrue );
 break;
 }
 }
 	case EAknSoftkeySelect:
 	    {
+	    TIMESTAMP( "Open email selected from message list" );
 	    if ( iFocusedControl == EMailListComponent )
 	        {
 	        CFSEmailUiMailListModelItem* item = dynamic_cast<CFSEmailUiMailListModelItem*>(iModel->Item(HighlightedIndex()));
 	        // MAIL ITEM; OPEN MAIL
 	        if ( item && item->ModelItemType() == ETypeMailItem )
 				}
 	break;
 case EEikCmdExit:
 case EAknSoftkeyExit:
 case EFsEmailUiCmdExit:
+TIMESTAMP( "Exit selected from message list" );
 iAppUi.Exit();
 break;
 	case EFsEmailUiCmdCalActionsReplyAsMail:
 		case EFsEmailUiCmdActionsReply:
 			{
+			TIMESTAMP( "Reply to selected from message list" );
 	   	 	ReplyL( NULL ); // Function will check marked/highlighted msg
 			}
 break;
 		case EFsEmailUiCmdActionsReplyAll:
 			{
+			TIMESTAMP( "Reply to all selected from message list" );
 			ReplyAllL( NULL ); // Function will check marked/highlighted msg
 			}
 break;
 	case EFsEmailUiCmdCalActionsForwardAsMail:
 		case EFsEmailUiCmdActionsForward:
 			{
+			TIMESTAMP( "Forward selected from message list" );
 	ForwardL( NULL ); // Function will check marked/highlighted msg
 			}
 break;
 	case EFsEmailUiCmdActionsCallSender:
 			{
 }
 break;
 	case EFsEmailUiCmdActionsDeleteCalEvent:
 		case EFsEmailUiCmdActionsDelete:
 			{
+			TIMESTAMP( "Delete to selected from message list" );
 			TInt index = HighlightedIndex();
 			CFSEmailUiMailListModelItem* item =
 				dynamic_cast<CFSEmailUiMailListModelItem*>(
 						iModel->Item( index ) );
 				}
 			}
 break;
 		case EFsEmailUiCmdCompose:
 			{
+			TIMESTAMP( "Create new message selected from message list" );
 			CreateNewMsgL();
 			}
 			break;
 	case EFsEmailUiCmdMessageDetails:
 			{
 		}
 		break;
 	case EFsEmailUiCmdOpen:
 case EFsEmailUiCmdActionsOpen:
 	{
+	TIMESTAMP( "Open email selected from message list" );
 	        if ( iFocusedControl == EMailListComponent )
 	            {
 	            // Opening can happen only when there's exactly one message marked or in focus
 	            if ( actionTargetItems.Count() == 1 )
 	                {
 			    if(!GetLatestSyncState())
 			        {
 			        iAppUi.SyncActiveMailBoxL();
 			        // Sync was started by the user
 			        ManualMailBoxSync(ETrue);
 iAppUi.ManualMailBoxSync( ETrue );
 			        }
 			    }
 			}
 			break;
 	case EFsEmailUiCmdCancelSync:
 		{
-			TBool supportsSync = iAppUi.GetActiveMailbox()->HasCapability( EFSMBoxCapaSupportsSync );
+		TBool supportsSync = iAppUi.GetActiveMailbox()->HasCapability( EFSMBoxCapaSupportsSync );
-			if ( supportsSync )
+		if ( supportsSync )
-				{
+		    {
-	       		iAppUi.StopActiveMailBoxSyncL();
+	            iAppUi.StopActiveMailBoxSyncL();
-				}
+	            // Sync was started by the user
+	            ManualMailBoxSync(ETrue);
+	            iAppUi.ManualMailBoxSync( ETrue );
+		    }
 		}
 		break;
 case EFsEmailUiCmdGoOffline:
 	{
 	   	iAppUi.GetActiveMailbox()->GoOfflineL();
 	    default:
 	break;
 } // switch ( aCommand )
 CleanupStack::PopAndDestroy( &actionTargetItems );
+TIMESTAMP( "Message list selected operation done" );
 }
 // ---------------------------------------------------------------------------
 //
 //
 if ( item && item->ModelItemType() == ETypeMailItem )
 {
 CFSMailMessage* messagePtr = &item->MessagePtr();
 if ( messagePtr )
 {
+TIMESTAMP( "Open email selected from message list" );
 OpenHighlightedMailL();
 return EKeyWasConsumed;
 }
 }
 // SEPARAOR ITEM; COLLAPSE / EXPAND NODE
 if ( item && item->ModelItemType() == ETypeMailItem )
 {
 CFSMailMessage* messagePtr = &item->MessagePtr();
 if ( messagePtr )
 {
+TIMESTAMP( "Open email selected from message list" );
 OpenHighlightedMailL();
 }
 }
 // SEPARATOR ITEM; COLLAPSE / EXPAND NODE
 else if ( item && item->ModelItemType() == ETypeSeparator )
 // Send flags, local and server
 msgPtr.ResetFlag( EFSMsgFlag_Read );
 }
 msgPtr.SaveMessageL();  // Save flag
-// Switch icon to correct one
+if ( !iMailOpened )
-UpdateMsgIconAndBoldingL( aIndex );
+{
+// Switch icon to correct one if mail list is visible
+UpdateMsgIconAndBoldingL( aIndex );
+}
 if ( iCurrentSortCriteria.iField == EFSMailSortByUnread )
 {
 // Attribute affecting the current sorting order has been changed.
 // Thus, the list order may now be incorrect.
 			iTreeItemArray.Remove( idx ); // remove from internal array.
 	 		iModel->RemoveAndDestroy( idx ); // Remove from model
 	    }
 		}
 	    }
+	if ( aEntryIds.Count() > 0  )
+		{
+if ( iMailListUpdater )
+{
+if ( iMailListUpdater->IsActive() )
+{
+iMailListUpdater->Stop();
+}
+iMailListUpdater->StartL();
+}
+		}
 	if ( iNodesInUse )
 		{
 		RemoveUnnecessaryNodesL();
 		}
 	        CFSMailMessage* confirmedMsgPtr(0);
 	        confirmedMsgPtr = iAppUi.GetMailClient()->GetMessageByUidL(iAppUi.GetActiveMailboxId(),
 	                iMailFolder->GetFolderId(), item->MessagePtr().GetMessageId(), EFSMsgDataEnvelope );
 	        if ( confirmedMsgPtr )
 	            {
+	            iMailOpened = ETrue;
 	            ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
 	            // Pointer confirmed, store Id and delete not needed anymore
 	            TFSMailMsgId confirmedId = confirmedMsgPtr->GetMessageId();
 	      		TBool isCalMessage = confirmedMsgPtr->IsFlagSet( EFSMsgFlag_CalendarMsg );
 	      		TBool isReadMessage = confirmedMsgPtr->IsFlagSet( EFSMsgFlag_Read );
 {
 FUNC_LOG;
 iDateChanged = ETrue;
 if ( iAppUi.IsForeground() )
 {
-HandleForegroundEventL();
+HandleForegroundEventL(ETrue);
 }
 }
 // ---------------------------------------------------------------------------
 // CreateFolderNameLC
 	// Irrelevant items for focused mail list item get dimmed at runtime
 	// Check mail list item's type
 	CFSEmailUiMailListModelItem* item =
 		static_cast<CFSEmailUiMailListModelItem*>( iModel->Item( HighlightedIndex() ) );
-	if ( item && item->ModelItemType() == ETypeMailItem )
+	if ( item )
 		{
-		// Add mark as read / unread options
+		if ( item->ModelItemType() == ETypeMailItem )
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMarkAsUnread, !IsMarkAsUnreadAvailableL() );
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMarkAsRead, !IsMarkAsReadAvailableL() );
-		// Check support for object mail iten moving
-		TBool supportsMoving = iAppUi.GetActiveMailbox()->HasCapability( EFSMBoxCapaMoveToFolder );
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsMoveMessage, !supportsMoving );
-		// Hide / show follow up
-		TBool supportsFlag = TFsEmailUiUtility::IsFollowUpSupported( *iAppUi.GetActiveMailbox() );
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsFlag, !supportsFlag );
-		// Hide mark if applicable
-		if ( iMailList->IsMarked( iMailList->FocusedItem() ) )
 			{
-			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMark, ETrue );
+			// Add mark as read / unread options
-			}
+			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMarkAsUnread, !IsMarkAsUnreadAvailableL() );
+			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMarkAsRead, !IsMarkAsReadAvailableL() );
-		// Hide collapse / expand all
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsCollapseAll, ETrue );
+			// Check support for object mail iten moving
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsExpandAll, ETrue );
+			TBool supportsMoving = iAppUi.GetActiveMailbox()->HasCapability( EFSMBoxCapaMoveToFolder );
-		}
+			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsMoveMessage, !supportsMoving );
-	else if ( item->ModelItemType() == ETypeSeparator )
-		{
+			// Hide / show follow up
-		// Hide mark as read / unread options
+			TBool supportsFlag = TFsEmailUiUtility::IsFollowUpSupported( *iAppUi.GetActiveMailbox() );
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMarkAsUnread, ETrue );
+			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsFlag, !supportsFlag );
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMarkAsRead, ETrue );
+			// Hide mark if applicable
-		// Hide move & follow up
+			if ( iMailList->IsMarked( iMailList->FocusedItem() ) )
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsMoveMessage, ETrue );
+				{
-		iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsFlag, ETrue );
+				iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMark, ETrue );
+				}
-		// Hide collapse / expand all when applicable
-		if ( iNodesInUse == EListControlSeparatorDisabled || !iModel->Count() )
+			// Hide collapse / expand all
-			{
 			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsCollapseAll, ETrue );
 			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsExpandAll, ETrue );
 			}
-		else
+		else if ( item->ModelItemType() == ETypeSeparator )
 			{
-			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsCollapseAll, AllNodesCollapsed() );
+			// Hide mark as read / unread options
-			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsExpandAll, AllNodesExpanded() );
+			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMarkAsUnread, ETrue );
+			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMarkAsRead, ETrue );
+			// Hide move & follow up
+			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsMoveMessage, ETrue );
+			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsFlag, ETrue );
+			// Hide collapse / expand all when applicable
+			if ( iNodesInUse == EListControlSeparatorDisabled || !iModel->Count() )
+				{
+				iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsCollapseAll, ETrue );
+				iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsExpandAll, ETrue );
+				}
+			else
+				{
+				iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsCollapseAll, AllNodesCollapsed() );
+				iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsExpandAll, AllNodesExpanded() );
+				}
 			}
 		}
 	// Set the position for the popup
 	iStylusPopUpMenu->SetPosition( aPoint );
 // event is not related to the current folder => do nothing
 }
 			}
 		else if ( aEvent == TFSEventMailChanged && iMailFolder ) // Added iMailFolder null safety check
 			{
-			// Change mail item icon or read status
+			if ( !iMailOpened ) // do not handle mail changed while viewer/editor is open. This may cause flickering
-			RArray<TFSMailMsgId>* entries = static_cast<RArray<TFSMailMsgId>*>( aParam1 );
+			    {
-			TFSMailMsgId* parentFolderId = static_cast<TFSMailMsgId*>( aParam2 );
+			// Change mail item icon or read status
-			TFSMailMsgId currentFolderId = iMailFolder->GetFolderId();
+			RArray<TFSMailMsgId>* entries = static_cast<RArray<TFSMailMsgId>*>( aParam1 );
-			if ( *parentFolderId == currentFolderId )
+			TFSMailMsgId* parentFolderId = static_cast<TFSMailMsgId*>( aParam2 );
-				{
+			TFSMailMsgId currentFolderId = iMailFolder->GetFolderId();
-	 			// Refresh mailfolder to get correct actual data
+			if ( *parentFolderId == currentFolderId )
-				/*
+				{
-iMailListModelUpdater->Cancel();
+	 			// Refresh mailfolder to get correct actual data
-SafeDelete(iMailFolder);
+				/*
-				iMailFolder = iAppUi.GetMailClient()->GetFolderByUidL( aMailboxId, currentFolderId );
+iMailListModelUpdater->Cancel();
-				*/
+SafeDelete(iMailFolder);
-				for ( TInt i=0 ; i<entries->Count() ; i++ )
+				iMailFolder = iAppUi.GetMailClient()->GetFolderByUidL( aMailboxId, currentFolderId );
-					{
+				*/
-					TFSMailMsgId msgId = (*entries)[i];
+				for ( TInt i=0 ; i<entries->Count() ; i++ )
-					TInt idx = ItemIndexFromMessageId( msgId );
+					{
-					if ( idx != KErrNotFound )
+					TFSMailMsgId msgId = (*entries)[i];
-					    {
+					TInt idx = ItemIndexFromMessageId( msgId );
-					    UpdateItemAtIndexL( idx );
+					if ( idx != KErrNotFound )
-					    }
+					    {
-					}
+					    UpdateItemAtIndexL( idx );
-				}
+					    }
+					}
+				}
+			    }
 			}
 		else if ( aEvent == TFSEventMailboxSyncStateChanged )
 			{
 	  		TSSMailSyncState* newSyncState = static_cast<TSSMailSyncState*>( aParam1 );
 		if ( newSyncState != 0 && *newSyncState != 0 )
 			{
 	    		switch ( *newSyncState )
 	    			{
 	    			case StartingSync:
-	   					{
+	   			    {
-	   					//If sync was started by user, show the synchronisation indicator
+	   			    //If sync was started by user, show the synchronisation indicator
-	   					if ( iManualMailBoxSync )
+	   			    if ( iManualMailBoxSync )
-	   						{
+	   			        {
-			   		     	ManualMailBoxSync(EFalse);
+			   		ManualMailBoxSync(EFalse);
-	   						}
+	   				}
-		   				}
+		   		    }
-						break;
+				    break;
+	    			case SyncCancelled:
+	    			    {
+	    			    //If sync was started by user, show the synchronisation indicator
+	    			    if ( iManualMailBoxSync )
+	    			        {
+	    			        ManualMailBoxSync(EFalse);
+	    			        }
+	    			    }
+	    			    break;
 	    			}
 			}
 			}
 		}
 	}

branch	RCL_3
changeset 8	e1b6206813b4
parent 3	a4d6f1ea0416
child 10	f5907b1a1053