FCL/sf/app/recents: comparison logsui/logsapp/src/logsviewmanager.cpp

equal deleted inserted replaced

-:e52d42f9500c
+:41c0a814d878
 #include "logsdetailsview.h"
 #include "logsfilter.h"
 #include "logsdefs.h"
 #include "logslogger.h"
 #include "logsservicehandler.h"
+#include "logsservicehandlerold.h"
 #include "logsmainwindow.h"
 //SYSTEM
 #include <hbmainwindow.h>
 #include <hbview.h>
 #include <logsservices.h>
 #include <QApplication>
 #include <hblineedit.h>
 #include <dialpad.h>
+#include <hbactivitymanager.h>
+#include <hbapplication.h>
 // -----------------------------------------------------------------------------
 // LogsViewManager::LogsViewManager
 // -----------------------------------------------------------------------------
 //
 LogsViewManager::LogsViewManager(
-LogsMainWindow& mainWindow, LogsServiceHandler& service ) :
+LogsMainWindow& mainWindow, LogsServiceHandler& service,
-QObject( 0 ), mMainWindow( mainWindow ), mService( service ),
+LogsServiceHandlerOld& serviceOld ) :
+QObject( 0 ), mMainWindow( mainWindow ),
+mService( service ), mServiceOld( serviceOld ),
 mFirstActivation(true), mViewActivationShowDialpad(false)
 {
 LOGS_QDEBUG( "logs [UI] -> LogsViewManager::LogsViewManager()" );
 //It is important that we always handle orientation change first, before
 connect( &mService, SIGNAL( activateView(LogsServices::LogsView, bool) ),
 this, SLOT( changeRecentView(LogsServices::LogsView, bool) ) );
 connect( &mService, SIGNAL( activateView(QString) ),
 this, SLOT( changeMatchesView(QString) ));
+connect( &mServiceOld, SIGNAL( activateView(LogsServices::LogsView, bool) ),
+this, SLOT( changeRecentView(LogsServices::LogsView, bool) ) );
+connect( &mServiceOld, SIGNAL( activateView(QString) ),
+this, SLOT( changeMatchesView(QString) ));
 connect( &mMainWindow, SIGNAL(appFocusGained()), this, SLOT(appFocusGained()) );
 connect( &mMainWindow, SIGNAL(appFocusLost()), this, SLOT(appFocusLost()) );
+QObject::connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(saveActivity()));
+handleFirstActivation();
 LOGS_QDEBUG( "logs [UI] <- LogsViewManager::LogsViewManager()" );
 }
 // -----------------------------------------------------------------------------
 //
 void LogsViewManager::initViews()
 {
 LOGS_QDEBUG( "logs [UI] -> LogsViewManager::initViews()" );
-// Disable view switching as otherwise flick gestures change
-// views which is not desired.
-//Deprecated:
-//mMainWindow.setViewSwitchingEnabled(false);
 // Don't activate any view, app focus gaining or service request
 // will cause view activation
 //
 LogsRecentCallsView* view = mComponentsRepository->recentCallsView();
 // -----------------------------------------------------------------------------
 //
 void LogsViewManager::changeMatchesView(QString dialpadText)
 {
 LOGS_QDEBUG( "logs [UI] -> LogsViewManager::changeMatchesView()" );
-Dialpad* dialpad = mComponentsRepository->dialpad();
+doActivateView(LogsMatchesViewId, true, QVariant(), dialpadText);
-dialpad->editor().setText(dialpadText);
-LogsModel* model = mComponentsRepository->model();
-if ( model && model->predictiveSearchStatus() == logsContactSearchEnabled ){
-LOGS_QDEBUG( "logs [UI]     contact search enabled, go to macthes view" );
-doActivateView(LogsMatchesViewId, true, QVariant());
-} else {
-LOGS_QDEBUG( "logs [UI]     contact search disabled, go to recent view" );
-doActivateView(LogsRecentViewId, true, QVariant());
-}
 LOGS_QDEBUG( "logs [UI] <- LogsViewManager::changeMatchesView()" );
 }
 // -----------------------------------------------------------------------------
 // LogsViewManager::appFocusGained
 LOGS_QDEBUG( "logs [UI] -> LogsViewManager::appFocusGained()" );
 foreach ( LogsBaseView* view, mViewStack ){
 disconnect( view, SIGNAL(exitAllowed()), this, SLOT(proceedExit()) );
 }
-if ( mFirstActivation && !mService.isStartedUsingService() ){
-changeRecentView( mService.currentlyActivatedView(), false );
-mMainWindow.bringAppToForeground();
-}
-mComponentsRepository->model()->refreshData();
 LOGS_QDEBUG( "logs [UI] <- LogsViewManager::appFocusGained()" );
 }
 // -----------------------------------------------------------------------------
 LOGS_QDEBUG( "logs [UI] Exit delayed" );
 // Fake exit by sending app to background
 mMainWindow.sendAppToBackground();
