MCL/sf/app/webuis: comparison browserui/browser/BrowserAppSrc/BrowserAppUi.cpp

equal deleted inserted replaced

-:5a044f6358c2
+:4baee4f15982
 #ifdef BRDO_SINGLE_CLICK_ENABLED_FF
 BaseConstructL( EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible);
 #else
 BaseConstructL( EAknEnableSkin | EAknEnableMSK );
 #endif
 if ( !IsEmbeddedModeOn( ) )
 	{
+// This is for handling low phone memory (c:) condition. Just leave in case phone memory is not sufficient.
+TBool lowdisk = SysUtil::DiskSpaceBelowCriticalLevelL(&(CCoeEnv::Static()->FsSession()), KMinimumCDriveDiskSpace, EDriveC );
+if (lowdisk)   User::Leave(KErrDiskFull);
 #ifdef BRDO_PERF_IMPROVEMENTS_ENABLED_FF
 InitBookmarksL();
 #else
 InitBrowserL();
 #endif
 // -----------------------------------------------------------------------------
 //
 void CBrowserAppUi::DelayedInitL()
 {
 LOG_ENTERFN("CBrowserAppUi::DelayedInitL");
-// Check for ciritical disk space
-RFs fs;
-User::LeaveIfError(fs.Connect());
-TInt drive( EDriveC );
-TBool isSpace( EFalse );
-TInt err( KErrNone );
-TRAP( err, isSpace = !SysUtil::DiskSpaceBelowCriticalLevelL(&fs, KMinimumCDriveDiskSpace, drive ));
-fs.Close();
-if (!isSpace)  User::Leave(KErrDiskFull);
 // Create Favengine session
 User::LeaveIfError( iFavouritesSess.Connect() );
 // Init FeatureManager
 FeatureManager::InitializeLibL();
 // CBrowserAppUi::IsPageLoaded()
 // -----------------------------------------------------------------------------
 //
 TBool CBrowserAppUi::IsPageLoaded()
 {
+#ifdef BRDO_PERF_IMPROVEMENTS_ENABLED_FF
+if(!iStartedUp) // ContentView/WindowMgr is not yet up => no page loaded
+return EFalse;
+#endif
 TBool ret( EFalse );
 TInt winCount( WindowMgr().WindowCount() );
 // at least 2 window -> there is a page loaded
 if( winCount > 1 )
 {
 	// TO DO:
 	// use load obs., remove ifetchstate from this class and use from loadobs.
 	// iLoadState
 //return ( iFetchState == MFetchObserver::ELoadStart );
-	return ( LoadObserver().LoadState() != CBrowserLoadObserver::ELoadStateIdle );
+#ifdef BRDO_PERF_IMPROVEMENTS_ENABLED_FF
+if (!iStartedUp)  // ContentView is not yet started up, so we are not fetching
+return EFalse;
+else
+#endif
+return ( LoadObserver().LoadState() != CBrowserLoadObserver::ELoadStateIdle );
 }
 // -----------------------------------------------------------------------------
 // CBrowserAppUi::ContentDisplayed()
 // -----------------------------------------------------------------------------
 //
 BROWSER_LOG( ( _L(" iConnection:  %d"), iConnection ) );
 BROWSER_LOG( ( _L(" iExitFromEmbeddedMode:  %d"), iExitFromEmbeddedMode ) );
 // if browser is embedded, should not call Exit(),
 // just delete the object, otherwise leave occurs.
 if( ( IsEmbeddedInOperatorMenu() || IsEmbeddedModeOn() ) &&
-!ExitInProgress() &&
+!ExitInProgress() && iStartedUp &&
 ((LoadObserver().LoadUrlType() == CBrowserLoadObserver::ELoadUrlTypeEmbeddedBrowserWithUrl) ||
 (LoadObserver().LoadUrlType() == CBrowserLoadObserver::ELoadUrlTypeOther)   ) )
 // ELoadUrlTypeEmbeddedBrowserWithUrl is typical for load via Phonebook, MMS, OperatorMenu
 // ELoadUrlTypeOther is typical via Media download since those are via GotoPane entered urls
 {
 //notify feeds engine to close the connection
 TRAP_IGNORE( iFeedsClientUtilities->DisconnectManualUpdateConnectionL() );
 }
 #endif
 		}
-if (SpecialLoadObserver().IsConnectionStarted())
+if (iStartedUp && SpecialLoadObserver().IsConnectionStarted())
 {
-if ( iWindowManager )
-{
 BROWSER_LOG( ( _L( " iWindowManager->SetUserExit( iUserExit )" ) ) );
 iWindowManager->SetUserExit( iUserExit );
-}
 delete iWindowManager;
 BROWSER_LOG( ( _L( " User::Exit(KErrNone)" ) ) );
 User::Exit(KErrNone);
 }
 else
 		//notify feeds engine to close the connection
 			TRAP_IGNORE( iFeedsClientUtilities->DisconnectManualUpdateConnectionL() );
 }
 #endif
 		}
