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

equal deleted inserted replaced

-:a32b19fb291e
+:5b14749788d7
 #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"
 #include "msgsettingsview.h"
 #include "convergedmessageid.h"
 #include "ringbc.h"
 #include "unidatamodelloader.h"
 #include "unidatamodelplugininterface.h"
+#include "msgcontacthandler.h"
+#include "debugtraces.h"
+#include "msgaudiofetcherview.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) :
+MsgViewManager::MsgViewManager(bool serviceRequest, HbMainWindow* mainWindow, QObject* parent,int activityMsgId) :
 QObject(parent), mMainWindow(mainWindow), mUniEditor(0), mListView(0), mConversationView(0),
-mUniViewer(0), mDraftsListView(0), mSettingsView(0), mBackAction(0), mServiceRequest(
+mUniViewer(0), mDraftsListView(0), mSettingsView(0), mAudioFetcherView(0), mBackAction(0),
-serviceRequest), mConversationId(-1), mViewServiceRequest(false),mMessageId(-1)
+mServiceRequest(serviceRequest), mConversationId(-1), mViewServiceRequest(false),mMessageId(-1)
 {
 //creating back action.
 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) {
+if(activityMsgId == NULL_CONVERSATIONID)
+{
 QVariantList param;
 param << MsgBaseView::CLV;
 param << MsgBaseView::CLV;
 switchView(param);
+}
+else
+{
+openUniEditorActivity(activityMsgId);
+}
 }
 else
 {
 mDummyview = new HbView();
 mMainWindow->addView(mDummyview);
 }
 MsgViewManager::~MsgViewManager()
 {
 // TODO Auto-generated destructor stub
+mEditorData.clear();
 }
 void MsgViewManager::onBackAction()
 {
 switch (mCurrentView) {
 break;
 }
 case MsgBaseView::CV:
 {
+	    mConversationId = -1; //reset the conversation view id since its closed
 //Save content to drafts before switching to clv
 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) {
 if (mViewServiceRequest) {
 HbApplication::quit();
 }
 else {
 QVariantList param;
-param << MsgBaseView::CV;
+if (mConversationId != -1)
-param << MsgBaseView::UNIVIEWER;
+{
-param << mConversationId;
+//this means CV is till open then just open the fresh CV
+param << MsgBaseView::CV;
+param << MsgBaseView::UNIVIEWER;
+param << mConversationView->conversationId();
+}
+else
+{
+param << MsgBaseView::CLV;
+param << MsgBaseView::UNIVIEWER;
+}
 switchView(param);
 }
 break;
 }
 param << MsgBaseView::DEFAULT;
 param << MsgBaseView::MSGSETTINGS;
 switchView(param);
 break;
 }
