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

equal deleted inserted replaced

-:e1b6206813b4
+:f5907b1a1053
 BaseConstructL( R_FSEMAILUI_HTML_VIEW );
 iAsyncCallback = new (ELeave) CAsyncCallBack( CActive::EPriorityLow );
 iOpenMessages = new (ELeave) CStack<CFSMailMessage, ETrue>();
 iEmbeddedMessages = new (ELeave) CStack<CFSMailMessage, EFalse>();
 iNextOrPrevMessageSelected = EFalse;
+iForwardingMessage = EFalse;
 }
 // -----------------------------------------------------------------------------
 // CFsEmailUiHtmlViewerView::Id()
 // Returns View's ID.
 {
 HideContainer();
 iContainer->ResetContent();
 }
+iForwardingMessage = ETrue;
 iAppUi.LaunchEditorL( KEditorCmdForward, params );
 }
 }
 break;
 case EFsEmailUiCmdActionsDelete:
 // -----------------------------------------------------------------------------
 // CFsEmailUiHtmlViewerView::DoActivateL()
 // Activate an Compose view
 // -----------------------------------------------------------------------------
 //
-void CFsEmailUiHtmlViewerView::ChildDoActivateL( const TVwsViewId& /*aPrevViewId*/,
+void CFsEmailUiHtmlViewerView::ChildDoActivateL( const TVwsViewId& aPrevViewId,
 TUid aCustomMessageId, const TDesC8& aCustomMessage )
 {
 FUNC_LOG;
 TBool msgBodyStructurePresent ( EFalse );
 TBool msgBodyContentPresent ( EFalse );
+if( aCustomMessageId != KHtmlViewerReturnToPrevious)
+{
+ViewEntered( aPrevViewId );
+}
 if ( iMrObserverToInform &&
 aCustomMessageId == KStartViewerReturnToPreviousMsg )
 {
 // If returning from view launched by MRUI, complete the ongoing
 // async process.
 }
 }
 }
 }
 iNextOrPrevMessageSelected = EFalse;
+iForwardingMessage = EFalse;
-//update rect only if it has changed from previous time.
-if ( iContainer->Rect() != ContainerRect()  )
-{
-iContainer->SetRect( ContainerRect() );
-}
 TIMESTAMP( "Html viewer opened" );
 }
 // -----------------------------------------------------------------------------
 // CFsEmailUiHtmlViewerView::OfferToolbarEventL
 {
 if ( iActivationData.iEmbeddedMessageMode )
 {
 aDimmedItems.AppendL(EFsEmailUiTbCmdActions);
 aDimmedItems.AppendL(EFsEmailUiTbCmdDelete);
+aDimmedItems.AppendL(EFsEmailUiTbCmdReply);
+aDimmedItems.AppendL(EFsEmailUiTbCmdForward);
+aDimmedItems.AppendL(EFsEmailUiTbCmdReplyAll);
 }
 }
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 void CFsEmailUiHtmlViewerView::ChildDoDeactivate()
 {
 FUNC_LOG;
-CancelFetchings();
+// Don't cancel fetching the message parts when forwarding the message:
+// it would also cancel the fetchings initiated by the forwarding,
+// causing the forwarding to abort.
+if ( !iForwardingMessage )
+{
+CancelFetchings();
+}
 if ( iContainer )
 {
 HideContainer();
-iContainer->ResetContent();
+iContainer->ResetContent(ETrue);
 iAppUi.RemoveFromStack(iContainer);
 iContainer->CancelFetch();
 iContainer->ClearCacheAndLoadEmptyContent();
 }
 Toolbar()->SetToolbarObserver( this );
 }
 void CFsEmailUiHtmlViewerView::HandleStatusPaneSizeChange()
 {
 CFsEmailUiViewBase::HandleStatusPaneSizeChange();
-if ( iContainer )
-{
-iContainer->SetRect( ContainerRect() );
-}
 }
 void CFsEmailUiHtmlViewerView::HandleViewRectChange()
 {
 CFsEmailUiViewBase::HandleViewRectChange();
 else
 {
 ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
 NavigateBackL();
 }
-//inform user that mail is deleted
-TFsEmailUiUtility::ShowGlobalInfoNoteL( R_FREESTYLE_EMAIL_MAIL_DELETED );
-}
+			}
+//inform user that mail is deleted
+TFsEmailUiUtility::ShowDiscreetInfoNoteL( R_FREESTYLE_EMAIL_MAIL_DELETED );
 }
 }
 // ---------------------------------------------------------------------------
 // HandleMailBoxEventL
 iAttachmentsListModel->DownloadAllAttachmentsL();
 }
 void CFsEmailUiHtmlViewerView::CancelAttachmentL( const TAttachmentData& aAttachment )
 {
-TInt reallyCancel =
+iAttachmentsListModel->CancelDownloadL(aAttachment);
-TFsEmailUiUtility::ShowConfirmationQueryL( R_FSE_VIEWER_CANCEL_DOWNLOAD_QUERY );
-if ( reallyCancel )
-{
-iAttachmentsListModel->CancelDownloadL(aAttachment);
-}
 }
 void CFsEmailUiHtmlViewerView::OpenAttachmentL( const TAttachmentData& aAttachment )
 {
 if ( iAppUi.DownloadInfoMediator()->IsDownloading( aAttachment.partData.iMessagePartId ) )
 TFSMailMsgId currentMsgId = iMessage->GetMessageId();
 TFSMailMsgId nextMsgId;
 TFSMailMsgId nextMsgFolderId;
 if ( iAppUi.IsNextMsgAvailable( currentMsgId, nextMsgId, nextMsgFolderId ) )
 {
+if (iContainer)
+{
+iContainer->PrepareForMessageNavigation();
+}
 // Stop timer and cancel fetchings before showing next message
 //iFetchingAnimationTimer->Stop();
 CancelFetchings();
 // Change empty msk when moving to next
 TFSMailMsgId currentMsgId = iMessage->GetMessageId();
 TFSMailMsgId prevMsgId;
 TFSMailMsgId prevMsgFolderId;
 if ( iAppUi.IsPreviousMsgAvailable( currentMsgId, prevMsgId, prevMsgFolderId ) )
 {
+if (iContainer)
+{
+iContainer->PrepareForMessageNavigation();
+}
 // Stop timer and cancel fetchings before showing prev message
 CancelFetchings();
 // Change empty msk when moving to previous
 ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
 StartFetchingMessagePartL( *iMessage, type );
 }
 }
 }
-void CFsEmailUiHtmlViewerView::CheckMessageBodyL( CFSMailMessage& aMessage, TBool& aMessageBodyStructurePresent, TBool& aMessageBodyContentPresent)
+void CFsEmailUiHtmlViewerView::CheckMessageBodyL( CFSMailMessage& /*aMessage*/, TBool& aMessageBodyStructurePresent, TBool& aMessageBodyContentPresent)
 {
 CFSMailMessagePart* bodyPart = iMessage->HtmlBodyPartL();
 if ( !bodyPart )
 {
 bodyPart = iMessage->PlainTextBodyPartL();

branch	RCL_3
changeset 12	f5907b1a1053
parent 8	e1b6206813b4
child 13	0396474f30f5