FCL/sf/app/commonemail: comparison emailuis/emailui/src/FreestyleEmailUiAppui.cpp

equal deleted inserted replaced

-:8466d47a6819
+:12c456ceeff2
 _LIT( KETelCallEngPhCltResourceFile, "PhoneClient.rsc" );
 //</cmail>
 _LIT( KMsgReaderFsDll,"freestylemessagescanner.dll"); // DLL provided by msg reader.
 _LIT( KPhoneModuleName, "Phonetsy.tsy");
 _LIT( KPhoneName, "DefaultPhone");
-// Message editor resources
+// Message editor resource file with wild cards
-_LIT( KMsgEditorAppUiResourceFileName, "z:msgeditorappui.rsc" );
+_LIT( KMsgEditorAppUiResourceFileName, "msgeditorappui.r*" );
-// FSMailServer resources
+// FSMailServer resource file with path and wild cards
-_LIT( KFSMailServerResourceFileName, "z:fsmailserver.rsc" );
+_LIT( KFSMailServerResourceFileNameWithPath, "\\resource\\apps\\fsmailserver.r*" );
 // 6 seconds
 const TTimeIntervalMicroSeconds32 KIdleTimeInterval = 6000000;
 static TBool g_ApplicationExitOnGoing = EFalse;
 	( aObject )->ViewLoadIdleCallbackFunctionL();
 }
 const TUint KConnectionStatusIconRotationInterval = 100;
 const TInt KConnectionStatusIconRotationAmount = 18;
+// Length of the drive letter descriptor (e.g. "c:")
+const TInt KDriveDescLength = 2;
 // ---------------------------------------------------------------------------
 // C++ constructor.
 // ---------------------------------------------------------------------------
 //
 FUNC_LOG;
 iEnv = &aEnv;
 }
 // ---------------------------------------------------------------------------