-	if (SpecialLoadObserver().IsConnectionStarted()) // If Connection request is in processing calling CAknAppUI::Exit() causes crash (JSAA-84RG9R)
+	if (iStartedUp && SpecialLoadObserver().IsConnectionStarted()) // If Connection request is in processing calling CAknAppUI::Exit() causes crash (JSAA-84RG9R)
 	    {
 	    //ensure that the params are saved in BrCtl
 	    if ( iWindowManager )
 	       {
 	       BROWSER_LOG( ( _L( " iWindowManager->SetUserExit( iUserExit )" ) ) );
 LOG_WRITE_FORMAT(" aCommand: %d", aCommand);
 // The browser is in embedded mode and it is not initialized yet
 if ( IsEmbeddedModeOn() && !iStartedUp)
 	{
+EnableLocalScreenClearer( EFalse );
 	return EFalse;
 	}
 if ( aCommand == EApaCommandOpen )
 {
 	    else if ( iPreferences->SearchFeature() || iPreferences->ServiceFeature())
 	        {
 	        HBufC* buf = HBufC::NewLC( KMaxHomePgUrlLength );  // cleanupstack
 	        TPtr ptr( buf->Des() );
+	        TInt pgFound( KErrNotFound );
+				pgFound = Preferences().HomePageUrlL( ptr );
 			HBufC* searchScheme = HBufC::NewLC( KMaxHomePgUrlLength );  // cleanupstack
 			TPtr searchSchemePtr( searchScheme->Des() );
 			HBufC* serviceScheme = HBufC::NewLC( KMaxHomePgUrlLength );  // cleanupstack
 			TPtr serviceSchemePtr( serviceScheme->Des() );
 FetchHomePageL();
 }
 else
 {
 if (iStartedUp)
 ContentView()->SetFullScreenOffL();
 if ( !IsEmbeddedModeOn() )
 {
 SetLastActiveViewId( KUidBrowserBookmarksViewId );
 }
 SetLastActiveViewId( KUidBrowserContentViewId );
 }
 }
 else
 {
 // Cancel history view, mini map, toolbar or any other active control on the current window
-BrCtlInterface().HandleCommandL( TBrCtlDefs::ECommandCancel + TBrCtlDefs::ECommandIdBase );
+if (iStartedUp)
+BrCtlInterface().HandleCommandL( TBrCtlDefs::ECommandCancel + TBrCtlDefs::ECommandIdBase );
 TRAP( err, FetchL(  *url,
 KNullDesC,
 KNullDesC,
 accessPoint,
 urlType ) );
 CleanupStack::Pop();  // win
 }
 }
 else
 {
 // Cancel history view, mini map, toolbar or any other active control on the current window
-BrCtlInterface().HandleCommandL( TBrCtlDefs::ECommandCancel + TBrCtlDefs::ECommandIdBase );
+if (iStartedUp)
+BrCtlInterface().HandleCommandL( TBrCtlDefs::ECommandCancel + TBrCtlDefs::ECommandIdBase );
 TRAP( err, FetchL(  *url,
 KNullDesC,
 KNullDesC,
 accessPoint,
 urlType ) );
 	                                CleanupStack::Pop();  // win
 	                                }
 	                                }
 	                            else
 	                            	{
 	                            // Cancel history view, mini map, toolbar or any other active control on the current window
-	                                BrCtlInterface().HandleCommandL( TBrCtlDefs::ECommandCancel + TBrCtlDefs::ECommandIdBase );
+if (iStartedUp)
+BrCtlInterface().HandleCommandL( TBrCtlDefs::ECommandCancel + TBrCtlDefs::ECommandIdBase );
 	                            	TRAP( err, FetchBookmarkL( dataId ) );
 	                            	}
 if ( err )
 {
 // CBrowserAppUi::ClearHistoryL
 // ---------------------------------------------------------
 //
 void CBrowserAppUi::ClearHistoryL()
 {
-	if (iWindowManager)
+if (iWindowManager)
 {
 iWindowManager->SendCommandToAllWindowsL(
 (TInt)TBrCtlDefs::ECommandClearHistory + (TInt)TBrCtlDefs::ECommandIdBase);
-}
-else
-{
-BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandClearHistory +
-(TInt)TBrCtlDefs::ECommandIdBase );
 }
 if (!(Preferences().AdaptiveBookmarks()==EWmlSettingsAdaptiveBookmarksOff ))
 {
 // This call will ensure that the bookmarks are cleared when we are
 		{
 		ExitBrowser(ETrue);
 		}
 	else
 		{
-if ( ContentView()->GetPreviousViewID() == KUidBrowserBookmarksViewId )
+if ( iStartedUp && ContentView()->GetPreviousViewID() == KUidBrowserBookmarksViewId )
 {
 if ( GetBookmarksView()->GetAdaptiveBookmarksFolderWasActive() )
 {
 GetBookmarksView()->OpenAdaptiveBookmarksWhenActivated();
 }
 // --------------------------------------------------------------------------
 //
 void CBrowserAppUi::FetchHomePageL()
 {
 LOG_ENTERFN( "CBrowserAppUi::FetchHomePageL" );
+if(!iStartedUp) // just in case, not done
+CompleteDelayedInit();
 if ( !Fetching() )
 {
 UpdateSoftKeys();
 // If the last active view is content view, return to the bookmark view on close.

branch	RCL_3
changeset 46	4baee4f15982
parent 45	5a044f6358c2