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

equal deleted inserted replaced

-:c8382f7b54ef
+:726fba06891a
 #include <AknUtils.h>
 #include <FreestyleEmailUi.rsg>
 #include <freestyleemailui.mbg>
 #include <aknstyluspopupmenu.h>
-#include <wlaninternalpskeys.h>
 #include "ncscomposeview.h"
 #include "ncscomposeviewcontainer.h"
 #include "ncsconstants.h"
 #include "ncsutility.h"
 #include "ncsemailaddressobject.h"
 : CFsEmailUiViewBase( aSendAttachmentControlGroup, aAppUi ),
 iMailClient( aMailClient ), iOrigMessage( NULL ), iNewMessage( NULL ),
 iMsvSession( aMsvSession ), iEnv( aEnv ),
 iFakeSyncGoingOn(EFalse), iFetchDialogCancelled(EFalse),
 iExecutingDoExitL( EFalse ),
-iMessageTextPartModified( EFalse ), iMessageModified( EFalse ),
+iMessageTextPartModified( EFalse ), iMessageModified( EFalse )
-iIncludeMessageTextAsync( EFalse ), iChildActivationState( EChildActivationDeactivated )
+{
-{
+FUNC_LOG;
-FUNC_LOG;
 iAttachmentListSaveDraft = EFalse;
 }
 //
 void CNcsComposeView::ChildDoActivateL( const TVwsViewId& aPrevViewId,
 TUid aCustomMessageId, const TDesC8& aCustomMessage )
 {
 FUNC_LOG;
-iChildActivationState = EChildActivationStarted;
 // needed when "Opening" (replying/forwarding)note is shown and
 // we receive incoming call- Email application goes to background.
 // When coming back to application the view is activated and reseted.
 // That's why we prevent activation and the same is done in ChildDoDeactivate
 if ( iIncludeMessageTextAsync )
 // but in case contacts action menu was used within FsEmail, this doesn'
 // work. It doesn't hurt to call this again even if it was already called
 // once from BaseView.
 if ( iLaunchParams.iActivatedExternally )
 {
-//notify Contact details view to close on external activation
+iAppUi.ViewActivatedExternallyL( Id() );
-CFSEmailUiContactHandler* contactHandler = NULL; // not owned
-CFsDelayedLoader* delLoader = CFsDelayedLoader::InstanceL(); // not owned
-if( delLoader )
-{
-contactHandler = delLoader->GetContactHandlerL();
-if( contactHandler && aPrevViewId.iViewUid == contactHandler->GetDetailsViewUid() )
-{
-contactHandler->CloseContactDetailsL();
-}
-iAppUi.ViewActivatedExternallyL( Id() );
-}
 }
 // Try to get the mailbox by other means if using launch parameters failed
 if ( !iMailBox )
 {
 iContainer->SetMskL();
 iViewReady = ETrue;
 Toolbar()->SetDimmed( EFalse );
 RefreshToolbar();
 iContainer->ActivateL();
+}
 // if there is a embedded app in FSEmail.
 if( iAppUi.EmbeddedApp() )
 {
 // Set email editor started from embedded app flag to true
 // so that we can switch view correct when sent email.
 iAppUi.SetEditorStartedFromEmbeddedApp( ETrue );
 RWsSession rwsSession;
 User::LeaveIfError( rwsSession.Connect() );
 CleanupClosePushL( rwsSession );
 // Simulate a back key to exit embedded app
 // so that email editor could show on the top level.
 TKeyEvent KeyEvent = TKeyEvent();
 // this is neccesary for photogalery image viewer (don't remove)
 KeyEvent.iScanCode = EStdKeyUpArrow;
 rwsSession.SimulateKeyEvent( KeyEvent );
 KeyEvent.iCode = EKeyCBA2;
 rwsSession.SimulateKeyEvent( KeyEvent );
 rwsSession.Close();
 CleanupStack::PopAndDestroy( &rwsSession );
 }
 if ( iIncludeMessageTextAsync )
-{
+	{
-// including message body in async way
+		// including message body in async way
-IncludeMessageTextAsyncL( ETrue );
+		IncludeMessageTextAsyncL( ETrue );
-}
+	}
 iViewFullyActivated = ETrue;
-iChildActivationState = EChildActivationProcessed;
 TIMESTAMP( "Editor launched" );
-return; // ok
-}
-// problems with init close the view asynchronously
-iViewFullyActivated = EFalse;
-iChildActivationState = EChildActivationExitRequired;
-//    iFakeSyncGoingOn = EFalse; iExecutingDoExitL = EFalse;
-iActiveHelper->Start(); // calls AsyncExit()
-TIMESTAMP( "Editor NOT launched" );
-return;
 }
 // -----------------------------------------------------------------------------
 // Initialises toolbar items.
 // -----------------------------------------------------------------------------
 // is deactivated.
 if ( !iAppUi.AppUiExitOngoing() )
 {
 SaveAndCleanPreviousMessage();
 }
