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

equal deleted inserted replaced

-:0396474f30f5
+:4ce476e64c59
 #include "FreestyleEmailUiContactHandler.h"
 #include "FreestyleEmailUiAppui.h"
 #include "FreestyleEmailUi.hrh"
 #include "FreestyleEmailUiLauncherGrid.h"
 #include "FreestyleEmailUiLayoutHandler.h"
-#include "FreestyleEmailUiMailViewerVisualiser.h"
 #include "FreestyleEmailUiMailListControl.h"
 #include "FreestyleEmailUiMailListModel.h"
 #include "FreestyleEmailUiMailListVisualiser.h"
 #include "FreestyleEmailUiTextureManager.h"
 #include "FreestyleEmailUiMsgDetailsVisualiser.h"
 //iLayoutManager->LoadLayoutL();
 //<cmail>
 // Set up layouthandler
 iLayoutHandler = CFSEmailUiLayoutHandler::NewL( *iEnv );
-	iLayoutHandler->ScreenResolutionChanged();
 // Create mail client, list mailboxes
 iMailClient = CFSMailClient::NewL();
 	// Connect to messaging server
 	CleanupStack::Pop( settingsListView );
 	CFsEmailUiGlobalSettingsListView* globalSettingsView = CFsEmailUiGlobalSettingsListView::NewLC( this, *iSettingsListControlGroup );
 	AddViewL( globalSettingsView );
 	CleanupStack::Pop( globalSettingsView );
-	// Create and start view load in idle. Loads rest of the views when in idle.
+// Create and start view load in idle. Loads rest of the views when in idle.
-	iViewLoadIdle = CIdle::NewL( CActive::EPriorityIdle );
+iViewLoadIdle = CIdle::NewL( CActive::EPriorityIdle );
-	iViewLoadIdleCallback = new (ELeave) TCallBack( DelayedViewLoaderCallBackL, this );
+iViewLoadIdleCallback = new (ELeave) TCallBack( DelayedViewLoaderCallBackL, this );
-	iViewLoadIdle->Start( *iViewLoadIdleCallback );
+iViewLoadIdle->Start( *iViewLoadIdleCallback );
-	// Create mail viewer
+// Create html viewer
-	iViewerVisualiser = CFSEmailUiMailViewerVisualiser::NewL( *iEnv, *this, *iEmailViewerControlGroup );
+iHtmlViewerControlGroup = &iEnv->NewControlGroupL( KHtmlViewerDisplayGroup );
-	AddViewL( iViewerVisualiser );
-	// Create html viewer
-	iHtmlViewerControlGroup = &iEnv->NewControlGroupL( KHtmlViewerDisplayGroup );
 iHtmlViewerView = CFsEmailUiHtmlViewerView::NewL( *iEnv, *this, *iHtmlViewerControlGroup );
 AddViewL( iHtmlViewerView );
 	// Create mail list
 iMailListVisualiser = CFSEmailUiMailListVisualiser::NewL(*iEnv, this, *iMailListControlGroup );
 	//<cmail> hard coded paths removal
 	TFileName phCltResPath(KDC_RESOURCE_FILES_DIR);
 phCltResPath.Append(KETelCallEngPhCltResourceFile);
 //</cmail>
 BaflUtils::NearestLanguageFile( iEikonEnv->FsSession(), phCltResPath );
-iPhCltResHandle = CCoeEnv::Static()->AddResourceFileL( phCltResPath );
+iPhCltResHandle = iEikonEnv->AddResourceFileL( phCltResPath );
 	// Create attachment list visualiser and control
 	iAttachmentControlGroup = &iEnv->NewControlGroupL( KAttachmentManagerDisplayGroup );
 	iAttachmentListVisualiser = CFSEmailUiAttachmentsListVisualiser::NewL( *iEnv, this, *iAttachmentControlGroup );
 	AddViewL( iAttachmentListVisualiser );
 		{
 		TSearchListActivationData tmp;
 		tmp.iMailBoxId = GetActiveMailbox()->GetId();
 		const TPckgBuf<TSearchListActivationData> pkgOut( tmp );
 		ActivateLocalViewL( SearchListViewId, KStartWithPreviousResults, pkgOut );
-		}
-	else if ( viewId == MailViewerId )
-		{
-		const TPckgBuf<TMsgViewerActivationData> pkgOut;
-		ActivateLocalViewL( MailViewerId, KStartViewerReturnToPreviousMsg,  pkgOut);
 		}
 	else if ( viewId == HtmlViewerId )
 	    {
 	    // launch html viewer
 		const TPckgBuf<THtmlViewerActivationData> pkgOut;
 }
 if ( iMailListVisualiser )
 {
 iMailListVisualiser->PrepareForExit();
 }
