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

equal deleted inserted replaced

-:84d9eb65b26f
+:e4592d119491
 #include <QSqlQuery>
 #include <QSqlError>
 #include <HbApplication>
 #include <xqappmgr.h>
 #include <HbMessageBox.h>
+#include <HbView>
 #include "conversationsengine.h"
 #include "msglistview.h"
 #include "msgunieditorview.h"
 #include "msgconversationbaseview.h"
 // LOCALIZATION
 #define LOC_BUTTON_DELETE hbTrId("txt_common_button_delete")
 #define LOC_BUTTON_CANCEL hbTrId("txt_common_button_cancel")
 #define LOC_DELETE_MESSAGE hbTrId("txt_messaging_dialog_delete_message")
+#define LOC_DIALOG_SAVE_RINGTONE hbTrId("txt_conversations_dialog_save_ringing_tone")
+#define LOC_COMMON_SAVE  hbTrId("txt_common_menu_save")
 const qint64 NULL_CONVERSATIONID = -1;
 MsgViewManager::MsgViewManager(bool serviceRequest, HbMainWindow* mainWindow, QObject* parent) :
 QObject(parent), mMainWindow(mainWindow), mUniEditor(0), mListView(0), mConversationView(0),
 mUniViewer(0), mDraftsListView(0), mSettingsView(0), mBackAction(0), mServiceRequest(
-serviceRequest), mConversationId(-1), mViewServiceRequest(false)
+serviceRequest), mConversationId(-1), mViewServiceRequest(false),mMessageId(-1)
 {
 //creating back action.
-mBackAction = new HbAction(Hb::BackAction, this);
+mBackAction = new HbAction(Hb::BackNaviAction, this);
 connect(mBackAction, SIGNAL(triggered()), this, SLOT(onBackAction()));
 //create clv as first view if not a service request.
 if (!mServiceRequest) {
 QVariantList param;
 param << MsgBaseView::CLV;
 param << MsgBaseView::CLV;
 switchView(param);
 }
+else
+{
+mDummyview = new HbView();
+mMainWindow->addView(mDummyview);
+mMainWindow->setCurrentView(mDummyview);
+mViewTobeDeleted << mDummyview;
+}
 }
 MsgViewManager::~MsgViewManager()
 {
 // TODO Auto-generated destructor stub
 mConversationView->saveContentToDrafts();
 //marking messages as red in CV.
 mConversationView->markMessagesAsRead();
+// reset the conversation id published
+mConversationView->setPSCVId(false);
 //clearing content of cv.
 mConversationView->clearContent();
 // if service request for veiwer the just switch to univiewer.
 if (mViewServiceRequest) {
 mCurrentView = MsgBaseView::UNIVIEWER;
 mMainWindow->setCurrentView(mUniViewer);
 break;
 }
-//Now UE can be launched from viewer and on its back
-//we need to clear viewer
-if (mUniViewer) {
-mMainWindow->removeView(mUniViewer);
-delete mUniViewer;
-mUniViewer = NULL;
-}
 //switch to clv.
 if (mServiceRequest) {
 completeServiceRequest();
 }
 else {
 param << MsgBaseView::CV;
 param << MsgBaseView::UNIVIEWER;
 param << mConversationId;
 switchView(param);
-delete mUniViewer;
-mUniViewer = NULL;
 }
 break;
 }
 case MsgBaseView::MSGSETTINGS:
 {
 }
 }
 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:
 {
 handleDefault(data);
 break;
 }
 case MsgBaseView::CLV:
 {
 switchToClv(data);
 break;
 }
 case MsgBaseView::CV:
 {
-switchToCv(data);
-break;
+switchToCv(data);
-}
+break;
+}
 case MsgBaseView::DLV:
 {
 switchToDlv(data);
 break;
 switchToMsgSettings(data);
 break;
 }
 }
 }
