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

equal deleted inserted replaced

-:e7aa27f58ae1
+:e1b6206813b4
 #include <apgcli.h>
 #include <FreestyleEmailUi.rsg>
 #include <fsmailserver.rsg>
 #include <StringLoader.h>
 //<cmail>
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
-#include "CFSMailBox.h"
+#include "cfsmailbox.h"
-#include "CFSMailFolder.h"
+#include "cfsmailfolder.h"
-#include "CFSMailMessage.h"
+#include "cfsmailmessage.h"
-#include "CFSMailAddress.h"
+#include "cfsmailaddress.h"
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
 //</cmail>
 #include <freestyleemailui.mbg>
 #include <AknQueryDialog.h>
 #include <AknBidiTextUtils.h>
 #include <gdi.h>
 iMsgReaderIsSupported( KErrGeneral ),
 iSwitchingToBackground( EFalse )
 {
 FUNC_LOG;
 iEnv = &aEnv;
+TIMESTAMP( "Application starting" );
 }
 // ---------------------------------------------------------------------------
 // Load specified resource file, file name may (and should) contain wild cards
 // ---------------------------------------------------------------------------
 // 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();
+TIMESTAMP( "Application started" );
 }
 // Functions loads some views as delayed to reduce startup time
 TInt CFreestyleEmailUiAppUi::ViewLoadIdleCallbackFunctionL()
 	{
 CFSEmailDownloadInfoMediator::Destroy();
 delete iNaviDecorator2MailViewer;
 delete iConnectionStatusIconAnimTimer;
+TIMESTAMP( "Application exit" );
 }
 void CFreestyleEmailUiAppUi::EnterFsEmailViewL( TUid aViewId )
 {
 else
 {
 iCurrentActiveView = iNavigationHistory->Pop();
 }
 }
+// may be tricky; added here to handle activation of composer view from external app when email is plugin settings view
+// in this case also duplictaed view needs to be poped up, but iSettingsViewActive is already set to EFalse
+// other solution would need to expand api of this class to handle directly this case
+else
+	if ( iPreviousActiveView->Id() == SettingsViewId  || iPreviousActiveView->Id() == MailListId )
+		{
+		iCurrentActiveView = iNavigationHistory->Pop();
+		}
 }
 void CFreestyleEmailUiAppUi::ViewActivatedExternallyL( TUid aViewId )
 {
 FUNC_LOG;
 {
 iNavigationHistory->PushL( iCurrentActiveView );
 iCurrentActiveView = static_cast<CFsEmailUiViewBase*>( View(aViewId) );
 }
 }
+TIMESTAMP( "View activated" );
 }
 void CFreestyleEmailUiAppUi::SetSwitchingToBackground( TBool aValue )
 {
 FUNC_LOG;
 	    }
 	else
 	    {
 	ReturnToPreviousViewL();
 	    }
+	TIMESTAMP( "Returned from html viewer view to previous view" );
 	}
 TUid CFreestyleEmailUiAppUi::ReturnToPreviousViewL( const TDesC8& aCustomMessage /*= KNullDesC8*/ )
 {
 FUNC_LOG;
 // Activate the proper view
 	if ( viewId == AppGridId )
 		{
 		ActivateLocalViewL( AppGridId );
+		TIMESTAMP( "Return to application grid view" );
 		}
 	else if ( viewId == MailListId )
 		{
 		if ( aCustomMessage.Length() )
 		    {
 		else
 		    {
 		const TPckgBuf<TMailListActivationData> pkgOut;
 		ActivateLocalViewL( MailListId, KStartListReturnToPreviousFolder, pkgOut );
 		    }
+		TIMESTAMP( "Return to message list view" );
 		}
 	else if ( viewId == SearchListViewId )
 		{
 		TSearchListActivationData tmp;
 		tmp.iMailBoxId = GetActiveMailbox()->GetId();
 	else if ( viewId == HtmlViewerId )
 	    {
 	    // launch html viewer
 		const TPckgBuf<THtmlViewerActivationData> pkgOut;
 		ActivateLocalViewL( HtmlViewerId, KHtmlViewerReturnToPrevious, pkgOut );
+		TIMESTAMP( "Return to html viewer view" );
 	    }
 	else if ( viewId == MailEditorId )
 		{
 		ActivateLocalViewL( MailEditorId, TUid::Uid(KEditorCmdReturnToPrevious), aCustomMessage );
+		TIMESTAMP( "Return to email editor view" );
 		}
 	else if ( viewId == MsgDetailsViewId )
 		{
 		ActivateLocalViewL( MsgDetailsViewId, KStartMsgDetailsReturnToPrevious, aCustomMessage );
 		}
 	    }
 	else
 		{
 		// Generic case where the view does not need any startup parameters
 		ActivateLocalViewL( viewId );
+		TIMESTAMP( "Return to previous view" );
 		}
 	return viewId;
 }
 }
 else
 {
 ActivateLocalViewL( iCurrentActiveView->Id() );
 }