+// Load specified resource file, file name may (and should) contain wild cards
+// ---------------------------------------------------------------------------
+//
+TInt CFreestyleEmailUiAppUi::LoadResourceFileL(
+const TDesC& aFileName,
+const TDesC& aFilePath )
+{
+FUNC_LOG;
+TFindFile search( iCoeEnv->FsSession() );
+CDir* dirList = NULL;
+TInt err = search.FindWildByDir( aFileName, aFilePath, dirList );
+if ( err == KErrNone )
+{
+// After succesfull FindWildByDir; dirList contains list of found file
+// names and search.File() returns the drive and path of the file(s)
+if ( dirList->Count() > 0 )
+{
+TParse parse;
+parse.Set( (*dirList)[0].iName, &search.File(), NULL );
+TFileName nearestFile( parse.FullName() );
+BaflUtils::NearestLanguageFile( iCoeEnv->FsSession(), nearestFile );
+delete dirList;
+INFO_1( "Load resource: %S", &nearestFile );
+// Return the resource file offset if file loaded succesfully
+return iEikonEnv->AddResourceFileL( nearestFile );
+}
+delete dirList;
+}
+// Leave if resource file is not found
+User::Leave( err );
+return 0; // To avoid compiler warnings
+}
+// ---------------------------------------------------------------------------
 // ConstructL is called by the application framework
 // ---------------------------------------------------------------------------
 //
 void CFreestyleEmailUiAppUi::ConstructL()
 {
 FUNC_LOG;
-// for debug builds create log file directory automatically
+// Load message editor resources (needed for ENote fetch)
-#ifdef _DEBUG
+iMsgEditorResourceOffset = LoadResourceFileL(
-_LIT( KDebugLogDir, "c:\\logs\\FreestyleEmailUi\\" );
+KMsgEditorAppUiResourceFileName,
-BaflUtils::EnsurePathExistsL( iEikonEnv->FsSession(), KDebugLogDir );
+KDC_RESOURCE_FILES_DIR );
-#endif
+// Load FSMailServer resource file, search first the same drive from where
-// Add message editor resources (needed for ENote fetch)
+// our process is loaded as FSMailServer should be installed in same drive
-TParse parse;
+RProcess ownProcess;
-parse.Set( KMsgEditorAppUiResourceFileName, &KDC_RESOURCE_FILES_DIR, NULL );
+TFileName ownProcessName( ownProcess.FileName() );
-TFileName fileName( parse.FullName() );
+ownProcess.Close();
-BaflUtils::NearestLanguageFile( iCoeEnv->FsSession(), fileName );
+iFSMailServerResourceOffset = LoadResourceFileL(
-iMsgEditorResourceOffset = iEikonEnv->AddResourceFileL( fileName );
+KFSMailServerResourceFileNameWithPath,
-// Add FSMailServer resources
+ownProcessName.LeftTPtr( KDriveDescLength ) );
-parse.Set( KFSMailServerResourceFileName, &KDC_APP_RESOURCE_DIR, NULL );
-fileName = parse.FullName();
-BaflUtils::NearestLanguageFile( iCoeEnv->FsSession(), fileName );
-iFSMailServerResourceOffset = iEikonEnv->AddResourceFileL( fileName );
 	// flag indicating whether we are in AppUi::ConstructL
 	// workaround for compose view loadbackgroundcontext sending skin changed events
 	// and causing texture manager to be reconstructed many times
 	iConstructComplete = EFalse;
 // Initialize the flip state and the observer for listening to the flip
 // state changed events. The initial state will be reported in construction
 iPropertySubscriber =
 CFreestyleEmailUiPropertySubscriber::NewL( KPSUidHWRM, KHWRMFlipStatus, *this );
 // Create Document Handler instance
 iDocumentHandler = CDocumentHandler::NewL();
 iFileHandleShutter = CFsEmailFileHandleShutter::NewL(*iDocumentHandler);
 CAlfDisplay& disp = iEnv->NewDisplayL( ClientRect(), CAlfEnv::ENewDisplayAsCoeControl ); // aAppUi->
 //<cmail>
 // Set up layouthandler
 iLayoutHandler = CFSEmailUiLayoutHandler::NewL( *iEnv );
 	iLayoutHandler->ScreenResolutionChanged();
 // Create mail client, list mailboxes
 iMailClient = CFSMailClient::NewL();
 	// Connect to messaging server
 	iMsvSession = CMsvSession::OpenSyncL( *this );
 	iFsTextureManager = CFreestyleEmailUiTextureManager::NewL( *iEnv, this );
 	CFsDelayedLoader::InstanceL()->Start();
 	// New mailbox query async callback
 	iNewBoxQueryAsyncCallback = new (ELeave) CAsyncCallBack( CActive::EPriorityStandard );
 	iNewBoxQueryAsyncCallback->Set( TCallBack( DisplayCreateQueryL, this ) );
 iActionMenuHandler = CFSEmailUiActionMenu::NewL( this );
 	// Create download info mediator
 	iDwnldMediator = CFSEmailDownloadInfoMediator::NewL( *iMailClient );
 // If we have no mailboxes yet start a setup wizard. Else, if this app has been launched
 	// by a setup wizard then handle the mailbox data in central repository
 	iWizardObserver = CFSEmailUiWizardObserver::NewL( this, iMainUiGridVisualiser );
 	iConstructComplete = ETrue;
+iExitGuardian = CEUiExitGuardian::NewL( *this );
+iConnectionStatusVisible = ETrue;
+// Create custom statuspane indicators object, which shows priority and followup flags
+CreateStatusPaneIndicatorsL();
+iConnectionStatusIconAnimTimer = CFSEmailUiGenericTimer::NewL(this, CActive::EPriorityLow);
 // this includes a wait note where code running will be pending
 // until a certain callback event is received
 // -> thus keep this last in this method!
 iWizardObserver->DoWizardStartupActionsL();
+}
-iExitGuardian = CEUiExitGuardian::NewL( *this );
-iConnectionStatusVisible = ETrue;
-// Create custom statuspane indicators object, which shows priority and followup flags
-CreateStatusPaneIndicatorsL();
-iConnectionStatusIconAnimTimer = CFSEmailUiGenericTimer::NewL(this, CActive::EPriorityLow);
-iFocusTimer = CPeriodic::New(CActive::EPriorityIdle);
-	}
 // Functions loads some views as delayed to reduce startup time
 TInt CFreestyleEmailUiAppUi::ViewLoadIdleCallbackFunctionL()
 	{
 FUNC_LOG;
 	}
 CFreestyleEmailUiAppUi::~CFreestyleEmailUiAppUi()
 {
 FUNC_LOG;
 if ( iMsgEditorResourceOffset )
 {
 iEikonEnv->DeleteResourceFile( iMsgEditorResourceOffset );
 }
 if ( iFSMailServerResourceOffset )
 delete iNewBoxQueryAsyncCallback;
 delete iVpkContactManager;
 	delete iPropertySubscriber;
 DeleteStatusPaneIndicators();
 	if ( iAutoSyncMonitor )
 		{
 		iAutoSyncMonitor->StopMonitoring();
 		delete iAutoSyncMonitor;
 		}
 	TFsEmailUiUtility::DeleteStaticData();
 // destroys the Download Information mediator
 // Destruction must be done here as other Tls data depends on it.
 CFSEmailDownloadInfoMediator::Destroy();
 delete iNaviDecorator2MailViewer;
 delete iConnectionStatusIconAnimTimer;
-if (iFocusTimer)
-	{
-		CancelFocusRemovalTimer();
-		delete iFocusTimer;
-	}
 }
 void CFreestyleEmailUiAppUi::EnterFsEmailViewL( TUid aViewId )
 {
 void CFreestyleEmailUiAppUi::ReturnFromPluginSettingsView()
 {
 FUNC_LOG;
 // Check if we just returned from a plugin settings view. In that case, the current active view
 // and view history must be updated here (because RetrunToPreviousViewL() has not been used).
 if ( iSettingsViewActive )
 {
 iSettingsViewActive = EFalse;
 // Set the iCurrentActiveView pointer
 if ( iNavigationHistory->IsEmpty() )
 {
 // Activate grid view if the view history stack is empty. This happens only
 // if something has gone wrong.
 FUNC_LOG;
 	if ( aMessageWasDeleted )
 	    {
 // Message deleted, remove mail viewer from the stack
 // => view returns directly mail list (or any other view where the viewer was started from)
 		TMailListActivationData tmp;
 		tmp.iRequestRefresh = ETrue;
 		const TPckgBuf<TMailListActivationData> pkgOut( tmp );
 		ReturnToPreviousViewL(pkgOut);
 	    }
 	}
 TUid CFreestyleEmailUiAppUi::ReturnToPreviousViewL( const TDesC8& aCustomMessage /*= KNullDesC8*/ )
 {
 FUNC_LOG;
 iPreviousActiveView = iCurrentActiveView;
 CFsDelayedLoader::InstanceL()->GetContactHandlerL()->Reset();
 // Set the iCurrentActiveView pointer
 if ( iNavigationHistory->IsEmpty() )
 {
 // Activate grid view if the view history stack is empty. This happens only
 iEnv->Send( TAlfGroupCommand(*iFolderListControlGroup, EAlfOpShow, &Display()), 0 );
 iFolderListControlGroup->SetAcceptInput( ETrue );
 }
 void CFreestyleEmailUiAppUi::ShowSortListInPopupL(
-const TFSMailSortField aCurrentSortOrder,
+const TFSMailSortCriteria aCurrentSortCriteria,
 const TFSFolderType aFolderType,
 MFSEmailUiSortListCallback* aCallback,
 MFsControlButtonInterface* aButton )
 {
 FUNC_LOG;
-iFolderListVisualiser->ShowSortListPopupL( aCurrentSortOrder, aFolderType, aCallback, aButton );
+iFolderListVisualiser->ShowSortListPopupL( aCurrentSortCriteria, aFolderType, aCallback, aButton );
 iCurrentActiveView->ControlGroup().SetAcceptInput( EFalse );
 iEnv->Send( TAlfGroupCommand(*iFolderListControlGroup, EAlfOpShow, &Display()), 0 );
 iFolderListControlGroup->SetAcceptInput( ETrue );
 }
 }
 void CFreestyleEmailUiAppUi::ProcessCommandL( TInt aCommand )
 {
 FUNC_LOG;
 // For a reason unknown compose view propagates a leave when the options
 // menu open -command is sent to it during the time when it has started
 // the view deactivation but not yet completed that. It causes unnecessay
 // leave notes in a complete normal use cases in the emulator. To remove
 // the notes but keep the regression risk at minimum (ie. not do any major
 // refactoring) trap the leave here. Propagate other leaves normally.
 TRAPD( err, CAknViewAppUi::ProcessCommandL( aCommand ) );
 if ( err != KErrNcsComposeViewNotReady )
 {
 User::LeaveIfError( err );
 }
 }
 // was already destoyed in this phase. Here in Exit() MailClient->Close
 // can finish safely before the environment gets destroyed.
 // First, prepare viewer, search list and composer for exit, destroys mailbox object before
 // This exit preparation should be moved to base class in the future.
 if ( iMsgDetailsVisualiser )
 {
 iMsgDetailsVisualiser->PrepareForExit();
 }
 if ( iMailListVisualiser )
 {
 {
 iMailClient->UnsubscribeMailboxEvents( iSubscribedMailBoxes[i], *this );
 }
 iSubscribedMailBoxesIds.Reset();
 iSubscribedMailBoxes.Reset();
 	if ( iMailClient )
 {
 iMailClient->RemoveObserver( *this );
 iMailClient->Close();
 iMailClient = NULL;
 FUNC_LOG;
 	#ifndef KAknFullOrPartialForegroundGained
 	const TInt KAknFullOrPartialForegroundGained = 0x10281F36;
 	const TInt KAknFullOrPartialForegroundLost   = 0x10281F37;
 	#endif
 TBool closeMenu = EFalse;
 	// Let folder list visualizer to handle event first because if the popup
 	// is showed, that needs to be closed when pointer click happens outside of the
 	// popup rect and also following pointer up event has to be consumed
 if ( iFolderListVisualiser && iFolderListVisualiser->HandleWsEventL( aEvent ) )
 {
 return;
 }
 	TInt key = aEvent.Key()->iScanCode;
 // <cmail>
 // to disable voice commands during creating new mail message
 if (EStdKeyYes == key && aEvent.Type() == EEventKeyDown  && iCurrentActiveView == iComposeView )
 	    {
 		    {
 HandleCommandL( EEikCmdExit );
 }
 		    //} //<cmail>
 		}
 TInt keyCode = aEvent.Key()->iCode;
 if ( EKeyQwertyOn == keyCode ||
 EKeyQwertyOff == keyCode )
 {
 // Close menu when keyboard is opened or closed.
 closeMenu = ETrue;
 }
 switch ( aEvent.Type() )
 {
 case KAknFullOrPartialForegroundLost:
 break;
 case KAknFullOrPartialForegroundGained:
 		}
 	break;
 default:
 break;
 	}
 // Close menu
 if ( closeMenu && iCurrentActiveView != NULL )
 {
 CEikMenuBar* menu = iCurrentActiveView->MenuBar();
 if ( menu != NULL )
 {
 if ( menu->IsDisplayed() )
 {
 menu->StopDisplayingMenuBar();
 }
 }
 }
 CAknAppUi::HandleWsEventL(aEvent, aDestination);
 	}
 CAlfDisplay& CFreestyleEmailUiAppUi::Display()
 	{
 // compose screen loadbackgroundcontext sends 2 skin change events
 //if( aType == KAknsMessageSkinChange && iConstructComplete )
 //    {
 //    CAlfEnv::Static()->NotifySkinChangedL();
 //    }
 if( aType == KEikDynamicLayoutVariantSwitch || aType == KAknsMessageSkinChange)
 {
 	  	TRect screenRect;
 	 	AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, screenRect );
 //<cmail> layout manager call removed </cmail>
 void CFreestyleEmailUiAppUi::SetActiveMailboxL( TFSMailMsgId aActiveMailboxId, TBool aAutoSync )
 	{
 FUNC_LOG;
 	// Set flag
 	iAutomatedMailBoxOnline = EFalse;
 	// Try to get the mailbox
 	CFSMailBox* newActiveBox = iMailClient->GetMailBoxByUidL( aActiveMailboxId );
 	User::LeaveIfNull( newActiveBox );
 // Replace active mailbox of the application if getting the mailbox was succesful
 delete iActiveMailbox;
 iActiveMailbox = newActiveBox;
 iActiveMailboxId = iActiveMailbox->GetId();
 iActiveBoxInboxId = iActiveMailbox->GetStandardFolderId( EFSInbox );
 	SubscribeMailboxL( iActiveMailboxId );
 	// Start connect automatically if asked by the caller
 	// Disabled if offline or roaming
 	}
 TBool CFreestyleEmailUiAppUi::MessageReaderSupportsFreestyle()
 	{
 FUNC_LOG;
 	// Check availability of Reader if necessary. Msg reader cannot be installed
 	// from sisx so checking is done only once. KErrGeneral at startup.
 	if ( iMsgReaderIsSupported == KErrGeneral )
 		{
 		RLibrary freestyleMessageScannerLibrary;
 TUidType uidType( KDynamicLibraryUid, KSharedLibraryUid, TUid::Uid( 0x10281C61 ) );
 void CFreestyleEmailUiAppUi::EventL( TFSMailEvent aEvent, TFSMailMsgId aMailbox,
 TAny* aParam1, TAny* aParam2, TAny* aParam3 )
 {
 FUNC_LOG;
 if (iExitGuardian)
 {
 iExitGuardian->EnterLC();
 }
 //If syncs were started by user, show the synchoronisation indicator
 if(iManualMailBoxSyncAll)
 {
 ManualMailBoxSyncAll(EFalse);
 }
-else if (iManualMailBoxSync)
-{
-TDesC* mbName(0);
-CFSMailBox* mb = GetActiveMailbox();
-if ( mb )
-{
-mbName = &mb->GetName();
-}
-}
 }
 break;
 case SyncError:
 {
 // error occured during "Connect" or "Send and receive" operation
 // check if user needs to be notified
 if ( iManualMailBoxSync )
 infoNote->ExecuteLD( *text );
 CleanupStack::PopAndDestroy( text );
 ManualMailBoxSync( EFalse );
 }
 }
 break;
 case FinishedSuccessfully:
 case SyncCancelled:
 case Idle:
 {
 ManualMailBoxSync( EFalse );
 }
 break;
 				case PushChannelOffBecauseBatteryIsLow:
 					{
-					CFSMailBox* mb = iMailClient->GetMailBoxByUidL( aMailbox );
-					CleanupStack::PushL( mb );
-					TDesC* mbName = &mb->GetName();
-		  			CleanupStack::PopAndDestroy( mb );
 					}
 					break;
 			} //switch
 			}
 		UpdateTitlePaneConnectionStatus();
 	    {
 	    iNavigationHistory->Head()->MoveToPreviousMsgL( aCurrentMsgId, aFoundPreviousMsgId );
 	    }
 	return ret;
 	}
+// Move to previous message when the current message is deleted in viewer
+TInt CFreestyleEmailUiAppUi::MoveToPreviousMsgAfterDeleteL( TFSMailMsgId aFoundPreviousMsgId )
+	{
+	FUNC_LOG;
+	TInt ret(KErrNotFound);
+	if ( !iNavigationHistory->IsEmpty() )
+		{
+		iNavigationHistory->Head()->MoveToPreviousMsgAfterDeleteL( aFoundPreviousMsgId );
+		}
+	return ret;
+	}
 CDocumentHandler& CFreestyleEmailUiAppUi::DocumentHandler()
 	{
 FUNC_LOG;
 	return *iDocumentHandler;
 	}
 void CFreestyleEmailUiAppUi::UpdateTitlePaneConnectionStatus(
 		TForcedStatus aForcedStatus /*= ENoForce*/ )
 {
 FUNC_LOG;
 iForcedConnectionStatus = aForcedStatus;
 if ( iConnectionStatusVisible )
 	{
 	// Get connection status of the current mailbox
 	TFSMailBoxStatus connectionStatus = EFSMailBoxOffline;
 	TSSMailSyncState syncState = Idle;
 		if ( subPaneTitle.IsPresent() && subPaneTitle.IsAppOwned() )
 			{
 			CAknTitlePane* titlePane = NULL;
 			TRAP_IGNORE( titlePane =
 				(CAknTitlePane*)StatusPane()->ControlL( titlePaneUid ) );
 			// Set connection icon
 			iConnectionStatusIconAnimTimer->Stop();
 			iConnectionIconBitmap = 0;
 			iConnectionIconMask = 0;
 			TSize iconSize = LayoutHandler()->statusPaneIconSize();
 				    }
 				else
 				    {
 				    TRAP_IGNORE( FsTextureManager()->ProvideBitmapL(
 EStatusTextureConnected, iConnectionIconBitmap, iConnectionIconMask ) );
 				    }
 				}
 			else // EFSMailBoxOffline
 				{
 				TRAP_IGNORE( FsTextureManager()->ProvideBitmapL(
 						EStatusTextureDisconnectedGeneral, iConnectionIconBitmap, iConnectionIconMask ) );
 				}
 			if ( iConnectionIconBitmap )
 				{
 				AknIconUtils::SetSize( iConnectionIconBitmap, iconSize, EAspectRatioNotPreserved );
 				}
 			titlePane->SetSmallPicture( iConnectionIconBitmap, iConnectionIconMask, iConnectionIconMask && iConnectionIconBitmap );
 // -----------------------------------------------------------------------------
 TInt CFreestyleEmailUiAppUi::DisplayCreateQueryL( TAny* aSelfPtr )
 {
 FUNC_LOG;
 CFreestyleEmailUiAppUi* self = static_cast<CFreestyleEmailUiAppUi*>( aSelfPtr );
 if (self->AppUiExitOngoing())
 {
 return KErrNone;
 }
 if (self->iMainUiGridVisualiser->UiOperationLaunched())
 {
 return KErrNone;
 }
 }
 TRAPD( err, self->DisplayCreateMailboxQueryL() );
 if (err == KLeaveExit)
 {
 User::Leave(err);
 }
 return err;
 }
 void CFreestyleEmailUiAppUi::DisplayCreateMailboxQueryL()
 	{
 TApaTaskList taskList( iEikonEnv->WsSession() );
 TApaTask task = taskList.FindApp( KFSEmailUiUid );
 if ( task.Exists() )
 {
 // Send self to background
 task.SendToBackground();
 }
 iSwitchingToBackground = EFalse;
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void CFreestyleEmailUiAppUi::ConstructNaviPaneL()
 {
 FUNC_LOG;
 CAknNavigationControlContainer* naviPaneContainer =
 static_cast<CAknNavigationControlContainer*>(
 StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) ) );
 // Following navipane is for mailviewer view
 if ( !iNaviDecorator2MailViewer )
 {
 // Constructing a decorator with own decorated control,
 // which is (currently an empty) container.
 CFreestyleEmailUiNaviPaneControlContainer2MailViewer* c =
 CFreestyleEmailUiNaviPaneControlContainer2MailViewer::NewL();
 c->SetContainerWindowL( *naviPaneContainer );
 iNaviDecorator2MailViewer = CAknNavigationDecorator::NewL(
 naviPaneContainer,
 c,
 CAknNavigationDecorator::ENotSpecified );
 // In order to get navi arrows visible, they must be set visible AND not dimmed...
 iNaviDecorator2MailViewer->SetContainerWindowL( *naviPaneContainer );
 iNaviDecorator2MailViewer->MakeScrollButtonVisible( ETrue );
 iNaviDecorator2MailViewer->SetScrollButtonDimmed( CAknNavigationDecorator::ELeftButton, EFalse );
 iNaviDecorator2MailViewer->SetScrollButtonDimmed( CAknNavigationDecorator::ERightButton, EFalse );
 iNaviDecorator2MailViewer->SetComponentsToInheritVisibility( ETrue );
 naviPaneContainer->PushL( *iNaviDecorator2MailViewer );
 }
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 CAknNavigationDecorator* CFreestyleEmailUiAppUi::NaviDecoratorL(  const TUid aViewId  )
 {
 FUNC_LOG;
 CAknNavigationDecorator* decorator( NULL );
 if ( subPaneTitle.IsPresent() && subPaneTitle.IsAppOwned() )
 {
 CAknTitlePane* titlePane = NULL;
 TRAP_IGNORE( titlePane =
 (CAknTitlePane*)StatusPane()->ControlL( titlePaneUid ) );
 TSize iconSize = LayoutHandler()->statusPaneIconSize();
 iConnectionStatusIconAngle += KConnectionStatusIconRotationAmount;
 AknIconUtils::SetSizeAndRotation(iConnectionIconBitmap, iconSize, EAspectRatioNotPreserved, iConnectionStatusIconAngle);
 titlePane->DrawNow();
 iConnectionStatusIconAnimTimer->Start(KConnectionStatusIconRotationInterval);
 }
 }
 }
 // -----------------------------------------------------------------------------
-// CFreestyleEmailUiAppUi::CancelFocusRemovalTimer
+// CFreestyleEmailUiAppUi::SetFocusVisibility
 // -----------------------------------------------------------------------------
-void CFreestyleEmailUiAppUi::CancelFocusRemovalTimer()
+TBool CFreestyleEmailUiAppUi::SetFocusVisibility( TBool aVisible )
 	{
-	TBool wasActive = iFocusTimer->IsActive();
+	FUNC_LOG;
-	iFocusTimer->Cancel();
+	TBool oldFocusState( iFocusVisible );
+	iFocusVisible = aVisible;
 	CFsEmailUiViewBase* activeView = CurrentActiveView();
-	if( wasActive && activeView )
+	if ( /*oldFocusState != aVisible &&*/ activeView )
 		{
-		activeView->HandleTimerFocusStateChange( EFalse );
+		activeView->FocusVisibilityChange( aVisible );
 		}
+	// If popup is visible inform it also.
+	if( iFolderListVisualiser && iFolderListVisualiser->IsPopupShown() )
+	    {
+	    iFolderListVisualiser->FocusVisibilityChange( aVisible );
+	    }
+	return oldFocusState;
 	}
 // -----------------------------------------------------------------------------
-// CFreestyleEmailUiAppUi::StartFocusRemovalTimer
+//
 // -----------------------------------------------------------------------------
+TBool CFreestyleEmailUiAppUi::IsFocusShown() const
-TBool CFreestyleEmailUiAppUi::StartFocusRemovalTimer()
+	{
-	{
+	FUNC_LOG;
-	TBool wasActive = iFocusTimer->IsActive();
+	return iFocusVisible;
-	iFocusTimer->Cancel();
+	}
-	// Start the timer and calls FocusTimerCallBack when the timer expires
-	iFocusTimer->Start(KIdleTimeInterval, KIdleTimeInterval,
+// PUBLIC METHODS FROM MFREESTYLEEMAILUIPROPERTYCHANGEDOBSERVER
-			TCallBack(FocusTimerCallBack, this));
-	CFsEmailUiViewBase* activeView = CurrentActiveView();
-	if ( !wasActive && activeView )
-		{
-		activeView->HandleTimerFocusStateChange( ETrue );
-		}
-	return wasActive;
-	}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-TInt CFreestyleEmailUiAppUi::FocusTimerCallBack(TAny* aAny)
-	{
-	CFreestyleEmailUiAppUi* self =
-		static_cast<CFreestyleEmailUiAppUi*>( aAny );
-	return self->DoFocusTimerCallBack();
-	}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-TInt CFreestyleEmailUiAppUi::DoFocusTimerCallBack()
-	{
-	iFocusTimer->Cancel();
-	CFsEmailUiViewBase* activeView = CurrentActiveView();
-	// Call the HandleTimerFocusStateChange of currently active so that it hides
-	// its focus.
-	if ( activeView )
-		{
-		activeView->HandleTimerFocusStateChange( EFalse );
-		}
-	return KErrNone;
-	}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-TBool CFreestyleEmailUiAppUi::IsTimerFocusShown() const
-	{
-	return iFocusTimer->IsActive();
-	}
-// PUBLIC METHODS FROM MFREESTYLEEMAILUIPROPERTYCHANGEDOBSERVER
 // -----------------------------------------------------------------------------
 // From MFreestyleEmailUiPropertyChangedObserver.
 // -----------------------------------------------------------------------------
 //
 }
 else
 {
 iFlipOpen = EFalse;
 }
 	CFsEmailUiViewBase* activeView = CurrentActiveView();
 	if ( activeView )
 		{
 		activeView->FlipStateChangedL( iFlipOpen );
 		}

changeset 1	12c456ceeff2
parent 0	8466d47a6819
child 2	5253a20d2a1e