-iChildActivationState = EChildActivationDeactivated ;
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeView::DynInitMenuPaneL()
 // -----------------------------------------------------------------------------
 switch( aCommand )
 {
 case ENcsCmdSend:
 {
-// Set focus on body of message need for correct
-// MSK setting for CAknConfirmationNote dialog.
-iContainer->SetFocusToMessageFieldL();
 // Show query if the Subject field is empty
 if ( iContainer->IsSubjectFieldEmpty() )
 {
 TInt answer = TFsEmailUiUtility::ShowConfirmationQueryL(
 R_FREESTYLE_EMAIL_QUERY_NO_SUBJECT );
 TRAPD( error, DoSendL() );
 if ( !error )
 {
 // Sending successful
 HBufC* confMessage = NULL;
-if ( !TFsEmailUiUtility::IsOfflineModeL() || WLANConnectionActive() )
+if ( !TFsEmailUiUtility::IsOfflineModeL() )
 {
 // when sync status is currently ONLINE
 confMessage = StringLoader::LoadLC(
 R_FREESTYLE_EMAIL_CONFIRM_NOTE_SENDING_QUEUED );
 }
 	 	SetAttachmentLabelContentL();
 	}
 break;
 case ENcsCmdPriorityHigh:
 	{
-	if ( iNewMessage )
+	iNewMessage->ResetFlag( EFSMsgFlag_Low );
-	    {
+	iNewMessage->SetFlag( EFSMsgFlag_Important );
-iNewMessage->ResetFlag( EFSMsgFlag_Low );
+	iNewMessage->SaveMessageL();
-iNewMessage->SetFlag( EFSMsgFlag_Important );
+iMessageModified = EFalse;
-iNewMessage->SaveMessageL();
+	iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityHigh );
-iMessageModified = EFalse;
-iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityHigh );
-	    }
 	}
 break;
 	case ENcsCmdPriorityNormal:
 	    	{
-	    	if ( iNewMessage )
+	iNewMessage->ResetFlag( EFSMsgFlag_Low );
-	    	    {
+	iNewMessage->ResetFlag( EFSMsgFlag_Important );
-iNewMessage->ResetFlag( EFSMsgFlag_Low );
+	iNewMessage->SaveMessageL();
-iNewMessage->ResetFlag( EFSMsgFlag_Important );
+iMessageModified = EFalse;
-iNewMessage->SaveMessageL();
+	iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityNormal );
-iMessageModified = EFalse;
-iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityNormal );
-	    	    }
 	    	}
 break;
 	case ENcsCmdPriorityLow:
 	    	{
-	    	if ( iNewMessage )
+	iNewMessage->ResetFlag( EFSMsgFlag_Important );
-	    	    {
+	iNewMessage->SetFlag( EFSMsgFlag_Low );
-iNewMessage->ResetFlag( EFSMsgFlag_Important );
+	iNewMessage->SaveMessageL();
-iNewMessage->SetFlag( EFSMsgFlag_Low );
+iMessageModified = EFalse;
-iNewMessage->SaveMessageL();
+	iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityLow );
-iMessageModified = EFalse;
-iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityLow );
-	    	    }
 	    	}
 break;
 case ENcsCmdShowCc:
 {
 iContainer->SetCcFieldVisibleL( ETrue );
 	 		iContainer->ClosePopupContactListL();
 }
 break;
 case EAknSoftkeyClose:
 {
-if ( !iAddingAttachmentDialogOpened )
+DoSafeExit();
-DoSafeExit();
 }
 break;
 case ENcsCmdExit:
 {
 TIMESTAMP( "Exit selected from editor" );
 if ( iContainer->AreAddressFieldsEmpty() )
 {
 User::Leave( KErrNotFound );
 }
-TRAPD( commitErr, CommitL( ETrue, EAllFields, ETrue ) );
+CommitL( ETrue, EAllFields, ETrue );
-if ( KErrNone != commitErr )
-{
-iMailSendFailed = ETrue;
-User::Leave( commitErr );
-}
 TRAPD(r, iMailBox->SendMessageL( *iNewMessage ) );
 if ( KErrNone != r )
 {
 iMailSendFailed = ETrue;
 iNewMessage->SaveMessageL();
 iMessageModified = EFalse;
 TFsEmailUiUtility::CreatePlainTextPartL(
 *iNewMessage, iNewMessageTextPart );
 InitFieldsL();
-IncludeMessageTextL();
+TBool spaceInBegin = ETrue;
+IncludeMessageTextL(spaceInBegin);
 AttachmentsListControl()->Model()->Clear();
 GetAttachmentsFromMailL();
 SetAttachmentLabelContentL();
 iAttachmentListSaveDraft = ETrue;
 void CNcsComposeView::HandleDynamicVariantSwitchL(
 CFsEmailUiViewBase::TDynamicSwitchType aType )
 	{
 FUNC_LOG;
-if ( iFirstStartCompleted && iContainer && !iExecutingDoExitL )
+if ( iFirstStartCompleted && iContainer )
 {
 if ( aType == CFsEmailUiViewBase::EScreenLayoutChanged )
 {
 iContainer->HandleLayoutChangeL();
 }
 }
 }
 	}
-// ---------------------------------------------------------------------------
-// CNcsComposeView::FadeOut()
-// enables hiding toolbar on different view -> DoActivate()
-// which is earlier than -> CFsEmailUiViewBase::DoDeactivate()
-// -----------------------------------------------------------------------------
-//
-void CNcsComposeView::FadeOut( TBool aDirectionOut )
-{
-if ( aDirectionOut && Toolbar()->IsShown() )
-{
-HideToolbar();
-}
-else if ( ! ( aDirectionOut || Toolbar()->IsShown() ) )
-{
-ShowToolbar();
-}
-}
 // -----------------------------------------------------------------------------
 // CNcsComposeView::InitReplyFieldsL()
 // Initialises the reply fields from the reply message created by the plug-in.
 // -----------------------------------------------------------------------------
 //
 break;
 default:
 break;
 }