+case MsgBaseView::AUDIOFETCHER:
+{
+// switch back to previous view
+QVariantList param;
+param << mPreviousView;
+param << MsgBaseView::AUDIOFETCHER;
+if(mPreviousView == MsgBaseView::CV)
+{
+param << mConversationId;
+}
+switchView(param);
+break;
+}
 default:
 {
 break;
 }
 }
 }
 void MsgViewManager::switchView(const QVariantList& data)
 {
+QCRITICAL_WRITE("MsgViewManager::switchView start.");
-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::MSGSETTINGS:
 {
 switchToMsgSettings(data);
 break;
 }
-}
+case MsgBaseView::AUDIOFETCHER:
+{
+switchToAudioFetcher(data);
+break;
+}
+}
+QCRITICAL_WRITE("MsgViewManager::switchView end.");
 }
 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)
 QVariantList param;
 if (conversationId < 0) {
 param << MsgBaseView::CLV;
 param << MsgBaseView::SERVICE;
 if( mCurrentView == MsgBaseView::CV && mConversationView)
 {
 mConversationView->setPSCVId(false);
 }
 }
 switchToLastSavedView();
 }
 void MsgViewManager::switchToClv(const QVariantList& data)
 {
-//switch to CLV.
-mCurrentView = MsgBaseView::CLV;
 mPreviousView = data.at(1).toInt();
 // delete case from viewer service
 if (mViewServiceRequest && (mPreviousView == MsgBaseView::UNIVIEWER)) {
 // quit the application
 HbApplication::quit();
+}
+// this is the case when viewer/editor is opened and contacts update takes
+// place resulting in CV close, the view should directly come to CLV
+// bypassing the CV
+if ((mCurrentView == MsgBaseView::UNIVIEWER
+&& mPreviousView != MsgBaseView::UNIVIEWER)
+|| (mCurrentView == MsgBaseView::UNIEDITOR
+&& mPreviousView != MsgBaseView::UNIEDITOR))
+{
+//dont do anything
+//wait for the back from viewer/editor
+//and reset the open CV id
+mConversationId = -1;
+return;
+}
+//delete UniEditor
+if (mUniEditor)
+{
+appendViewToBeDeleted(mUniEditor);
+mUniEditor = NULL;
+}
+//delete UniViewer
+if (mUniViewer)
+{
+appendViewToBeDeleted(mUniViewer);
+mUniViewer = NULL;
 }
 if (mConversationView) {
 mConversationView->saveContentToDrafts();
 //clearing content of cv.
 mConversationView->clearContent();
-}
+//reset the open CV id
+mConversationId = -1;
+}
+//switch to CLV.
+mCurrentView = MsgBaseView::CLV;
 if (!mListView) {
 mListView = new MsgListView();
 mListView->setNavigationAction(mBackAction);
 connect(mListView, SIGNAL(switchView(const QVariantList&)), this,
 SLOT(switchView(const QVariantList&)));
 mMainWindow->addView(mListView);
 }
 mMainWindow->setCurrentView(mListView);
-//delete UniEditor
-if (mUniEditor)
-{
-appendViewToBeDeleted(mUniEditor);
-mUniEditor = NULL;
-}
-//delete UniViewer
-if (mUniViewer)
-{
-appendViewToBeDeleted(mUniViewer);
-mUniViewer = NULL;
-}
 }
 void MsgViewManager::switchToCv(const QVariantList& data)
 {
 //switch to CV.
 mCurrentView = MsgBaseView::CV;
 mPreviousView = data.at(1).toInt();
 // delete case from viewer service
 if (mViewServiceRequest && (mPreviousView == MsgBaseView::UNIVIEWER)) {
 // quit the application
 HbApplication::quit();
+}
+// delete Audio Fetcher view
+if(mAudioFetcherView)
+{
+appendViewToBeDeleted(mAudioFetcherView);
+mAudioFetcherView = NULL;
+}
+//delete UniEditor
+if (mUniEditor)
+{
+appendViewToBeDeleted(mUniEditor);
+mUniEditor = NULL;
+}
+//delete UniViewer
+if (mUniViewer)
+{
+appendViewToBeDeleted(mUniViewer);
+mUniViewer = NULL;
 }
 QVariant var = data.at(2);
 qint64 conversationId;
 if (var.type() == QVariant::String) {
 QString phoneNumber = var.toString();
-conversationId = findConversationId(phoneNumber);
+qint32 contactId = findContactId(phoneNumber);
+if (contactId != -1) {
+conversationId = ConversationsEngine::instance()->getConversationIdFromContactId(contactId);
+}
+else {
+conversationId = findConversationId(phoneNumber);
+}
 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);
 		// publish already opened conversation's id
 mConversationView->setPSCVId(true);
-if (mUniViewer)
-{
-appendViewToBeDeleted(mUniViewer);
-mUniViewer = NULL;
-}
 return;
 }
 else {
 conversationId = var.toLongLong();
 }
 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);
