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

equal deleted inserted replaced

-:3533d4323edc
+:968773a0b6ef
 : 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 )
 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 );
 	 	SetAttachmentLabelContentL();
 	}
 break;
 case ENcsCmdPriorityHigh:
 	{
-	iNewMessage->ResetFlag( EFSMsgFlag_Low );
+	if ( iNewMessage )
-	iNewMessage->SetFlag( EFSMsgFlag_Important );
+	    {
-	iNewMessage->SaveMessageL();
+iNewMessage->ResetFlag( EFSMsgFlag_Low );
-iMessageModified = EFalse;
+iNewMessage->SetFlag( EFSMsgFlag_Important );
-	iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityHigh );
+iNewMessage->SaveMessageL();
+iMessageModified = EFalse;
+iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityHigh );
+	    }
 	}
 break;
 	case ENcsCmdPriorityNormal:
 	    	{
-	iNewMessage->ResetFlag( EFSMsgFlag_Low );
+	    	if ( iNewMessage )
-	iNewMessage->ResetFlag( EFSMsgFlag_Important );
+	    	    {
-	iNewMessage->SaveMessageL();
+iNewMessage->ResetFlag( EFSMsgFlag_Low );
-iMessageModified = EFalse;
+iNewMessage->ResetFlag( EFSMsgFlag_Important );
-	iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityNormal );
+iNewMessage->SaveMessageL();
+iMessageModified = EFalse;
+iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityNormal );
+	    	    }
 	    	}
 break;
 	case ENcsCmdPriorityLow:
 	    	{
-	iNewMessage->ResetFlag( EFSMsgFlag_Important );
+	    	if ( iNewMessage )
-	iNewMessage->SetFlag( EFSMsgFlag_Low );
+	    	    {
-	iNewMessage->SaveMessageL();
+iNewMessage->ResetFlag( EFSMsgFlag_Important );
-iMessageModified = EFalse;
+iNewMessage->SetFlag( EFSMsgFlag_Low );
-	iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityLow );
+iNewMessage->SaveMessageL();
+iMessageModified = EFalse;
+iStatusPaneIndicators->SetPriorityFlag( EMsgPriorityLow );
+	    	    }
 	    	}
 break;
 case ENcsCmdShowCc:
 {
 iContainer->SetCcFieldVisibleL( ETrue );
 	 		iContainer->ClosePopupContactListL();
 }
 break;
 case EAknSoftkeyClose:
 {
-DoSafeExit();
+if ( !iAddingAttachmentDialogOpened )
+DoSafeExit();
 }
 break;
 case ENcsCmdExit:
 {
 TIMESTAMP( "Exit selected from editor" );
 if ( iContainer->AreAddressFieldsEmpty() )
 {
 User::Leave( KErrNotFound );
 }
-CommitL( ETrue, EAllFields, ETrue );
+TRAPD( commitErr, CommitL( ETrue, EAllFields, ETrue ) );
+if ( KErrNone != commitErr )
+{
+iMailSendFailed = ETrue;
+User::Leave( commitErr );
+}
 TRAPD(r, iMailBox->SendMessageL( *iNewMessage ) );
 if ( KErrNone != r )
 {
 iMailSendFailed = ETrue;
 void CNcsComposeView::HandleDynamicVariantSwitchL(
 CFsEmailUiViewBase::TDynamicSwitchType aType )
 	{
 FUNC_LOG;
-if ( iFirstStartCompleted && iContainer )
+if ( iFirstStartCompleted && iContainer && !iExecutingDoExitL )
 {
 if ( aType == CFsEmailUiViewBase::EScreenLayoutChanged )
 {
 iContainer->HandleLayoutChangeL();
 }
 break;
 default:
 break;
 }
-if ( commitToField )
+	if ( iNewMessage )
-{
-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 )
 	    {
-	    // get subject from UI to MSG object
+if ( commitToField )
-	    HBufC* subject = iContainer->GetSubjectLC();
+{
-	    TPtr ptr = subject->Des();
+RPointerArray<CFSMailAddress>& recipients =
-		// replace new line characters with spaces as Subject is normally
+iNewMessage->GetToRecipients();
-	    // one line only
+recipients.ResetAndDestroy();
-	    AknTextUtils::ReplaceCharacters(
+NcsUtility::ConvertAddressArrayL(
-	            ptr, KLineSeparators, KReplacementChar );
+iContainer->GetToFieldAddressesL( aParseAddresses ), recipients );
-	    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 )
 {
 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 ( iFakeSyncGoingOn || iExecutingDoExitL )
+if ( EChildActivationExitRequired == iChildActivationState )
+{
+ExitComposer();
+}
+else if ( iFakeSyncGoingOn || iExecutingDoExitL )
 {
 // if some sync method is still going on, we continue waiting
 iActiveHelper->Cancel();
 iActiveHelper->Start();
 }
 // ---------------------------------------------------------------------------
 //
 void CActiveHelper::RunL()
 {
 if( iComposeView )
+{
 iComposeView->AsyncExitL();
+}
 }
 // ---------------------------------------------------------------------------
 // CActiveHelper::DoCancel()
 // ---------------------------------------------------------------------------

branch	RCL_3
changeset 26	968773a0b6ef
parent 25	3533d4323edc