--- a/messagingapp/msgui/msgapp/src/msgviewmanager.cpp	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgui/msgapp/src/msgviewmanager.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -41,7 +41,6 @@
 #include "unidatamodelplugininterface.h"
 #include "msgcontacthandler.h"
 #include "debugtraces.h"
-#include "msgaudiofetcherview.h"
 
 // LOCALIZATION
 #define LOC_DELETE_MESSAGE hbTrId("txt_messaging_dialog_delete_message")
@@ -51,7 +50,7 @@
 
 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), mAudioFetcherView(0), mBackAction(0),
+        mUniViewer(0), mDraftsListView(0), mSettingsView(0), mBackAction(0),
         mServiceRequest(serviceRequest), mConversationId(-1), mViewServiceRequest(false),mMessageId(-1)
 {
     //creating back action.
@@ -240,20 +239,7 @@
         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;
@@ -308,11 +294,6 @@
         switchToMsgSettings(data);
         break;
     }
-    case MsgBaseView::AUDIOFETCHER:
-    {
-        switchToAudioFetcher(data);
-        break;
-    }
     }
     QCRITICAL_WRITE("MsgViewManager::switchView end.");
 }
@@ -575,13 +556,6 @@
         HbApplication::quit();
     }
 
-    // delete Audio Fetcher view
-    if(mAudioFetcherView)
-    {
-        appendViewToBeDeleted(mAudioFetcherView);
-        mAudioFetcherView = NULL;
-    }
-
     //delete UniEditor
     if (mUniEditor)
     {
@@ -694,24 +668,14 @@
      * Editor is tried to open again before exiting the previously
      * opened editor. Multi taping in DLV or Forward.
      */
-    if (mUniEditor && !mAudioFetcherView)
+    if (mUniEditor)
     {
         return;
     }
 
     mCurrentView = MsgBaseView::UNIEDITOR;
-    if(MsgBaseView::AUDIOFETCHER != data.at(1).toInt())
-    {
-        mPreviousView = data.at(1).toInt();
-    }
-
-    // delete Audio Fetcher view
-    if(mAudioFetcherView)
-    {
-        appendViewToBeDeleted(mAudioFetcherView);
-        mAudioFetcherView = NULL;
-    }
-
+    mPreviousView = data.at(1).toInt();
+    
     // delete UniViewer
 	if (mUniViewer )
 	{
@@ -719,11 +683,6 @@
 	    mUniViewer = NULL;
 	}
 
-    if (mConversationView)
-    {
-        //clearing content of cv.
-        mConversationView->clearContent();
-    }
 
     // reset conversation id published
     if(mPreviousView == MsgBaseView::CV && mConversationView)
@@ -802,7 +761,7 @@
             connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this,
                 SLOT(switchView(const QVariantList&)));
         }
-        mUniViewer->populateContent(messageId, true, msgCount);
+        mUniViewer->populateContent(messageId, true, msgCount, mConversationId);
     }
 
     if(mPreviousView==MsgBaseView::CV && mConversationView)
@@ -962,7 +921,7 @@
         connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this,
             SLOT(switchView(const QVariantList&)));
     }
-    mUniViewer->populateContent(msgId, true, -1);
+    mUniViewer->populateContent(msgId, true, -1, mConversationId);
 
     mMainWindow->setCurrentView(mUniViewer,true,Hb::ViewSwitchSequential);
 }
@@ -1118,42 +1077,6 @@
     }
 
 // ----------------------------------------------------------------------------
-// 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,true,Hb::ViewSwitchSequential);
-    }
-
-// ----------------------------------------------------------------------------
 // MsgViewManager::saveContentToDraft
 // @see header
 // ----------------------------------------------------------------------------
@@ -1172,6 +1095,20 @@
     }
 
 // ----------------------------------------------------------------------------
+// MsgViewManager::handleKeyEvent
+// @see header
+// ----------------------------------------------------------------------------
+bool MsgViewManager::handleKeyEvent(int key)
+{
+    MsgBaseView *baseView = static_cast<MsgBaseView *>(mMainWindow->currentView());
+    bool eventHandled = false;
+    if (baseView) {
+        eventHandled = baseView->handleKeyEvent(key);
+    }
+    return eventHandled;
+}
+
+// ----------------------------------------------------------------------------
 // MsgViewManager::saveContentToDraft
 // @see header
 // ----------------------------------------------------------------------------