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

equal deleted inserted replaced

-:35b64624a9e7
+:36f374c67aa8
 #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,int activityMsgId) :
 QObject(parent), mMainWindow(mainWindow), mUniEditor(0), mListView(0), mConversationView(0),
 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();
 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;
 }
 switchView(param);
 break;
 }
 case MsgBaseView::AUDIOFETCHER:
 {
-// switch to CV.
+// switch back to previous view
 QVariantList param;
 param << mPreviousView;
 param << MsgBaseView::AUDIOFETCHER;
 if(mPreviousView == MsgBaseView::CV)
 {
 param << mConversationId;
 }
 switchView(param);
+break;
 }
 default:
 {
 break;
 }
 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;
 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&)));
 {
 return;
 }
 mCurrentView = MsgBaseView::UNIEDITOR;
-mPreviousView = data.at(1).toInt();
+if(MsgBaseView::AUDIOFETCHER != data.at(1).toInt())
+{
+mPreviousView = data.at(1).toInt();
+}
 // delete Audio Fetcher view
 if(mAudioFetcherView)
 {
 appendViewToBeDeleted(mAudioFetcherView);
 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
 // @see header
 // ----------------------------------------------------------------------------
 void MsgViewManager::switchToAudioFetcher(const QVariantList& data)
 {
 /**
-* Audio Fetcher is tried to open again before exiting
+* Audio Fetcher is tried to open again
-* opened editor.
 */
 if(mAudioFetcherView)
 {
 return;
 }
 //switch to Audio Fetcher view
 mCurrentView = MsgBaseView::AUDIOFETCHER;
 mPreviousView = data.at(1).toInt();
+QVariantList editorData;
-mAudioFetcherView = new MsgAudioFetcherView();
+// 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)
 displayLabel,
 count);
 return localId;
 }
+//EOF

changeset 44	36f374c67aa8
parent 43	35b64624a9e7
child 47	5b14749788d7
child 52	12db4185673b