-// Set application to default state (recent calls and no dialpad)
-activateView( LogsRecentViewId, false, QVariant() );
-mComponentsRepository->recentCallsView()->resetView();
 bool exitAllowed( true );
 foreach ( LogsBaseView* view, mViewStack ){
 if ( !view->isExitAllowed() ){
 exitAllowed = false;
 // previously activated view and activates new view and place it at top of
 // view stack.
 // -----------------------------------------------------------------------------
 //
 bool LogsViewManager::doActivateView(
-LogsAppViewId viewId, bool showDialpad, QVariant args)
+LogsAppViewId viewId, bool showDialpad, QVariant args, const QString& dialpadText)
 {
 LOGS_QDEBUG( "logs [UI] -> LogsViewManager::doActivateView()" );
 bool activated(false);
 LogsBaseView* newView = 0;
 LogsBaseView* oldView = mViewStack.count() > 0 ? mViewStack.at(0) : 0;
+viewId = checkMatchesViewTransition(viewId, dialpadText);
 for ( int i = 0; i < mViewStack.count(); ++i ){
 if ( mViewStack.at(i)->viewId() == viewId ){
 newView = mViewStack.takeAt(i);
 }
 {
 LOGS_QDEBUG( "logs [UI] -> LogsViewManager::handleOrientationChanged()" );
 QMetaObject::invokeMethod(mMainWindow.currentView(), "handleOrientationChanged");
 LOGS_QDEBUG( "logs [UI] <- LogsViewManager::handleOrientationChanged()" );
 }
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void LogsViewManager::saveActivity()
+{
+LOGS_QDEBUG( "logs [UI] -> LogsViewManager::saveActivity()" );
+if ( mViewStack.count() == 0 ){
+return;
+}
+HbActivityManager* activityManager = static_cast<HbApplication*>(qApp)->activityManager();
+foreach ( LogsBaseView* view, mViewStack ){
+view->clearActivity(*activityManager);
+}
+QVariantHash metaData;
+metaData.insert("screenshot", QPixmap::grabWidget(&mMainWindow, mMainWindow.rect()));
+QByteArray serializedActivity;
+QDataStream stream(&serializedActivity, QIODevice::WriteOnly | QIODevice::Append);
+metaData.insert(
+logsActivityParamShowDialpad, mComponentsRepository->dialpad()->isOpen() );
+metaData.insert(
+logsActivityParamDialpadText, mComponentsRepository->dialpad()->editor().text() );
+QString activityId = mViewStack.at(0)->saveActivity(stream, metaData);
+// add the activity to the activity manager
+bool ok = activityManager->addActivity(activityId, serializedActivity, metaData);
+if ( !ok ){
+LOGS_QDEBUG( "logs [UI] activity adding failed" );
+}
+LOGS_QDEBUG( "logs [UI] <- LogsViewManager::saveActivity()" );
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+bool LogsViewManager::loadActivity()
+{
+LOGS_QDEBUG( "logs [UI] -> LogsViewManager::loadActivity()" );
+bool loaded = false;
+HbApplication* hbApp = static_cast<HbApplication*>(qApp);
+QString activityId = hbApp->activateId();
+LOGS_QDEBUG_2( "logs [UI] activity id:", activityId );
+bool ok = hbApp->activityManager()->waitActivity();
+if ( !ok ){
+LOGS_QDEBUG( "logs [UI] Activity reschedule failed" );
+}
+LogsBaseView* matchingView = 0;
+for ( int i = 0; i < mViewStack.count() && !matchingView; i++ ){
+if ( mViewStack.at(i)->matchWithActivityId(activityId) ){
+matchingView =  mViewStack.at(i);
+}
+}
+if ( matchingView ){
+// Should have only one param hash in the list, use first always
+QList<QVariantHash> allParams = hbApp->activityManager()->activities();
+QVariantHash params = allParams.isEmpty() ? QVariantHash() : allParams.at(0);
+LOGS_QDEBUG_2( "logs [UI] Activity params", params );
+bool showDialpad = params.value(logsActivityParamShowDialpad).toBool();
+QString dialpadText = params.value(logsActivityParamDialpadText).toString();
+QByteArray serializedActivity = hbApp->activateData().toByteArray();
+QDataStream stream(&serializedActivity, QIODevice::ReadOnly);
+QVariant args = matchingView->loadActivity(activityId, stream, params);
+loaded = doActivateView( matchingView->viewId(), showDialpad, args, dialpadText );
+}
+LOGS_QDEBUG_2( "logs [UI] <- LogsViewManager::loadActivity() loaded:", loaded );
+return loaded;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+LogsAppViewId LogsViewManager::checkMatchesViewTransition(
+LogsAppViewId viewId, const QString& dialpadText)
+{
+if ( !dialpadText.isEmpty() ){
+Dialpad* dialpad = mComponentsRepository->dialpad();
+dialpad->editor().setText(dialpadText);
+}
+if ( viewId == LogsMatchesViewId ){
+LogsModel* model = mComponentsRepository->model();
+if ( model && model->predictiveSearchStatus() != logsContactSearchEnabled ){
+LOGS_QDEBUG( "logs [UI]     contact search disabled, go to recent view" );
+viewId = LogsRecentViewId;
+}
+}
+return viewId;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+void LogsViewManager::handleFirstActivation()
+{
+LOGS_QDEBUG( "logs [UI] -> LogsViewManager::handleFirstActivation()" );
+bool useSavedActivity( static_cast<HbApplication*>(qApp)->activateReason() ==
+Hb::ActivationReasonActivity );
+if ( useSavedActivity && loadActivity() ){
+LOGS_QDEBUG( "logs [UI] loaded saved activity" );
+mMainWindow.bringAppToForeground();
+} else if ( mFirstActivation && !mService.isStartedUsingService() &&
+!mServiceOld.isStartedUsingService()) {
+changeRecentView( LogsServices::ViewAll, false );
+mMainWindow.bringAppToForeground();
+}
+// Clear previously stored activations
+HbActivityManager* activityManager = static_cast<HbApplication*>(qApp)->activityManager();
+foreach ( LogsBaseView* view, mViewStack ){
+view->clearActivity(*activityManager);
+}
+LOGS_QDEBUG( "logs [UI] <- LogsViewManager::handleFirstActivation()" );
+}

changeset 6	41c0a814d878
parent 4	e52d42f9500c
child 8	6c9acdc6adc0
child 10	b04270301d3b