FCL/sf/app/photos: comparison photosgallery/gallery/src/glxappui.cpp

equal deleted inserted replaced

-:9ba538e329bd
+:7d9067c6fcb1
 _LIT8( KPhotosMonths, "Months" );
 _LIT8( KPhotosTags, "Tags" );
 _LIT8( KPhotosAlbums, "Albums" );
 _LIT8( KPhotosAllValue,"Allcs");
-_LIT8( KPhotoSuiteActivationMessage, "mm://root/photossuite?exit=hide" );
 _LIT8( KPhotosSuiteExitMessage, "mm://photossuite?action=exit" );
 // Matrix uid, needed for activating the suite view.
 const TInt KMatrixUid = 0x101F4CD2;
 const TInt KCapturedAlbumId = 2 ;
+/**
+* Start Delay for the periodic timer, in microseconds
+*/
+const TInt KPeriodicStartDelay = 60000000; // 60 secs
 // -----------------------------------------------------------------------------
 // Constructor
 // -----------------------------------------------------------------------------
 //
 CGlxAppUi::CGlxAppUi()
 }
 if( iBSWrapper )
 {
 delete iBSWrapper;
+}
+if (iPeriodic)
+{
+iPeriodic->Cancel();
+delete iPeriodic;
 }
 if( iIadUpdate )
 {
 	delete iIadUpdate;
 TRACER("TBool CGlxAppUi::ProcessCommandParametersL(TApaCommand aCommand, TFileName& aDocumentName, const TDesC8& aTail)");
 TRAPD(err, HandleActivationMessageL(aCommand, aDocumentName, aTail));
 if ( KErrNone != err )
 {
-// Open photos suite view
+// Open navigational state at root level
-LaunchMmViewL( KPhotoSuiteActivationMessage );
+CMPXCollectionPath* newState = CMPXCollectionPath::NewL();
-Exit();
+CleanupStack::PushL( newState );
+iNavigationalState->NavigateToL( *newState );
+CleanupStack::PopAndDestroy( newState );
 }
 if(0 == aTail.CompareC(KNullDesC8))
 {
 	return ETrue;
 TUid msgUid;
 RDesReadStream stream(aData);
 CleanupClosePushL(stream);
 stream >> msgUid;
-//Check for the IADUpdate
+//Start a timer to check for thr IAD update after 30 Secs.
-//TBD: Need to check the location this has to be called.
+if(!iPeriodic)
-//This might not be proper place.
+{
-DoCheckForIADUpdatesL();
+iPeriodic = CPeriodic::NewL(CActive::EPriorityLow);
+}
+if ( !iPeriodic->IsActive() )
+{
+iPeriodic->Start( KPeriodicStartDelay, KMaxTInt,
+TCallBack( &PeriodicCallback, static_cast<TAny*>(this) ) );
+}
 switch ( msgUid.iUid )
 {
 case KGlxActivationCmdShowLastModified:
 // Go to camera album full screen view
 GLX_LOG_INFO("CGlxAppUi::HandleActivationMessageL: show last modified");
 // Send the command to reset the view
 ProcessCommandL(EGlxCmdResetView);
 // Not using KGlxCollectionPluginCameraImplementationUid
+iNavigationalState->SetBackExitStatus(ETrue);
 path->AppendL(KGlxCollectionPluginAlbumsImplementationUid);
 path->AppendL(KCapturedAlbumId);
 SetActivationParamL(KGlxActivationFullScreen);
 break;
 case KGlxActivationCameraAlbum:
 // Go to camera album tile view
 GLX_LOG_INFO("CGlxAppUi::HandleActivationMessageL: camera album");
+iNavigationalState->SetBackExitStatus(ETrue);
 path->AppendL(KGlxCollectionPluginAlbumsImplementationUid);
 path->AppendL(KCapturedAlbumId);
 break;
 case KGlxActivationPhotosMenu:
 // Open the main view
 GLX_LOG_INFO("CGlxAppUi::HandleActivationMessageL: photos menu");
 break;
+case KGlxActivationAllView:
+GLX_LOG_INFO("CGlxAppUi::HandleActivationMessageL: Show all photos");
+// Send the command to reset the view
+ProcessCommandL(EGlxCmdResetView);
+path->AppendL(KGlxCollectionPluginAllImplementationUid);
+	break;
 default:
 GLX_LOG_INFO("CGlxAppUi::HandleActivationMessageL: unknown command");
 if(0 == aData.CompareC(KPhotosCaptured))
 {
-iNavigationalState->SetBackExitStatus(ETrue);
 path->AppendL(KGlxCollectionPluginAlbumsImplementationUid);
 				path->AppendL(KCapturedAlbumId);
 }
 else if(0 == aData.CompareC(KPhotosAllValue))
 {
-iNavigationalState->SetBackExitStatus(ETrue);
 path->AppendL(KGlxCollectionPluginAllImplementationUid);
 }
 else if(0 == aData.CompareC(KPhotosMonths))
 {
-iNavigationalState->SetBackExitStatus(ETrue);
 path->AppendL(KGlxCollectionPluginMonthsImplementationUid);
 }
 else if(0 == aData.CompareC(KPhotosAlbums))
 {
-iNavigationalState->SetBackExitStatus(ETrue);
 path->AppendL(KGlxCollectionPluginAlbumsImplementationUid);
 }
 else if(0 == aData.CompareC(KPhotosTags))
 {
-iNavigationalState->SetBackExitStatus(ETrue);
 path->AppendL(KGlxTagCollectionPluginImplementationUid);
 }
 else
 {
 User::Leave(KErrNotSupported);
 }
+iNavigationalState->SetBackExitStatus(ETrue);
 TBuf8<15> buf;
 buf.Append( KPhotosSuiteNavigation );
 TRAP_IGNORE(iBSWrapper->ForwardActivationEventL( buf, ETrue ))
 break;
 }
 CleanupStack::PopAndDestroy(&stream);
+iNavigationalState->SetStartingLevel(path->Levels());
 iNavigationalState->NavigateToL( *path );
 CleanupStack::PopAndDestroy(path);
 // Introduced to fix bug EMJN-78GH6N. Rowland Cook 10/12/2007
 if (0 != iEikonEnv->RootWin().OrdinalPosition())
 MGlxCache* cacheManager = MGlxCache::InstanceL();
 cacheManager->StopRAMReleaseL();
 cacheManager->Close();
 }
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
-// CGlxAppUi::DoCheckForIADUpdatesL()
+// Callback from periodic timer
+// -----------------------------------------------------------------------------
+//
+TInt CGlxAppUi::PeriodicCallback(TAny* aPtr)
+{
+TRACER("CGlxAppUi::PeriodicCallback(TAny* aPtr)");
+// get "this" pointer
+static_cast<CGlxAppUi*>(aPtr)->PeriodicCallback();
+return KErrNone;
+}
+// -----------------------------------------------------------------------------
+// Callback from periodic timer, non-static
+// -----------------------------------------------------------------------------
+//
+void CGlxAppUi::PeriodicCallback()
+{
+TRACER("CGlxAppUi::PeriodicCallback()");
+TRAP_IGNORE(DoCheckForIADUpdatesL());
+iPeriodic->Cancel();
+}
+// ---------------------------------------------------------------------------
+// CCGlxNsAppUi::DoCheckForIADUpdatesL()
 // Check for updates via IAD
 // ---------------------------------------------------------------------------
 //
 void CGlxAppUi::DoCheckForIADUpdatesL()
 {
 TRACER("CGlxAppUi::DoCheckForIADUpdatesL()");
+#ifdef _DEBUG
+TTime startTime;
+GLX_LOG_INFO("CGlxAppUi::DoCheckForIADUpdatesL(+)");
+startTime.HomeTime();
+#endif
 if ( !iIadUpdate )
 {
 iIadUpdate = CGlxIadUpdate::NewL();
 }
 iIadUpdate->StartL();
+#ifdef _DEBUG
+TTime stopTime;
+stopTime.HomeTime();
+GLX_DEBUG2("CGlxAppUi::DoCheckForIADUpdatesL(-) took <%d> us",
+(TInt)stopTime.MicroSecondsFrom(startTime).Int64());
+#endif
 }
 // ---------------------------------------------------------------------------
 // LaunchMmViewL
 //

changeset 2	7d9067c6fcb1
parent 1	9ba538e329bd
child 13	71da52165949