-	if ( iNewMessage )
+if ( commitToField )
+{
+RPointerArray<CFSMailAddress>& recipients =
+iNewMessage->GetToRecipients();
+recipients.ResetAndDestroy();
+NcsUtility::ConvertAddressArrayL(
+iContainer->GetToFieldAddressesL( aParseAddresses ), recipients );
+}
+if ( commitCcField )
+{
+RPointerArray<CFSMailAddress>& recipients =
+iNewMessage->GetCCRecipients();
+recipients.ResetAndDestroy();
+NcsUtility::ConvertAddressArrayL(
+iContainer->GetCcFieldAddressesL( aParseAddresses ), recipients );
+}
+if ( commitBccField )
+{
+RPointerArray<CFSMailAddress>& recipients =
+iNewMessage->GetBCCRecipients();
+recipients.ResetAndDestroy();
+NcsUtility::ConvertAddressArrayL(
+iContainer->GetBccFieldAddressesL( aParseAddresses ), recipients );
+}
+	if ( commitSubjectField )
 	    {
-if ( commitToField )
+	    // get subject from UI to MSG object
-{
+	    HBufC* subject = iContainer->GetSubjectLC();
-RPointerArray<CFSMailAddress>& recipients =
+	    TPtr ptr = subject->Des();
-iNewMessage->GetToRecipients();
+		// replace new line characters with spaces as Subject is normally
-recipients.ResetAndDestroy();
+	    // one line only
-NcsUtility::ConvertAddressArrayL(
+	    AknTextUtils::ReplaceCharacters(
-iContainer->GetToFieldAddressesL( aParseAddresses ), recipients );
+	            ptr, KLineSeparators, KReplacementChar );
-}
+	    iNewMessage->SetSubject( *subject );
+	    CleanupStack::PopAndDestroy( subject );
-if ( commitCcField )
-{
-RPointerArray<CFSMailAddress>& recipients =
-iNewMessage->GetCCRecipients();
-recipients.ResetAndDestroy();
-NcsUtility::ConvertAddressArrayL(
-iContainer->GetCcFieldAddressesL( aParseAddresses ), recipients );
-}
-if ( commitBccField )
-{
-RPointerArray<CFSMailAddress>& recipients =
-iNewMessage->GetBCCRecipients();
-recipients.ResetAndDestroy();
-NcsUtility::ConvertAddressArrayL(
-iContainer->GetBccFieldAddressesL( aParseAddresses ), recipients );
-}
-if ( commitSubjectField )
-{
-// get subject from UI to MSG object
-HBufC* subject = iContainer->GetSubjectLC();
-TPtr ptr = subject->Des();
-// replace new line characters with spaces as Subject is normally
-// one line only
-AknTextUtils::ReplaceCharacters(
-ptr, KLineSeparators, KReplacementChar );
-iNewMessage->SetSubject( *subject );
-CleanupStack::PopAndDestroy( subject );
-}
-}
-else // iNewMessage is still NULL
-{
-User::Leave( KErrNotFound );
-}
-	if ( iNewMessageTextPart )
-	    {
-if ( commitBodyField )
-{
-HBufC* body = iContainer->GetBodyContentLC();
-TPtr bodyPtr = body->Des(); // this TPtr is needed only because of
-// incorrect argument type in FW API, can be removed when API fixed
-iNewMessageTextPart->SetContent( bodyPtr );
-CleanupStack::PopAndDestroy( body );
-iMessageTextPartModified = ETrue;
-}
 	    }
