--- a/browserui/browser/BrowserAppInc/BrowserAppUi.h Wed Sep 01 12:31:04 2010 +0100
+++ b/browserui/browser/BrowserAppInc/BrowserAppUi.h Wed Oct 13 14:35:16 2010 +0300
@@ -741,6 +741,8 @@
//Retry flags
void SetRetryFlag(TBool flag);
TBool GetRetryFlag();
+ void SetNewConnFlag(TBool flag);
+ TBool GetNewConnFlag();
#endif
private:
@@ -1106,6 +1108,8 @@
#ifdef BRDO_OCC_ENABLED_FF
CPeriodic *iRetryConnectivity;
TBool reConnectivityFlag;
+ //Required for setting new conn flag in Special load observer when ap roaming happens
+ TBool iNewConnFlag;
#endif
#ifdef BRDO_IAD_UPDATE_ENABLED_FF
--- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Wed Sep 01 12:31:04 2010 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Wed Oct 13 14:35:16 2010 +0300
@@ -164,6 +164,10 @@
iBrowserAlreadyRunning (EFalse),
iSameWinApp( EFalse ),
iFeedsClientUtilities( 0 )
+#ifdef BRDO_OCC_ENABLED_FF
+ ,
+ iNewConnFlag( EFalse )
+#endif
{
iViewToBeActivatedIfNeeded.iUid = 0;
iViewToReturnOnClose.iUid = 0;
@@ -285,6 +289,7 @@
#ifdef BRDO_SINGLE_CLICK_ENABLED_FF
+ EnableLocalScreenClearer( EFalse );
BaseConstructL( EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible);
#else
BaseConstructL( EAknEnableSkin | EAknEnableMSK );
@@ -2576,8 +2581,8 @@
{
SetCalledFromAnotherApp( EFalse );
iIsForeground = IsForeground();
+ GetBookmarksView()->SetCurrentFolderId(dataId);
CloseContentViewL();
- SetLastActiveViewId( KUidBrowserBookmarksViewId );
break;
}
default:
@@ -2730,6 +2735,25 @@
#ifdef BRDO_OCC_ENABLED_FF
// -----------------------------------------------------------------------------
+// CBrowserContentView::SetNewConnFlag
+// -----------------------------------------------------------------------------
+//
+void CBrowserAppUi::SetNewConnFlag(TBool flag)
+ {
+ LOG_ENTERFN("CBrowserAppUi::SetNewConnFlag");
+ iNewConnFlag = flag;
+ }
+
+// -----------------------------------------------------------------------------
+// CBrowserContentView::GetNewConnFlag
+// -----------------------------------------------------------------------------
+//
+TBool CBrowserAppUi::GetNewConnFlag()
+ {
+ LOG_ENTERFN("CBrowserAppUi::GetNewConnFlag");
+ return iNewConnFlag;
+ }
+// -----------------------------------------------------------------------------
// CBrowserContentView::SetRetryFlag
// -----------------------------------------------------------------------------
//
@@ -2787,11 +2811,12 @@
BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection UNSET retry flags " ) ) );
TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandUnSetRetryConnectivityFlag + (TInt)TBrCtlDefs::ECommandIdBase ) );
SetRetryFlag(EFalse);
-
+ BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection Setting new conn flag " ) ) );
TRAP_IGNORE(ConnNeededStatusL(err)); //Start the observer again
TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandRetryTransactions + (TInt)TBrCtlDefs::ECommandIdBase ) );
//Let download manager knows about this new connection
TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandConnToDownloadManager + (TInt)TBrCtlDefs::ECommandIdBase ) );
+ SetNewConnFlag(ETrue);
}
else
{
@@ -2800,7 +2825,6 @@
TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandUnSetRetryConnectivityFlag + (TInt)TBrCtlDefs::ECommandIdBase ) );
SetRetryFlag(EFalse);
BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection clear queued transactions " ) ) );
- TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandClearQuedTransactions + (TInt)TBrCtlDefs::ECommandIdBase ) );
Display().StopProgressAnimationL(); //Stop Progress animation
if ( Fetching() )
{
@@ -2809,6 +2833,7 @@
}
iDialogsProvider->UploadProgressNoteL(0, 0, ETrue, (MBrowserDialogsProviderObserver *)this ); //Close the uploading dialog.
iDialogsProvider->CancelAll(); //connection has been lost, so cancel the authentication dialog.
+ TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandClearQuedTransactions + (TInt)TBrCtlDefs::ECommandIdBase ) );
}
return err;
--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Wed Sep 01 12:31:04 2010 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Wed Oct 13 14:35:16 2010 +0300
@@ -1119,8 +1119,8 @@
TVwsViewId activeViewId;
if ( AppUi()->GetActiveViewId( activeViewId ) == KErrNone )
{
- Cba()->MakeVisible( ETrue );
UpdateCbaL();
+ Cba()->MakeVisible( ETrue );
if ( Layout_Meta_Data::IsLandscapeOrientation() )
StatusPane()->SwitchLayoutL(R_AVKON_STATUS_PANE_LAYOUT_USUAL);
StatusPane()->ApplyCurrentSettingsL();
--- a/browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp Wed Sep 01 12:31:04 2010 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp Wed Oct 13 14:35:16 2010 +0300
@@ -143,6 +143,15 @@
*aConnectionPtr = (TInt) &iApiProvider->Connection().Connection();
*aSockSvrHandle = iApiProvider->Connection().SocketServer().Handle();
*aNewConn = EFalse;
+#ifdef BRDO_OCC_ENABLED_FF
+ TBool newConnFlag = CBrowserAppUi::Static()->GetNewConnFlag();
+ if( newConnFlag )
+ {
+ *aNewConn = ETrue;
+ BROWSER_LOG((_L("Resetting new conn flag to false")));
+ CBrowserAppUi::Static()->SetNewConnFlag(EFalse);
+ }
+#endif
*aBearerType = iApiProvider->Connection().CurrentBearerTypeL();
}
else
--- a/browserui/browser/FavouritesInc/BrowserFavouritesView.h Wed Sep 01 12:31:04 2010 +0100
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesView.h Wed Oct 13 14:35:16 2010 +0300
@@ -233,6 +233,8 @@
inline void ShowNextFolerL(TBool aNext) { OpenNextFolderL(aNext); }
+ void SetCurrentFolderId(TInt aFolderId) { iCurrentFolder = aFolderId;}
+
protected: // component retrieval
/**
--- a/browserui/browser/FeedsSrc/FeedsTopicView.cpp Wed Sep 01 12:31:04 2010 +0100
+++ b/browserui/browser/FeedsSrc/FeedsTopicView.cpp Wed Oct 13 14:35:16 2010 +0300
@@ -202,7 +202,8 @@
}
// Set the current feed.
- iContainer->SetCurrentFeedL(*(iApiProvider.FeedsClientUtilities().CurrentFeed()), iInitialItem);
+ if(iInitialItem >= 0)
+ iContainer->SetCurrentFeedL(*(iApiProvider.FeedsClientUtilities().CurrentFeed()), iInitialItem);
iApiProvider.SetLastActiveViewId(Id());
UpdateToolbarButtonsState();
}