FCL/sf/app/commonemail: comparison emailuis/nmailui/src/nmapplication.cpp

equal deleted inserted replaced

-:99bcbff212ad
+:c2d07d913565
 if (mQueryDialog){
 delete mQueryDialog;
 mQueryDialog=NULL;
 }
 #ifndef NM_WINS_ENV
 	delete mSendServiceInterface;
 	delete mSendServiceInterface2;
 	delete mUriServiceInterface;
 	delete mMailboxServiceInterface;
 delete mNetManager;
 mNetManager=NULL;
 }
 // Effects needs to be deleted before MainWindow.
 delete mEffects;
+if (mMainWindow) {
+// workaround: assert failure may happen otherwise
+mMainWindow->close();
+}
 delete mMainWindow;
 delete mAttaManager;
 delete mSettingsViewLauncher;
 }
 // If view was started as service, move the app now
 // to the background, unless it was started when the app
 // was already in foreground..
 if (mServiceViewId == topViewId) {
 mServiceViewId = NmUiViewNone;
+NM_COMMENT("Returned from service view");
-// if started as embedded, do not hide the app
+// if started as embedded or while the app was in foreground,
+// do not hide the app
 if (!XQServiceUtil::isEmbedded() &&
 !mForegroundService) {
 XQServiceUtil::toBackground(true);
 }
 }
 if (startParam->service() && mMainWindow) {
 			// When the message list is started as a service previous views are removed
 			// from the stack. Open editors are not closed.
 			// Also if the view is same than the new one, keep it open (reload the content).
+		    // reset the foreground service flag while popping the views
+		    bool previousForegroundService = mForegroundService;
+		    mForegroundService = true;
 		    // at least one view must remain in the stack
 			while (mViewStack->count()>1) {
 			    NmUiViewId topId = mViewStack->top()->nmailViewId();
 			    if (topId!=NmUiViewMessageEditor &&
 			    else {
 			        // Editor or mailbox list in the top. Stop the loop.
 			        break;
 			    }
 			}
+			mForegroundService = previousForegroundService;
 }
 // Check whether requested view is already active
 // and if so, ask it to reload contents with new start parameter data
 // Do not reuse the view if started as service to editor view (ShareUI)
 delete startParam;
 startParam=NULL;
 resetViewStack();
 break;
 }
+}
-if (startParam && startParam->service()) {
-				// Store the view id that was launched as service
+if (startParam && startParam->service()) {
-		mServiceViewId = mActiveViewId;
+// Store the view id that was launched as service
-			}
+mServiceViewId = mActiveViewId;
-}
+		}
 }
 }
 /*!
 Function can be used from views to exit the application
 if (mQueryDialog){
 delete mQueryDialog;
 mQueryDialog=NULL;
 }
 mQueryDialog = NmUtilities::displayQuestionNote(hbTrId("txt_mail_dialog_address_or_password_incorrect"),
 this, SLOT(launchSettings(HbAction*)));
 }
 if(event.mOperationType == Synch && event.mCompletionCode == NmServerConnectionError) {
 mLastOperationMailbox=event.mMailboxId;
 if (mQueryDialog){
 delete mQueryDialog;
 mQueryDialog=NULL;
 }
 mQueryDialog = NmUtilities::displayQuestionNote(hbTrId("txt_mail_dialog_server_settings_incorrect"),
 this, SLOT(launchSettings(HbAction*)));
 }
 // following applies to all operation/event types
 if(event.mCompletionCode == NmConnectionError) {
 NmUtilities::displayWarningNote(hbTrId("txt_mail_dialog_mail_connection_error"));
 }
 launches settings view of the specified mailbox
 */
 void NmApplication::launchSettings(HbAction* action)
 {
 NM_FUNCTION;
 // Check whether yes button was pressed
 if (mQueryDialog&& action == mQueryDialog->actions().at(0)) {
 // create settingslauncher if doesn't exist
 if(!mSettingsViewLauncher) {
 mSettingsViewLauncher = new NmSettingsViewLauncher();
 }
 if(mSettingsViewLauncher) {
 // mailboxname required
 NmMailboxMetaData *mailboxMetaData = mUiEngine->mailboxById(mLastOperationMailbox); // no ownership
 if( mailboxMetaData ) {
 // launch
 mSettingsViewLauncher->launchSettingsView(mLastOperationMailbox, mailboxMetaData->name());
 }
 }
 }
 }
 /*!
 	Stores the visibility state, e.g. when the service was launched.
 	\return true if the app was visible

changeset 44	c2d07d913565
parent 43	99bcbff212ad
child 47	f83bd4ae1fe3
child 54	997a02608b3a