FCL/sf/app/organizer: comparison clock2/clockui/adtupdater/src/adtupdatercontainer.cpp

equal deleted inserted replaced

-:97232defd20e
+:356f28cd5ca0
 const TInt KSingleCity( 1 );
 const TInt KZero( 0 );
 const TInt KFirstBootDone( 1 );
 const TInt KTimeFormatLength( 16 );				 // "20070000:090000."
 const TInt KMaxMobileCountryCode( 4 );
+const TInt KCDTQueryTimer( 2000000 );           // 2 seconds
+const TInt KAppBackgroundInterval( 2000000 );   // 2 seconds
 // Literals
 _LIT( KOneSpace, " " );
 _LIT( KMobileCountryCode, "%d" );
 _LIT( KDefaultDateTimeValue, "20070000:090000." ); // YYYYMMDD:HHMMSS.
 iPSObserver = CPsKeyObserver::NewL(KPSUidStartup, KPSStartupUiPhase, EStartupUiPhaseAllDone, this);
 	iIsRTCInvalidAndHiddenReset = EFalse;
-ActivateL();
+	iPeriodic = CPeriodic::NewL( EPriorityAbsoluteHigh );
+	iNitzTimerActive = EFalse;
+	ActivateL();
 __PRINTS( "CAdtUpdaterContainer::ConstructL - Exit" );
 }
 // ---------------------------------------------------------
 		// Listener object which listens for a Nitz packet
 		iListener = CAdtUpdaterListener::NewL( this );
 		iListener->WaitForNitzInfoL();
-		// A 40 seconds call back timer.
+		// A 90 seconds call back timer.
 		TCallBack timerCallBack( CallBackL, this );
-		iPeriodic = CPeriodic::NewL( EPriorityAbsoluteHigh );
+		// Start the Nitz timer.
-		// Start the timer
 		iPeriodic->Start( KTimeout, KInterval, timerCallBack );
+		iNitzTimerActive =ETrue;
 		}
 	else if( IsFirstBoot()&& PredictiveTimeEnabled())
 		{
 		__PRINTS( "First boot, normal boot sequence" );
 		WaitToShowQueriesL();
 TInt CAdtUpdaterContainer::CallBackL( TAny* aPtr )
 	{
 	__PRINTS( "CAdtUpdaterContainer::CallBackL - Entry" );
 	CAdtUpdaterContainer* selfObject = static_cast< CAdtUpdaterContainer* >( aPtr );
-	CAdtUpdaterListener* listenerObject = selfObject->Listener();
+	if(selfObject->iNitzTimerActive)
-	// Callback after 40 seconds. If control reaches here, it means Nitz packet has
-	// not yet arrived and we can continue with normal bootup sequence.
-	// Buf before we do that, we can do a final check with the server, just to ensure
-	// there weren't any missed notifications.
-	TBool dataAvailable = listenerObject->ConfirmDataAvailabilityL();
-	if( dataAvailable )
 	    {
-	    __PRINTS( "NITZ info is available" );
+CAdtUpdaterListener* listenerObject = selfObject->Listener();
-	    // Update the status to EDataAvailable
+// Callback after 90 seconds. If control reaches here, it means Nitz packet has
-	    selfObject->iDataAvailability = EDataAvailable;
+// not yet arrived and we can continue with normal bootup sequence.
-	    // We have data from server.
+// Buf before we do that, we can do a final check with the server, just to ensure
-	    listenerObject->NitzInfoAvailableL();
+// there weren't any missed notifications.
-	    }
+TBool dataAvailable = listenerObject->ConfirmDataAvailabilityL();
-	else
+if( dataAvailable )
+{
+__PRINTS( "NITZ info is available" );
+// Update the status to EDataAvailable
+selfObject->iDataAvailability = EDataAvailable;
+// We have data from server.
+listenerObject->NitzInfoAvailableL();
+}
+else
+{
+__PRINTS( "NITZ info unavailable" );
+// Update the status to EDataNotAvailable
+selfObject->iDataAvailability = EDataNotAvailable;
+// We don't have any data for sure.
+selfObject->NitzInfoNotAvailableL();
+}
+}
+	else//CDT Query timer is active.
 	    {
-	    __PRINTS( "NITZ info unavailable" );
+if(selfObject->iAdtUpdaterAppUi->IsHighPriorityWindowActive())
+{
-	    // Update the status to EDataNotAvailable
+//If any high priority window is active, we push the CDT to background.
-	    selfObject->iDataAvailability = EDataNotAvailable;
+selfObject->iAdtUpdaterAppUi->ToggleAppViewL(EFalse);
+}
-	    // We don't have any data for sure.
+else if(selfObject->QueryDialogsInDisplay() && selfObject->iAdtUpdaterAppUi->IsAppInBackground()
-	    selfObject->NitzInfoNotAvailableL();
+&& !selfObject->iAdtUpdaterAppUi->IsHighPriorityWindowActive())
-	    }
+{
+//For every 2 sec, until ADTUpdater exits, we will check whether app is in background
+//and bring to foreground.
+selfObject->iAdtUpdaterAppUi->ToggleAppViewL(ETrue);
+}
+}
 	__PRINTS( "CAdtUpdaterContainer::CallBackL - Exit" );
 	return KZero;
 	}
 	if( iPeriodic )
 		{
 		iPeriodic->Cancel();
 		}
+	iNitzTimerActive = EFalse;
 	// Cancel the listener
 	if( iListener )
 		{
 		iListener->Cancel();
 		}
 	{
 	__PRINTS( "CAdtUpdaterContainer::ShowQueriesL - Entry" );
 iPSObserver->Cancel();
+if(iPeriodic->IsActive())
+{
+iPeriodic->Cancel();
+}
+TCallBack timerCallBack( CallBackL, this );
+// Start the CDT Query timer.
+iPeriodic->Start( KCDTQueryTimer, KAppBackgroundInterval, timerCallBack );
+iNitzTimerActive = EFalse;
 if(iIsRTCInvalidAndHiddenReset)
 {
 ShowDateAndTimeQueriesL();
 }
 else
 void CAdtUpdaterContainer::DoContinueWithNormalBootL()
 	{
 	__PRINTS( "CAdtUpdaterContainer::DoContinueWithNormalBootL - Entry" );
 	// First bring the application to the foreground.
-	iAdtUpdaterAppUi->ToggleAppViewL( ETrue );
+	if(!iAdtUpdaterAppUi->IsHighPriorityWindowActive())
+	    {
+iAdtUpdaterAppUi->ToggleAppViewL( ETrue );
+	    }
 	// Show in FSW.
 iAdtUpdaterAppUi->HideApplicationFromFSW( EFalse );
 	// Hide the status pane.
 iAdtUpdaterAppUi->HideStatusPane( ETrue );
 	// Show in FSW.
 iAdtUpdaterAppUi->HideApplicationFromFSW( EFalse );
 	// Hide the status pane.
 iAdtUpdaterAppUi->HideStatusPane( ETrue );
+iQueryDialogsInDisplay = ETrue;
 	// No first boot but RTCStatus is corrupted. Ask time and date"
 	// Showing Date query to user.
 	ShowDateQueryL();
 	// Showing Time query to user.
 	ShowTimeQueryL();
+	iQueryDialogsInDisplay = EFalse;
 	//Deactivate the plug-in as we are setting the date/time manually
 	DeActivateNitzPlugin();
 	__PRINTS( "CAdtUpdaterContainer::DoContinueWithRTCInvalidAndHiddenReset - Exit" );
 	}

branch	RCL_3
changeset 78	356f28cd5ca0
parent 66	bd7edf625bdd
child 86	ed599363c2d7