-if ( iViewerVisualiser )
-{
-iViewerVisualiser->PrepareForExit();
-}
 if ( iHtmlViewerView )
 {
 iHtmlViewerView->PrepareForExit();
 }
 if ( iSearchListVisualiser )
 // Refresh mode is changed to manual to avoid any flickering during
 // resource change handling in list views. Trap any leaves so that we set
 // the automatic refresh mode back on even in case of error.
 iEnv->SetRefreshMode( EAlfRefreshModeManual );
+switch ( aType )
+{
+case KEikDynamicLayoutVariantSwitch:
+iEnv->NotifyLayoutChangedL();
+break;
+case KAknsMessageSkinChange:
+iEnv->NotifySkinChangedL();
+break;
+}
 TRAPD( error, DoHandleResourceChangeL( aType ) );
 iEnv->SetRefreshMode( EAlfRefreshModeAutomatic );
 User::LeaveIfError( error );
 }
 // compose screen loadbackgroundcontext sends 2 skin change events
 //if( aType == KAknsMessageSkinChange && iConstructComplete )
 //    {
 //    CAlfEnv::Static()->NotifySkinChangedL();
 //    }
-if( aType == KEikDynamicLayoutVariantSwitch || aType == KAknsMessageSkinChange )
+if ( aType == KEikDynamicLayoutVariantSwitch )
-{
+	{
 // Changing layout for status pane (just in case it is not switched
 // correctly), fix for HMNN-82BAGR error
+// it's not related with skin change so "moved up" TJOS-83DELP fix
 TBool landscape(Layout_Meta_Data::IsLandscapeOrientation());
 CEikStatusPane* statusPane = StatusPane();
 if(landscape)
 	{
 			if( statusPane->CurrentLayoutResId() != R_AVKON_STATUS_PANE_LAYOUT_USUAL_FLAT)
 	{
 			if( statusPane->CurrentLayoutResId() != R_AVKON_STATUS_PANE_LAYOUT_USUAL_EXT)
 				{
 				statusPane->SwitchLayoutL(R_AVKON_STATUS_PANE_LAYOUT_USUAL_EXT);
 				}
 	}
+	}
+if( aType == KEikDynamicLayoutVariantSwitch || aType == KAknsMessageSkinChange )
+{
 	  	TRect screenRect;
 	 	AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, screenRect );
-//<cmail> layout manager call removed </cmail>
-// Notify layouthandler of changed screen resolution.
-iLayoutHandler->ScreenResolutionChanged();
 		StatusPane()->DrawNow();
 if(iEnv)
 {
 			Display().SetVisibleArea( screenRect );
 }
 }
 			}
 		CleanupStack::PopAndDestroy( &markedMsgIdArray );
 		}
 	// Check if view is in mail viewer
