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

equal deleted inserted replaced

-:15bc1d5d6267
+:ae34e1715e21
 #include <email_services_api.h>
 #include <e32base.h>
 static const QString NmSendServiceName = "nmail.com.nokia.symbian.IFileShare";
-// Delay before a screenshot is taken after view activation so that view has time to draw itself,
-// testing seems to indicate 500ms to be a good value
-static const int NmActivityUpdateDelayMs = 500;
 static const QString NmActivityName = "EmailInboxView";
 /*!
 \class NmApplication
 \brief Application class, creates main window and handles view switching.
 */
 /*!
 Constructor.
 */
-NmApplication::NmApplication(QObject *parent, quint32 accountId)
+NmApplication::NmApplication(QObject *parent, quint64 accountId)
 : QObject(parent),
 mMainWindow(NULL),
 mViewStack(NULL),
 mActiveViewId(NmUiViewNone),
 mUiEngine(NULL),
 mEffects(NULL),
 mAttaManager(NULL),
 mSettingsViewLauncher(NULL),
 mViewReady(false),
 mQueryDialog(NULL),
-mBackButtonPressed(false),
+mBackButtonPressed(false)
-mActivityUpdateNeeded(false)
 {
 TRAP_IGNORE(mUiEngine = NmUiEngine::instance());
 // Create network access manager and cache for application use.
 mNetManager = new NmViewerViewNetManager(*mUiEngine);
 mViewerServiceInterface =
 new NmViewerServiceInterface(NULL, this, *mUiEngine);
 if(accountId != 0) {
 QVariant mailbox;
-mailbox.setValue(mUiEngine->getPluginIdByMailboxId(accountId).id());
+mailbox.setValue(accountId);
 mMailboxServiceInterface->displayInboxByMailboxId(mailbox);
 }
 mEffects = new NmUiEffects(*mMainWindow);
-}
+QObject::connect(parent, SIGNAL(activate()), this, SLOT(activityActivated()));
+}
 /*!
 Destructor.
 */
 NmApplication::~NmApplication()
 {
+// Remove the event filter early since catching application activated/
+// deactivated events now may cause a crash.
+QCoreApplication::instance()->removeEventFilter(this);
 if (mQueryDialog) {
 delete mQueryDialog;
 mQueryDialog = NULL;
 }
 resetViewStack();
 delete mViewStack;
 NmIcons::freeIcons();
 NmUiEngine::releaseInstance(mUiEngine);
 mUiEngine = NULL;
 delete mBackAction;
 if (mNetManager) {
 if (mNetManager->cache()) {
 mNetManager->cache()->clear();
 }
-delete mNetManager;
-mNetManager = NULL;
+delete mNetManager;
+mNetManager = NULL;
 }
 // Effects need to be deleted before MainWindow.
 delete mEffects;
 delete mMainWindow;
 delete mAttaManager;
 delete mSettingsViewLauncher;
 }
 /*!
 Main application window creation.
 */
 void NmApplication::createMainWindow()
 // Currently effects to NmViewerHeader::paint() and
 // NmAttachmentListWidget::paint().
 mMainWindow->setOptimizationFlag(QGraphicsView::DontSavePainterState);
 }
-	// installed to get ApplicationActivate/Deactivate events
+	// Install the event filter in order to receive ApplicationActivate/Deactivate
+// events.
 QCoreApplication::instance()->installEventFilter(this);
 }
 /*!
 Slot. React to view ready signal and call current view method.
 */
 void NmApplication::viewReady()
 {
 mViewReady = true;
 if (mViewStack && !mViewStack->isEmpty()) {
 	NmBaseView *currentView = mViewStack->top();
 if (currentView) {
 currentView->viewReady();
 emit applicationReady();
 }
 }
 }
-/*!
-Event filter. End key is filtered from the main window and either the
+/*!
-view takes case of the or the app is exited by default.
+Event filter. End key is filtered from the main window and either the view
+takes case or the app is exited by default.
 */
 bool NmApplication::eventFilter(QObject *obj, QEvent *event)
 {
 bool consumed(false);
 if (obj && obj == mMainWindow && event && event->type() == QEvent::KeyPress) {
 QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
 if (keyEvent->key() == Qt::Key_No) {
 // End key, the "red" key.
 // Exit application if no pending operations are on-going.
 }
 }
-else if (event->type()==QEvent::ApplicationActivate) {
+else if (event && event->type() == QEvent::ApplicationActivate) {
 NM_COMMENT("NmApplication::eventFilter ApplicationActivate");
+		// Update task switcher name & screenshot, we could have activated into some other mailbox
-		// Activity thumbnails must be shown again
+updateActivity();
-		if (mActivityUpdateNeeded) {
+}
-			mActivityUpdateNeeded = false;
+else if (event && event->type() == QEvent::ApplicationDeactivate) {
-updateActivity();
-		}
-}
-else if (event->type()==QEvent::ApplicationDeactivate) {
 NM_COMMENT("NmApplication::eventFilter ApplicationDeactivate");
+// Update the screenshot in the taskswitcher to represent current state
+updateActivity();
 // hide the sync indicator when app goes to background
 mUiEngine->enableSyncIndicator(false);
 }
 if (!consumed) {
 consumed = QObject::eventFilter(obj, event);
 }
 return consumed;
 }
 /*!
 Push view to view stack.
 */
 void NmApplication::pushView(NmBaseView *newView)
 // Hide old view.
 NM_COMMENT("NmApplication::pushView() : remove view.");
 if (hideView) {
 mMainWindow->removeView(hideView);
 }
-QTimer::singleShot(NmActivityUpdateDelayMs, this, SLOT(updateActivity()));
 }
 }
 /*!
 Ask from view that is it ok to pop view. This kind of 2-phase popView is
 else if (mViewStack && mViewStack->size() == 0) {
 exitApplication();
 }
 }
 /*!
 Hide the application
 */
 void NmApplication::hideApplication()
 {
 // Remove also the mailbox item from the task switcher
 HbApplication* hbApp = dynamic_cast<HbApplication*>(parent());
 if (hbApp) {
 hbApp->activityManager()->removeActivity(NmActivityName);
 }
+}
-	// Update the activity when needed
-	mActivityUpdateNeeded = true;
-}
 /*!
 Pop view from view stack. View object is deleted.
 */
 void NmApplication::popView()
 mMainWindow->setCurrentView(showView);
 // Store activated view id.
 mActiveViewId=showView->nmailViewId();
 // Perform send animation if requested.
 mEffects->startEffect(NmUiEffects::NmEditorSendMessageAnimation);