+void MsgViewManager::deletePreviousView()
+{
+while(mViewTobeDeleted.count())
+{
+HbView* v = mViewTobeDeleted.takeAt(0);
+mMainWindow->removeView(v);
+delete v;
+}
+disconnect(mMainWindow, SIGNAL(viewReady()), this, SLOT(deletePreviousView()));
+}
 void MsgViewManager::send(const qint32 contactId, const QString phoneNumber,
 const QString displayName)
 {
 qint64 conversationId = ConversationsEngine::instance()-> getConversationIdFromContactId(
 QVariantList param;
 if (conversationId < 0) {
 param << MsgBaseView::CLV;
 param << MsgBaseView::SERVICE;
+if( mCurrentView == MsgBaseView::CV && mConversationView)
+{
+mConversationView->setPSCVId(false);
+}
 }
 else {
 param << MsgBaseView::CV;
 param << MsgBaseView::SERVICE;
 param << conversationId;
 if (mViewServiceRequest && (mPreviousView == MsgBaseView::UNIVIEWER)) {
 // quit the application
 HbApplication::quit();
 }
-//remove the settings view from main window
-if (mSettingsView) {
-mMainWindow->removeView(mSettingsView);
-mSettingsView->setNavigationAction(mBackAction);
-connect(mBackAction, SIGNAL(triggered()), this, SLOT(onBackAction()), Qt::UniqueConnection);
-}
 if (mConversationView) {
+mConversationView->saveContentToDrafts();
 //clearing content of cv.
 mConversationView->clearContent();
 }
 if (!mListView) {
 connect(mListView, SIGNAL(switchView(const QVariantList&)), this,
 SLOT(switchView(const QVariantList&)));
 mMainWindow->addView(mListView);
 }
-//delete uni editor.
+mMainWindow->setCurrentView(mListView);
-if (mUniEditor) {
-mMainWindow->removeView(mUniEditor);
+//delete UniEditor
-delete mUniEditor;
+if (mUniEditor)
+{
+appendViewToBeDeleted(mUniEditor);
 mUniEditor = NULL;
 }
-if (mUniViewer) {
+//delete UniViewer
-mMainWindow->removeView(mUniViewer);
+if (mUniViewer)
-delete mUniViewer;
+{
+appendViewToBeDeleted(mUniViewer);
 mUniViewer = NULL;
 }
-mMainWindow->setCurrentView(mListView);
 }
 void MsgViewManager::switchToCv(const QVariantList& data)
 {
 //switch to CV.
 // delete case from viewer service
 if (mViewServiceRequest && (mPreviousView == MsgBaseView::UNIVIEWER)) {
 // quit the application
 HbApplication::quit();
-}
-//delete uni editor.
-if (mUniEditor) {
-mMainWindow->removeView(mUniEditor);
-delete mUniEditor;
-mUniEditor = NULL;
-}
-if (mUniViewer) {
-mMainWindow->removeView(mUniViewer);
-delete mUniViewer;
-mUniViewer = NULL;
 }
 QVariant var = data.at(2);
 qint64 conversationId;
 if (var.type() == QVariant::String) {
 if (conversationId == NULL_CONVERSATIONID) {
 QVariantList param;
 param << MsgBaseView::CLV;
 param << MsgBaseView::CV;
+if( mCurrentView == MsgBaseView::CV && mConversationView){
+mConversationView->setPSCVId(false);
+}
 switchView(param);
 return;
 }
 }
 else if (var.type() == QVariant::Invalid) {
 // this case comes when a message is deleted from
 // Unified viewer  set curent view as conversation view
 // and return
 mMainWindow->setCurrentView(mConversationView);
-delete mUniViewer;
+		// publish already opened conversation's id
-mUniViewer = NULL;
+mConversationView->setPSCVId(true);
+if (mUniViewer)
+{
+appendViewToBeDeleted(mUniViewer);
+mUniViewer = NULL;
+}
 return;
 }
 else {
 conversationId = var.toLongLong();
 connect(mConversationView, SIGNAL(switchView(const QVariantList&)), this,
 SLOT(switchView(const QVariantList&)));
 mMainWindow->addView(mConversationView);
 }
+else if (mConversationView->conversationId() != mConversationId){
+		//Save content to drafts before switching to different CV
+mConversationView->saveContentToDrafts();
+//clearing content of current cv.
+mConversationView->clearContent();
+	}
 mConversationView->openConversation(conversationId);
 if (mServiceRequest) {
 mMainWindow->setCurrentView(mConversationView);
 }
 else {
 mMainWindow->setCurrentView(mConversationView);
+}
+//delete UniEditor
+if (mUniEditor)
+{
+appendViewToBeDeleted(mUniEditor);
+mUniEditor = NULL;
+}
+//delete UniViewer
+if (mUniViewer)
+{
+appendViewToBeDeleted(mUniViewer);
+mUniViewer = NULL;
 }
 }
 void MsgViewManager::switchToDlv(const QVariantList& data)
 {
 //switch to DLV.
 mCurrentView = MsgBaseView::DLV;
 mPreviousView = data.at(1).toInt();
-//delete uni editor.
-if (mUniEditor) {
-mMainWindow->removeView(mUniEditor);
-delete mUniEditor;
-mUniEditor = NULL;
-}
 if (!mDraftsListView) {
 mDraftsListView = new DraftsListView();
 mDraftsListView->setNavigationAction(mBackAction);
 connect(mDraftsListView, SIGNAL(switchView(const QVariantList&)), this,
 if (mConversationView) {
 //clearing content of cv.
 mConversationView->clearContent();
 }
+// reset conversation id published
+if(mPreviousView == MsgBaseView::CV && mConversationView)
+{
+mConversationView->setPSCVId(false);
+}
 //swich to unieditor.
 if (!mUniEditor) {
 mUniEditor = new MsgUnifiedEditorView();
 mMainWindow->addView(mUniEditor);
 mUniEditor->setNavigationAction(mBackAction);
 if (mServiceRequest) {
 mMainWindow->setCurrentView(mUniEditor);
 }
 else {
 mMainWindow->setCurrentView(mUniEditor);
+}
+//delete UniViewer
+if (mUniViewer )
+{
+appendViewToBeDeleted(mUniViewer);
+mUniViewer = NULL;
 }
 }
 void MsgViewManager::switchToUniViewer(const QVariantList& data)
 {
 SLOT(switchView(const QVariantList&)));
 }
 mUniViewer->populateContent(messageId, true, msgCount);
 delete message;
 }
+if(mPreviousView==MsgBaseView::CV && mConversationView)
+{
+mConversationView->setPSCVId(false);
+}
 mMainWindow->setCurrentView(mUniViewer);
 }
 void MsgViewManager::switchToMsgSettings(const QVariantList& data)
 {
 mCurrentView = MsgBaseView::MSGSETTINGS;
 mPreviousView = data.at(1).toInt();
 if (!mSettingsView) {
-mSettingsView = new MsgSettingsView();
+MsgSettingsView::SettingsView view = MsgSettingsView::DefaultView;
+if (mPreviousView == MsgBaseView::UNIEDITOR || mPreviousView
+== MsgBaseView::CV)
+{
+view = (MsgSettingsView::SettingsView)data.at(2).toInt();
+}
+mSettingsView = new MsgSettingsView(view);
 mSettingsView->setNavigationAction(mBackAction);
 mMainWindow->addView(mSettingsView);
 mMainWindow->setCurrentView(mSettingsView);
 }
+if(mPreviousView==MsgBaseView::CV && mConversationView){
+mConversationView->setPSCVId(false);
+}
 }
 void MsgViewManager::handleDefault(const QVariantList& data)
 {
 //special handling incase we switch from settings-view
 if (MsgBaseView::MSGSETTINGS == previousViewId) {
 //switch to view, where from settings view was launched
 mCurrentView = mPreviousView;
 mPreviousView = previousViewId;
 //remove the settings view from main window
-if (mSettingsView) {
+if (mSettingsView)
-mMainWindow->removeView(mSettingsView);
+{
-delete mSettingsView;
+appendViewToBeDeleted(mSettingsView);
 mSettingsView = NULL;
 }
 switch (mCurrentView) {
 case MsgBaseView::CLV:
 {
 void MsgViewManager::view(int msgId)
 {
 int msgType;
 int msgSubType;
+mMessageId = msgId;
 qint32 messageId(msgId);
 ConversationsEngine::instance()->markAsReadAndGetType(messageId, msgType, msgSubType);
 switch (msgType) {
 case ConvergedMessage::Sms:
 break;
 }
 default:
 {
 // for un supported message show delete option
-bool result = HbMessageBox::question(LOC_DELETE_MESSAGE, LOC_BUTTON_DELETE,
+HbMessageBox::question(LOC_DELETE_MESSAGE,this,SLOT(onDialogDeleteMsg(HbAction*)),
+LOC_BUTTON_DELETE,
 LOC_BUTTON_CANCEL);
-if (result) {
-QList<int> msgIdList;
-msgIdList << msgId;
-ConversationsEngine::instance()->deleteMessages(msgIdList);
-}
-HbApplication::quit(); // exit after handling
 break;
 }
 }
 }
 // MsgViewManager::handleRingtoneMsg
 // @see header
 // ----------------------------------------------------------------------------
 void MsgViewManager::handleRingtoneMsg(int msgId)
 {
-if (RingBc::askSaveQuery()) {
+mMessageId = msgId;
-UniDataModelLoader* pluginLoader = new UniDataModelLoader();
+HbMessageBox::question(LOC_DIALOG_SAVE_RINGTONE, this,
-UniDataModelPluginInterface* pluginInterface = pluginLoader->getDataModelPlugin(
+SLOT(onDialogSaveTone(HbAction*)), LOC_COMMON_SAVE, LOC_BUTTON_CANCEL);
-ConvergedMessage::BioMsg);
-pluginInterface->setMessageId(msgId);
-UniMessageInfoList attachments = pluginInterface->attachmentList();
-QString attachmentPath = attachments.at(0)->path();
-RingBc* ringBc = new RingBc();
-ringBc->saveTone(attachmentPath);
-// clear attachement list : its allocated at data model
-while (!attachments.isEmpty()) {
-delete attachments.takeFirst();
-}
-delete ringBc;
-delete pluginLoader;
-}
-// close the application once its handled
-HbApplication::quit();
 }
 // ----------------------------------------------------------------------------
 // MsgViewManager::handleProvisoningMsg
 // @see header
 delete aiwMgr;
 // close the application once its handled
 HbApplication::quit();
 }
+void MsgViewManager::setViewInteractive()
+{
+if(!mMainWindow->isInteractive())
+{
+mMainWindow->setInteractive(true);
+}
+disconnect(mMainWindow, SIGNAL(viewReady()),this,SLOT(setViewInteractive()));
+}
+void  MsgViewManager::appendViewToBeDeleted(HbView* view)
+{
+if (view)
+{
+mViewTobeDeleted << view;
+connect(mMainWindow, SIGNAL(viewReady()), this, SLOT(deletePreviousView()));
+}
+}
+// ----------------------------------------------------------------------------
+// MsgViewManager::onDialogDeleteMsg
+// @see header
+// ----------------------------------------------------------------------------
+void MsgViewManager::onDialogDeleteMsg(HbAction* action)
+{
+HbMessageBox *dlg = qobject_cast<HbMessageBox*> (sender());
+if (action == dlg->actions().at(0)) {
+QList<int> msgIdList;
+msgIdList << mMessageId;
+ConversationsEngine::instance()->deleteMessages(msgIdList);
+}
+HbApplication::quit(); // exit after handling
+}
+// ----------------------------------------------------------------------------
+// MsgViewManager::onDialogSaveTone
+// @see header
+// ----------------------------------------------------------------------------
+void MsgViewManager::onDialogSaveTone(HbAction* action)
+{
+HbMessageBox *dlg = qobject_cast<HbMessageBox*> (sender());
+if (action == dlg->actions().at(0)) {
+UniDataModelLoader* pluginLoader = new UniDataModelLoader();
+UniDataModelPluginInterface* pluginInterface = pluginLoader->getDataModelPlugin(
+ConvergedMessage::BioMsg);
+pluginInterface->setMessageId(mMessageId);
+UniMessageInfoList attachments = pluginInterface->attachmentList();
+QString attachmentPath = attachments.at(0)->path();
+RingBc* ringBc = new RingBc();
+ringBc->saveTone(attachmentPath);
+// clear attachement list : its allocated at data model
+while (!attachments.isEmpty()) {
+delete attachments.takeFirst();
+}
+delete ringBc;
+delete pluginLoader;
+}
+// close the application once its handled
+HbApplication::quit();
+}

changeset 27	e4592d119491
parent 25	84d9eb65b26f
child 47	5b14749788d7