-	else if ( mb && ( View(MailViewerId)->IsForeground() || View(SearchListViewId)->IsForeground() ) )
+	else if ( mb && ( View(HtmlViewerId)->IsForeground() || View(SearchListViewId)->IsForeground() ) )
 		{
 delete iCustomMessageToMessageReader;
 iCustomMessageToMessageReader = NULL;
 		iCustomMessageToMessageReader = HBufC8::NewL(16);
 		TPtr8 msgPtr = iCustomMessageToMessageReader->Des();
 		CleanupClosePushL( outStream );
 	    outStream.WriteInt32L( mb->GetId().PluginId().iUid );
 	    outStream.WriteUint32L( mb->GetId().Id() );
 		TFSMailMsgId folderId;
 	   	TFSMailMsgId msgId;
-	   	if ( View(MailViewerId)->IsForeground() && iHtmlViewerView )
+	   	if ( View(HtmlViewerId)->IsForeground() && iHtmlViewerView )
 	   		{
 	   		folderId = iHtmlViewerView->ViewedMessageFolderId();
 	   		msgId = iHtmlViewerView->ViewedMessageId();
 	   		}
 	   	else if ( View(SearchListViewId)->IsForeground() && iSearchListVisualiser )
 void CFreestyleEmailUiAppUi::EventL( TFSMailEvent aEvent, TFSMailMsgId aMailbox,
 TAny* aParam1, TAny* aParam2, TAny* aParam3 )
 {
 FUNC_LOG;
+INFO_1( "CMAIL Received event: %d", aEvent );
 if (iExitGuardian)
 {
 iExitGuardian->EnterLC();
 }
 // error occured during "Connect" or "Send and receive" operation
 // check if user needs to be notified
 TIMESTAMP( "Sync error" );
 if ( iManualMailBoxSync )
 {
-// since error id is not provided by plugin, lets popup general note
+							/*
-HBufC* text = StringLoader::LoadL( R_FS_MSERVER_TEXT_UNABLE_TO_COMPLETE );
+							 * As a fix to TJOS-82ZFCW, this general popup is no longer needed
-CleanupStack::PushL( text );
+* // since error id is not provided by plugin, lets popup general note
-CAknInformationNote* infoNote = new ( ELeave ) CAknInformationNote;
+* HBufC* text = StringLoader::LoadL( R_FS_MSERVER_TEXT_UNABLE_TO_COMPLETE );
-infoNote->ExecuteLD( *text );
+* CleanupStack::PushL( text );
-CleanupStack::PopAndDestroy( text );
+* CAknInformationNote* infoNote = new ( ELeave ) CAknInformationNote;
+* infoNote->ExecuteLD( *text );
+* CleanupStack::PopAndDestroy( text );
+*/
 ManualMailBoxSync( EFalse );
 }
 }
 break;
 case FinishedSuccessfully:
 	iFolderListVisualiser->HandleMailBoxEventL( aEvent, aMailbox, aParam1, aParam2, aParam3 );
 	}
 // </cmail>
 	// MAIL DELETED EVENT HANDLING BASED ON VIEW ACTIVE STATE.
-// Handle mail deleted event in mail viewer, as viewed mail could be open
-if ( iViewerVisualiser && aEvent == TFSEventMailDeleted &&
-	 iCurrentActiveView->Id() == MailViewerId )
-	{
-	iViewerVisualiser->HandleMailBoxEventL( aEvent, aMailbox, aParam1, aParam2, aParam3 );
-	}
 // Handle mail deleted event in attachment list, as the viewed mail could be open
-else if ( iAttachmentListVisualiser && aEvent == TFSEventMailDeleted  &&
+if ( iAttachmentListVisualiser && aEvent == TFSEventMailDeleted  &&
 	 iCurrentActiveView->Id() == AttachmentMngrViewId)
 	{
 	iAttachmentListVisualiser->HandleMailBoxEventL( aEvent, aMailbox, aParam1, aParam2, aParam3 );
 	}
 // Handle mail deleted event in Html view list, as the mails might become obsolete
+	// Pass sync finished event there too in order to dismiss status dialogs
 else if ( iHtmlViewerView && (aEvent == TFSEventMailDeleted ||
 aEvent == TFSEventMailDeletedFromViewer ||
+								  aEvent == TFSEventMailboxSyncStateChanged ||
 aEvent == TFSEventNewMail) && iCurrentActiveView->Id() == HtmlViewerId)
 	{
 	iHtmlViewerView->HandleMailBoxEventL( aEvent, aMailbox, aParam1, aParam2, aParam3 );
 	}
 // Download manager removed
 case RMobilePhone::ENotRegisteredNoService:
 case RMobilePhone::ENotRegisteredEmergencyOnly:
 case RMobilePhone::ENotRegisteredSearching:
 case RMobilePhone::ERegisteredBusy:
 case RMobilePhone::ERegistrationDenied:
-case RMobilePhone::ERegisteredRoaming:
+//case RMobilePhone::ERegisteredRoaming:
 	// No autoconnect in these cases
 break;
 // This is ok
 case RMobilePhone::ERegisteredOnHomeNetwork:
-					// TRAP autoconnect, because list UI must open regardless success
+case RMobilePhone::ERegisteredRoaming:
+				// TRAP autoconnect, because list UI must open regardless success
 					// or failure of the auto-connect
 	TRAP_IGNORE( iAppUi.DoAutoConnectL() );
 break;
 default:
 break;

branch	RCL_3
changeset 12	4ce476e64c59
parent 11	0396474f30f5
child 13	8592a65ad3fb