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

equal deleted inserted replaced

-:f5907b1a1053
+:0396474f30f5
 iMrUiActive = ETrue;
 iAppUi.MrViewerInstanceL()->ExecuteViewL( *iMessage, *this );
 }
 else
 {
+// Attachment list model is not created when opening mrViewer, so attachment options menu is
+// not working with MR messages
 iAttachmentsListModel = CFSEmailUiAttachmentsListModel::NewL( iAppUi, *this );
-TPartData msgPartData( iActivationData.iMailBoxId, iActivationData.iFolderId, iActivationData.iMessageId);
+TPartData msgPartData( iActivationData.iMailBoxId, iActivationData.iFolderId, iActivationData.iMessageId );
 iAttachmentsListModel->UpdateListL( msgPartData );
 CheckMessageBodyL( *iMessage, msgBodyStructurePresent, msgBodyContentPresent );
 LoadContentFromMailMessageL( iMessage, ETrue );
 }
 }
 else
 {
 User::Leave( KErrNotFound );
 }
 {
 TInt res = R_AVKON_STATUS_PANE_LAYOUT_USUAL_FLAT;
 if( Layout_Meta_Data::IsLandscapeOrientation() )
 {
 // landscape must use different layout
-res = R_AVKON_STATUS_PANE_LAYOUT_IDLE_FLAT;
+		res = R_AVKON_STATUS_PANE_LAYOUT_USUAL_EXT;
 }
 if( StatusPane()->CurrentLayoutResId() != res )
 {
 TRAP_IGNORE(
 {
 iContainer->LoadContentFromMailMessageL( aMailMessage, aResetScrollPos );
 }
 }
-void CFsEmailUiHtmlViewerView::DeleteMailL()
+void CFsEmailUiHtmlViewerView::DeleteMailL(TBool aSilentDelete)
 {
 FUNC_LOG;
 if ( !iMessage || iActivationData.iEmbeddedMessageMode )
 {
 }
 TInt reallyDelete( ETrue );
 if ( iAppUi.GetCRHandler()->WarnBeforeDelete() &&
-!iMessage->IsFlagSet( EFSMsgFlag_CalendarMsg ) )
+!aSilentDelete )
 {
 reallyDelete = TFsEmailUiUtility::ShowConfirmationQueryL(
 R_FREESTYLE_EMAIL_UI_DELETE_MESSAGE_CONFIRMATION );
 }
 //Delete the message
 iAppUi.GetMailClient()->DeleteMessagesByUidL( mailBox, folderId, msgIds );
 CleanupStack::PopAndDestroy( &msgIds );
 // Notify appui of deleted mail item
-SendEventToAppUiL( TFSEventMailDeleted );
+SendEventToAppUiL( TFSEventMailDeletedFromViewer );
 if ( iAppUi.CurrentActiveView()->Id() == HtmlViewerId )
 {
 //Open the previous message or navigate back to list viewer
 if ( available )
 else
 {
 ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
 NavigateBackL();
 }
 			}
 //inform user that mail is deleted
-TFsEmailUiUtility::ShowDiscreetInfoNoteL( R_FREESTYLE_EMAIL_MAIL_DELETED );
+if (!aSilentDelete)
+	TFsEmailUiUtility::ShowDiscreetInfoNoteL( R_FREESTYLE_EMAIL_MAIL_DELETED );
 }
 }
 // ---------------------------------------------------------------------------
 // HandleMailBoxEventL
 void CFsEmailUiHtmlViewerView::HandleMailBoxEventL( TFSMailEvent aEvent,
 TFSMailMsgId aMailbox, TAny* aParam1, TAny* /*aParam2*/, TAny* /*aParam3*/ )
 {
 FUNC_LOG;
 if ( /*iFirstStartCompleted &&*/ iMessage && aMailbox.Id() == iAppUi.GetActiveMailboxId().Id() &&
-aEvent == TFSEventMailDeleted && aParam1 ) // Safety, in list events that only concern active mailbox are handled
+(aEvent == TFSEventMailDeleted || aEvent == TFSEventMailDeletedFromViewer) && aParam1 ) // Safety, in list events that only concern active mailbox are handled
 {
 TFSMailMsgId curMsgId = iMessage->GetMessageId();
 RArray<TFSMailMsgId>* removedEntries = static_cast<RArray<TFSMailMsgId>*>( aParam1 );
-// <cmail> break-keyword should be used only in switch-clauses
 TBool cont = ETrue;
 for ( TInt i = 0 ; i < removedEntries->Count() && cont; i++ )
 {
 if ( ( curMsgId == ( *removedEntries )[i] ) &&
 (iDeletedMessageFromMrui != curMsgId) )
 {
 cont = EFalse;
 ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
-HandleCommandL( EAknSoftkeyBack );
+if(aEvent == TFSEventMailDeleted)
+{   //Delete event came from server; close the viewer.
+	HandleCommandL( EAknSoftkeyBack );
+	// The message we are viewing was deleted => stop here
+	return;
+}
 }
 }
 }