-	else // iNewMessageTextPart is still NULL
-	    {
+if ( commitBodyField )
-User::Leave( KErrNotFound );
+{
-	    }
+HBufC* body = iContainer->GetBodyContentLC();
+TPtr bodyPtr = body->Des(); // this TPtr is needed only because of
+// incorrect argument type in FW API, can be removed when API fixed
+iNewMessageTextPart->SetContent( bodyPtr );
+CleanupStack::PopAndDestroy( body );
+iMessageTextPartModified = ETrue;
+}
 iMessageModified = ETrue;
 RefreshToolbar();
 if ( aSaveNow )
 {
 if ( item && !item->IsRemote() ) // cannot open remote attachments
 {
 CFSMailMessagePart* msgPart =
 iNewMessage->ChildPartL( item->MailMsgPartId() );
 CleanupStack::PushL( msgPart );
-//We are forbidding to change MSK label during OpenAttachmentL
-//because dialog/popup can be open
-iContainer->SwitchChangeMskOff( ETrue );
 TFsEmailUiUtility::OpenAttachmentL( *msgPart );
-iContainer->SwitchChangeMskOff( EFalse );
 CleanupStack::PopAndDestroy( msgPart );
 }
 }
 	}
 iNewMessage->SaveMessageL();
 iMessageModified = EFalse;
 }
 TFsEmailUiUtility::CreatePlainTextPartL( *iNewMessage, iNewMessageTextPart );
-if (NULL == iNewMessageTextPart) // problems with creating
-{
-User::Leave( KErrUnknown );
-}
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeView::GenerateForwardMessageL
 // -----------------------------------------------------------------------------
 iNewMessage->SaveMessageL();
 	    }
 	TFsEmailUiUtility::CreatePlainTextPartL(
 	        *iNewMessage, iNewMessageTextPart );
-if (NULL == iNewMessageTextPart) // problems with creating
-{
-User::Leave( KErrUnknown );
-}
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeView::InitReplyUiL
 // -----------------------------------------------------------------------------
 TBool result = EFalse;
 if ( iFirstStartCompleted ) // Safety
 {
 if ( !aError )
 {
-// may leave if unable to create new message part
 TRAP( aError, InitReplyOrForwardUiL() );
-}
-if ( !aError )
-{
 iAutoSaver->Enable( ETrue );
 }
 else
 {
 // something went wrong
 //
 void CNcsComposeView::ExitComposer()
 {
 FUNC_LOG;
-// dont exit while in child activation
-if ( EChildActivationStarted == iChildActivationState )
-{
-iChildActivationState = EChildActivationError;
-}
-if ( EChildActivationError == iChildActivationState )
-{
-return;
-}
 if ( iStatusPaneIndicators )
 {
 iStatusPaneIndicators->HideStatusPaneIndicators();
 }
 {
 AppUi()->RemoveFromStack( iContainer );
 delete iContainer;
 iContainer = NULL;
 }
-iIncludeMessageTextAsync = EFalse;
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeView::SaveAndCleanPreviousMessage
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 void CNcsComposeView::AsyncExitL()
 {
 FUNC_LOG;
-if ( EChildActivationExitRequired == iChildActivationState )
+if ( iFakeSyncGoingOn || iExecutingDoExitL )
-{
-ExitComposer();
-}
-else if ( iFakeSyncGoingOn || iExecutingDoExitL )
 {
 // if some sync method is still going on, we continue waiting
 iActiveHelper->Cancel();
 iActiveHelper->Start();
 }
 return button;
 }
 // ---------------------------------------------------------------------------
-// Returns ETrue if WLAN connection is active.
-// ---------------------------------------------------------------------------
-//
-TBool CNcsComposeView::WLANConnectionActive()
-{
-TBool ret = EFalse;
-TInt wlanState;
-TInt err = RProperty::Get( KPSUidWlan, KPSWlanIndicator, wlanState );
-if ( err == KErrNone )
-{
-if ( wlanState == EPSWlanIndicatorActive ||
-wlanState == EPSWlanIndicatorActiveSecure )
-{
-ret = ETrue;
-}
-}
-return ret;
-}
-// ---------------------------------------------------------------------------
 // CActiveHelper::NewL()
 // ---------------------------------------------------------------------------
 //
 CActiveHelper* CActiveHelper::NewL( CNcsComposeView* aSession )
 {
 // ---------------------------------------------------------------------------
 //
 void CActiveHelper::RunL()
 {
 if( iComposeView )
-{
 iComposeView->AsyncExitL();
-}
 }
 // ---------------------------------------------------------------------------
 // CActiveHelper::DoCancel()
 // ---------------------------------------------------------------------------

branch	RCL_3
changeset 80	726fba06891a
parent 73	c8382f7b54ef