+mMainWindow->setCurrentView(mConversationView);
-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.
 {
 /**
 * Editor is tried to open again before exiting the previously
 * opened editor. Multi taping in DLV or Forward.
 */
-if (mUniEditor) {
+if (mUniEditor && !mAudioFetcherView)
+{
 return;
 }
 mCurrentView = MsgBaseView::UNIEDITOR;
-mPreviousView = data.at(1).toInt();
+if(MsgBaseView::AUDIOFETCHER != data.at(1).toInt())
+{
-if (mConversationView) {
+mPreviousView = data.at(1).toInt();
+}
+// delete Audio Fetcher view
+if(mAudioFetcherView)
+{
+appendViewToBeDeleted(mAudioFetcherView);
+mAudioFetcherView = NULL;
+}
+// delete UniViewer
+	if (mUniViewer )
+	{
+	    appendViewToBeDeleted(mUniViewer);
+	    mUniViewer = NULL;
+	}
+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);
 for (int i = 2; i < data.length(); i++) {
 editorData << data.at(i);
 }
 if (MsgBaseView::DLV == mPreviousView) {
-mUniEditor->openDraftsMessage(editorData);
+//Populate editor after view ready indication
+populateUniEditorAfterViewReady(editorData);
 }
 else {
 mUniEditor->populateContent(editorData);
 }
 }
-if (mServiceRequest) {
+mMainWindow->setCurrentView(mUniEditor);
-mMainWindow->setCurrentView(mUniEditor);
-}
-else {
-mMainWindow->setCurrentView(mUniEditor);
-}
-//delete UniViewer
-if (mUniViewer )
-{
-appendViewToBeDeleted(mUniViewer);
-mUniViewer = NULL;
-}
 }
 void MsgViewManager::switchToUniViewer(const QVariantList& data)
 {
 /**
 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);
 }
 mMainWindow->setCurrentView(mUniViewer);
 }
 void MsgViewManager::switchToMsgSettings(const QVariantList& data)
 {
 mCurrentView = MsgBaseView::MSGSETTINGS;
 mPreviousView = data.at(1).toInt();
 if (!mSettingsView) {
 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);
 }
 break;
 }
 default:
 {
 // for un supported message show delete option
-HbMessageBox::question(LOC_DELETE_MESSAGE,this,SLOT(onDialogDeleteMsg(HbAction*)),
+HbMessageBox::question(LOC_DELETE_MESSAGE,this,
-LOC_BUTTON_DELETE,
+SLOT(onDialogDeleteMsg(HbAction*)),
-LOC_BUTTON_CANCEL);
+HbMessageBox::Delete | HbMessageBox::Cancel);
 break;
 }
 }
 }
 // ----------------------------------------------------------------------------
 void MsgViewManager::handleRingtoneMsg(int msgId)
 {
 mMessageId = msgId;
 HbMessageBox::question(LOC_DIALOG_SAVE_RINGTONE, this,
-SLOT(onDialogSaveTone(HbAction*)), LOC_COMMON_SAVE, LOC_BUTTON_CANCEL);
+SLOT(onDialogSaveTone(HbAction*)),
+HbMessageBox::Save | HbMessageBox::Cancel);
 }
 // ----------------------------------------------------------------------------
 // MsgViewManager::handleProvisoningMsg
 // @see header
 {
 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()), Qt::UniqueConnection);
+}
+}
+// ----------------------------------------------------------------------------
+// MsgViewManager::populateEditorAfterViewReady
+// @see header
+// ----------------------------------------------------------------------------
+void MsgViewManager::populateUniEditorAfterViewReady(const QVariantList& editorData)
+	{
+	 //Save the editor data and use it in ViewReady handler
+	 mEditorData = editorData;
+	 connect(mMainWindow, SIGNAL(viewReady()), this, SLOT(populateUniEditorView()));
+	}
+// ----------------------------------------------------------------------------
+// MsgViewManager::populateUniEditorView
+// @see header
+// ----------------------------------------------------------------------------
+void MsgViewManager::populateUniEditorView()
+{
+if (mUniEditor)
+{
+mUniEditor->openDraftsMessage(mEditorData);
+}
+mEditorData.clear();
-disconnect(mMainWindow, SIGNAL(viewReady()),this,SLOT(setViewInteractive()));
+disconnect(mMainWindow, SIGNAL(viewReady()), this,
-}
+SLOT(populateUniEditorView()));
-void  MsgViewManager::appendViewToBeDeleted(HbView* view)
-{
-if (view)
-{
-mViewTobeDeleted << view;
-connect(mMainWindow, SIGNAL(viewReady()), this, SLOT(deletePreviousView()));
-}
 }
 // ----------------------------------------------------------------------------
 // MsgViewManager::onDialogDeleteMsg
 // @see header
 // close the application once its handled
 HbApplication::quit();
 }
+// ----------------------------------------------------------------------------
+// MsgViewManager::currentView
+// @see header
+// ----------------------------------------------------------------------------
+int MsgViewManager::currentView()
+{
+return mCurrentView;
+}
+// ----------------------------------------------------------------------------
+// MsgViewManager::switchToAudioFetcher
+// @see header
+// ----------------------------------------------------------------------------
+void MsgViewManager::switchToAudioFetcher(const QVariantList& data)
+{
+/**
+* Audio Fetcher is tried to open again
+*/
+if(mAudioFetcherView)
+{
+return;
+}
+//switch to Audio Fetcher view
+mCurrentView = MsgBaseView::AUDIOFETCHER;
+mPreviousView = data.at(1).toInt();
+QVariantList editorData;
+// i=2 because view manager consumed first two args
+for (int i = 2; i < data.length(); i++) {
+editorData << data.at(i);
+}
+mAudioFetcherView = new MsgAudioFetcherView(editorData);
+mAudioFetcherView->setNavigationAction(mBackAction);
+connect(mAudioFetcherView, SIGNAL(switchView(const QVariantList&)), this,
+SLOT(switchView(const QVariantList&)));
+if(mPreviousView==MsgBaseView::CV && mConversationView)
+{
+mConversationView->setPSCVId(false);
+}
+mMainWindow->addView(mAudioFetcherView);
+mMainWindow->setCurrentView(mAudioFetcherView);
+}
+// ----------------------------------------------------------------------------
+// MsgViewManager::saveContentToDraft
+// @see header
+// ----------------------------------------------------------------------------
+int MsgViewManager::saveContentToDraft()
+{
+int msgId = NULL_CONVERSATIONID;
+if( mCurrentView == MsgBaseView::CV )
+{
+msgId = mConversationView->saveContentToDrafts();
+}
+else if( mCurrentView ==MsgBaseView::UNIEDITOR)
+{
+msgId  = mUniEditor->saveContentToDrafts();
+}
+return msgId;
+}
+// ----------------------------------------------------------------------------
+// MsgViewManager::saveContentToDraft
+// @see header
+// ----------------------------------------------------------------------------
+void MsgViewManager::openUniEditorActivity(int activityMsgId)
+{
+int msgType;
+int msgSubType;
+qint32 messageId(activityMsgId);
+// get the message type
+ConversationsEngine::instance()->markAsReadAndGetType(messageId, msgType, msgSubType);
+if (!mUniEditor) {
+mUniEditor = new MsgUnifiedEditorView();
+mMainWindow->addView(mUniEditor);
+mUniEditor->setNavigationAction(mBackAction);
+connect(mUniEditor, SIGNAL(switchView(const QVariantList&)), this,
+SLOT(switchView(const QVariantList&)));
+}
+// buffer data to open the draft message
+ConvergedMessageId convergedMsgId(activityMsgId);
+ConvergedMessage message;
+message.setMessageType((ConvergedMessage::MessageType) msgType);
+message.setMessageId(convergedMsgId);
+// Launch uni-editor view
+QByteArray dataArray;
+QDataStream messageStream(&dataArray, QIODevice::WriteOnly | QIODevice::Append);
+message.serialize(messageStream);
+QVariantList editorData;
+editorData << dataArray;
+mUniEditor->openDraftsMessage(editorData);
+// set the current view
+mCurrentView = MsgBaseView::UNIEDITOR;
+mMainWindow->setCurrentView(mUniEditor);
+}
+// ----------------------------------------------------------------------------
+// MsgViewManager::findContactId
+// @see header
+// ----------------------------------------------------------------------------
+qint32 MsgViewManager::findContactId(QString address)
+{
+QString displayLabel;
+int count;
+int localId =
+MsgContactHandler::resolveContactDisplayName(address,
+displayLabel,
+count);
+return localId;
+}
+//EOF

branch	GCC_SURGE
changeset 47	5b14749788d7
parent 27	e4592d119491
parent 44	36f374c67aa8