+TIMESTAMP( "Return to earlier view" );
 }
 void CFreestyleEmailUiAppUi::ShowFolderListInPopupL(
 const TFSMailMsgId aFolderId,
 MFSEmailUiFolderListCallback* aCallback,
 }
 void CFreestyleEmailUiAppUi::Exit()
 {
 FUNC_LOG;
+TIMESTAMP ("Exiting from email application");
 g_ApplicationExitOnGoing = ETrue;
 if ( iExitGuardian->ExitApplication() == KRequestPending )
 {
 SendToBackground();
 }
 	}
 // Force Sync on active mailbox.
 void CFreestyleEmailUiAppUi::SyncActiveMailBoxL()
-	{
+{
 FUNC_LOG;
-	if ( iActiveMailbox )
+if( iActiveMailbox )
-		{
+{
-	iSyncStatusReqId = iActiveMailbox->RefreshNowL( *this );
+// Start sync automatically if not syncing already
-		}
+TSSMailSyncState latestSyncstate = iActiveMailbox->CurrentSyncState();
-	}
+if( latestSyncstate != InboxSyncing && latestSyncstate != StartingSync && latestSyncstate != EmailSyncing )
+	     {
+	     iSyncStatusReqId = iActiveMailbox->RefreshNowL( *this );
+	     }
+}
+}
 void CFreestyleEmailUiAppUi::StopActiveMailBoxSyncL()
-	{
+{
 FUNC_LOG;
-if ( iActiveMailbox )
+if ( iActiveMailbox && iActiveMailbox->GetMailBoxStatus()==EFSMailBoxOnline)
 {
-iActiveMailbox->CancelSyncL();
+TSSMailSyncState latestSyncstate = iActiveMailbox->CurrentSyncState();
-}
+if(latestSyncstate == InboxSyncing ||
-	}
+latestSyncstate == EmailSyncing ||
+latestSyncstate == OutboxSyncing ||
+latestSyncstate == SentItemsSyncing ||
+latestSyncstate == DraftsSyncing ||
+latestSyncstate == CalendarSyncing ||
+latestSyncstate == ContactsSyncing ||
+latestSyncstate == TasksSyncing ||
+latestSyncstate == NotesSyncing ||
+latestSyncstate == FilesSyncing ||
+latestSyncstate == DataSyncStarting )
+{
+iActiveMailbox->CancelSyncL();
+}
+}
+}
 MCoeMessageObserver::TMessageResponse CFreestyleEmailUiAppUi::HandleMessageL(
 TUint32 aClientHandleOfTargetWindowGroup,
 TUid aMessageUid,
 const TDesC8& aMessageParameters )
 			{
 		switch ( *newSyncState )
 			{
 case StartingSync:
 {
+TIMESTAMP( "Starting sync" );
 //If syncs were started by user, show the synchoronisation indicator
+TIMESTAMP( "Sync error" );
 if(iManualMailBoxSyncAll)
 {
 ManualMailBoxSyncAll(EFalse);
 }
 }
 break;
 case FinishedSuccessfully:
 case SyncCancelled:
 case Idle:
 {
+TIMESTAMP( "Sync finished" );
 ManualMailBoxSync( EFalse );
 }
 break;
 				case PushChannelOffBecauseBatteryIsLow:

branch	RCL_3
changeset 8	e1b6206813b4
parent 4	e7aa27f58ae1
child 10	f5907b1a1053