FCL/sf/app/messaging: comparison messagingapp/msgui/msgapp/src/msgviewmanager.cpp

equal deleted inserted replaced

-:ebfee66fde93
+:84197e66a4bd
 #include <xqserviceutil.h>
 #include <QSqlQuery>
 #include <QSqlError>
 #include <HbApplication>
 #include <xqappmgr.h>
-#include <HbMessageBox.h>
+#include <hbmessagebox.h>
 #include <HbView>
 #include "conversationsengine.h"
 #include "msglistview.h"
 #include "msgunieditorview.h"
 }
 }
 void MsgViewManager::switchView(const QVariantList& data)
 {
-connect(mMainWindow, SIGNAL(viewReady()),this,SLOT(setViewInteractive()));
-mMainWindow->setInteractive(false);
 int viewId = data.at(0).toInt();
 switch (viewId) {
 case MsgBaseView::DEFAULT:
 mPreviousView = data.at(1).toInt();
 //switch to univiewer.
 if (data.length() > 2) {
 qint32 contactId = data.at(2).toLongLong();
-QByteArray dataArray = data.at(3).toByteArray();
+qint32 messageId = data.at(3).toInt();
 int msgCount = data.at(4).toInt();
+int canForwardMessage = data.at(5).toInt();
-ConvergedMessage *message = new ConvergedMessage;
-QDataStream stream(&dataArray, QIODevice::ReadOnly);
-message->deserialize(stream);
-qint32 messageId = message->id()->getId();
 if (!mUniViewer) {
-mUniViewer = new UnifiedViewer(messageId);
+mUniViewer = new UnifiedViewer(messageId, canForwardMessage);
 mUniViewer->setNavigationAction(mBackAction);
 mMainWindow->addView(mUniViewer);
 connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this,
 SLOT(switchView(const QVariantList&)));
 }
 mUniViewer->populateContent(messageId, true, msgCount);
-delete message;
 }
 if(mPreviousView==MsgBaseView::CV && mConversationView)
 {
 mConversationView->setPSCVId(false);
 // close the application once its handled
 HbApplication::quit();
 }
+// ----------------------------------------------------------------------------
+// MsgViewManager::currentView
+// @see header
+// ----------------------------------------------------------------------------
+int MsgViewManager::currentView()
+{
+return mCurrentView;
+}

changeset 34	84197e66a4bd
parent 31	ebfee66fde93
child 43	35b64624a9e7