-QTimer::singleShot(NmActivityUpdateDelayMs, this, SLOT(updateActivity()));
 }
 delete view;
 view = NULL;
 if (mViewStack && mViewStack->size() == 0) {
 exitApplication();
 }
 }
 /*!
 Reset view stack. Remove and destroy view objects.
 */
 void NmApplication::resetViewStack()
 {
 delete view;
 }
 	    mActiveViewId = NmUiViewNone;
 }
 }
 /*!
 Function activates view based on viewId parameter. If requested view is
 already open, it is requested to reload. Otherwise view object is created
 and pushed to view stack.
 mServiceViewId = mActiveViewId;
 		}
 }
 }
 /*!
 Function can be used from views to exit the application. View stack is
 cleared. Views can connect exit menu selection to this slot.
 */
 void NmApplication::exitApplication()
 mViewerServiceInterface = NULL;
 resetViewStack();
 qApp->quit();
 }
 /*!
 Exit the application in the next event loop.
 */
 void NmApplication::delayedExitApplication()
 {
 // Exit the application in the next event loop.
 QMetaObject::invokeMethod(this, "exitApplication", Qt::QueuedConnection);
 }
 /*!
 Getter for main window instance.
 */
 HbMainWindow *NmApplication::mainWindow()
 {
 return mMainWindow;
 }
 /*!
 Getter for main UI extension manager.
 */
 NmUiExtensionManager &NmApplication::extManager()
 {
 return *mExtensionManager;
 }
 /*!
 Getter for network access manager.
 */
 NmViewerViewNetManager &NmApplication::networkAccessManager()
 {
 return *mNetManager;
 }
 /*!
 Get the screen size. Function returns curtent screen size.
 */
 QSize NmApplication::screenSize()
 }
 }
 return ret;
 }
 /*!
 Handles all asynchronous operation's completions at UI level.
 */
 void NmApplication::handleOperationCompleted(const NmOperationCompletionEvent &event)
 {
 NmUtilities::displayWarningNote(hbTrId("txt_mail_dialog_mail_connection_error"));
 }
 }
 }
 /*!
 Launches settings view of the specified mailbox.
 */
 void NmApplication::launchSettings(HbAction* action)
 {
 // Mailboxname required.
 NmMailboxMetaData *mailboxMetaData = mUiEngine->mailboxById(mLastOperationMailbox); // No ownership.
 if( mailboxMetaData ) {
 // Launch.
 mSettingsViewLauncher->launchSettingsView(mLastOperationMailbox, mailboxMetaData->name());
-QTimer::singleShot(NmActivityUpdateDelayMs, this, SLOT(updateActivity()));
+}
 }
 }
-}
 /*!
 	Stores the visibility state, e.g. when the service was launched.
 	\return true if the app was visible.
 */
 	mForegroundService = (surface != 0);
 	NM_COMMENT(QString("NmApplication::updateVisibilityState() : mForegroundService == %1").arg(mForegroundService));
 	return mForegroundService;
 }
-/*!
-Update the thumbnail in the task switcher
+/*!
+Update the thumbnail in the task switcher.
 */
 void NmApplication::updateActivity()
 {
 NmMailboxMetaData *meta = mUiEngine->mailboxById(mCurrentMailboxId);
 HbApplication* hbApp = dynamic_cast<HbApplication*>(parent());
 if (hbApp) {
 if (meta) {
 TsTaskSettings tasksettings;
 tasksettings.setVisibility(false);
 QVariantHash metadata;
 TsTaskSettings tasksettings;
 tasksettings.setVisibility(true);
 }
 }
 }
+/*!
+	Switch to activated mailbox
+*/
+void NmApplication::activityActivated()
+{
+HbApplication* hbApp = dynamic_cast<HbApplication*>(parent());
+if (hbApp) {
+quint64 accountId(0);
+QString activateId = hbApp->activateId();
+if (hbApp->activateReason() == Hb::ActivationReasonActivity &&
+activateId.startsWith(NmActivityName) ) {
+QString accountIdString = activateId.mid(NmActivityName.length());
+accountId = accountIdString.toULongLong();
+QVariant mailbox;
+mailbox.setValue(accountId);
+mMailboxServiceInterface->displayInboxByMailboxId(mailbox);
+}
+}
+}

changeset 57	ae34e1715e21
parent 56	15bc1d5d6267
child 62	a8c646b56683