-if (iMessage && aMailbox.Id() == iAppUi.GetActiveMailboxId().Id() && aEvent == TFSEventNewMail)
+if (iContainer && iMessage && aMailbox.Id() == iAppUi.GetActiveMailboxId().Id() &&
-{
+( aEvent == TFSEventNewMail ||
-UpdateEmailHeaderIndicators();
+aEvent == TFSEventMailDeleted ||
-}
+aEvent == TFSEventMailChanged ) )
-// </cmail>
+{
+iContainer->MailListModelUpdatedL();
+}
 }
 void CFsEmailUiHtmlViewerView::DynInitZoomMenuL( CEikMenuPane* aMenuPane )
 {
 FUNC_LOG;
 if ( newValue > KMinTInt )
 {
 iContainer->BrowserControlIf()->SetBrowserSettingL(
 TBrCtlDefs::ESettingsCurrentZoomLevelIndex, newValue );
 }
+}
+// -----------------------------------------------------------------------------
+// CFsEmailUiHtmlViewerView::RestoreZoomLevelL()
+// -----------------------------------------------------------------------------
+//
+void CFsEmailUiHtmlViewerView::RestoreZoomLevelL()
+{
+FUNC_LOG;
+SetZoomLevelIndexL( ZoomLevelIndexL() );
 }
 // -----------------------------------------------------------------------------
 // CFsEmailUiHtmlViewerView::HandleEmailAddressCommandL()
 // -----------------------------------------------------------------------------
 {
 }
 void CFsEmailUiHtmlViewerView::DownloadAttachmentL( const TAttachmentData& aAttachment )
 {
+iAppUi.DownloadInfoMediator()->AddObserver( this, aAttachment.partData.iMessageId );
 iAttachmentsListModel->StartDownloadL(aAttachment);
 }
 void CFsEmailUiHtmlViewerView::DownloadAllAttachmentsL()
 {
 break;
 }
 iContainer->ShowAttachmentDownloadStatusL( aEvent.iProgressStatus, *attachment );
 }
+if (aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestComplete ||
+aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestCancelled)
+{
+iAppUi.DownloadInfoMediator()->StopObserving( this, aPart.iMessageId );
+}
 }
 void CFsEmailUiHtmlViewerView::RequestResponseL( const TFSProgress& aEvent, const TPartData& aPart )
 {
 FUNC_LOG;
 // Change empty msk when moving to next
 ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
 iAppUi.MoveToNextMsgL( currentMsgId, nextMsgId );
 // Next message is displayed in this view through doactivate, because view is re-activate by mail list
+RestoreZoomLevelL();
 }
 }
 }
 // -----------------------------------------------------------------------------
 // CFsEmailUiHtmlViewerView::ShowPreviousMessageMenuInOptions
 {
 TFSMailMsgId currentMsgId = iMessage->GetMessageId();
 TFSMailMsgId prevMsgId;
 TFSMailMsgId prevMsgFolderId;
 if ( iAppUi.IsPreviousMsgAvailable( currentMsgId, prevMsgId, prevMsgFolderId ) )
 {
 if (iContainer)
 {
 iContainer->PrepareForMessageNavigation();
 }
 // Change empty msk when moving to previous
 ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
 iAppUi.MoveToPreviousMsgL( currentMsgId, prevMsgId );
 // Previous message is displayed in this view through doactivate, because view is re-activate by mail list
+RestoreZoomLevelL();
 }
 }
 }
 case EESMRCmdMailDelete:
 {
 if ( iMessage )
 {
 iDeletedMessageFromMrui = iMessage->GetMessageId(); //<cmail>
-DeleteMailL();
+DeleteMailL(ETrue);
 iOpResult.iResultCode = KErrNone; //???? what to pass here
 }
 // Information is returned immediately after delete has completed.
 CompletePendingMrCommand();

branch	RCL_3
changeset 11	0396474f30f5
parent 10	f5907b1a1053
child 12	4ce476e64c59