162 iPgNotFound( EFalse ), |
162 iPgNotFound( EFalse ), |
163 iOverriddenLaunchContextId( EBrowserContextIdNormal ), |
163 iOverriddenLaunchContextId( EBrowserContextIdNormal ), |
164 iBrowserAlreadyRunning (EFalse), |
164 iBrowserAlreadyRunning (EFalse), |
165 iSameWinApp( EFalse ), |
165 iSameWinApp( EFalse ), |
166 iFeedsClientUtilities( 0 ) |
166 iFeedsClientUtilities( 0 ) |
|
167 #ifdef BRDO_OCC_ENABLED_FF |
|
168 , |
|
169 iNewConnFlag( EFalse ) |
|
170 #endif |
167 { |
171 { |
168 iViewToBeActivatedIfNeeded.iUid = 0; |
172 iViewToBeActivatedIfNeeded.iUid = 0; |
169 iViewToReturnOnClose.iUid = 0; |
173 iViewToReturnOnClose.iUid = 0; |
170 } |
174 } |
171 |
175 |
2728 return buf; |
2733 return buf; |
2729 } |
2734 } |
2730 |
2735 |
2731 #ifdef BRDO_OCC_ENABLED_FF |
2736 #ifdef BRDO_OCC_ENABLED_FF |
2732 // ----------------------------------------------------------------------------- |
2737 // ----------------------------------------------------------------------------- |
|
2738 // CBrowserContentView::SetNewConnFlag |
|
2739 // ----------------------------------------------------------------------------- |
|
2740 // |
|
2741 void CBrowserAppUi::SetNewConnFlag(TBool flag) |
|
2742 { |
|
2743 LOG_ENTERFN("CBrowserAppUi::SetNewConnFlag"); |
|
2744 iNewConnFlag = flag; |
|
2745 } |
|
2746 |
|
2747 // ----------------------------------------------------------------------------- |
|
2748 // CBrowserContentView::GetNewConnFlag |
|
2749 // ----------------------------------------------------------------------------- |
|
2750 // |
|
2751 TBool CBrowserAppUi::GetNewConnFlag() |
|
2752 { |
|
2753 LOG_ENTERFN("CBrowserAppUi::GetNewConnFlag"); |
|
2754 return iNewConnFlag; |
|
2755 } |
|
2756 // ----------------------------------------------------------------------------- |
2733 // CBrowserContentView::SetRetryFlag |
2757 // CBrowserContentView::SetRetryFlag |
2734 // ----------------------------------------------------------------------------- |
2758 // ----------------------------------------------------------------------------- |
2735 // |
2759 // |
2736 void CBrowserAppUi::SetRetryFlag(TBool flag) |
2760 void CBrowserAppUi::SetRetryFlag(TBool flag) |
2737 { |
2761 { |
2785 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection Connection restablished successfully " ) ) ); |
2809 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection Connection restablished successfully " ) ) ); |
2786 |
2810 |
2787 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection UNSET retry flags " ) ) ); |
2811 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection UNSET retry flags " ) ) ); |
2788 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandUnSetRetryConnectivityFlag + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
2812 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandUnSetRetryConnectivityFlag + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
2789 SetRetryFlag(EFalse); |
2813 SetRetryFlag(EFalse); |
2790 |
2814 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection Setting new conn flag " ) ) ); |
2791 TRAP_IGNORE(ConnNeededStatusL(err)); //Start the observer again |
2815 TRAP_IGNORE(ConnNeededStatusL(err)); //Start the observer again |
2792 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandRetryTransactions + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
2816 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandRetryTransactions + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
2793 //Let download manager knows about this new connection |
2817 //Let download manager knows about this new connection |
2794 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandConnToDownloadManager + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
2818 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandConnToDownloadManager + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
|
2819 SetNewConnFlag(ETrue); |
2795 } |
2820 } |
2796 else |
2821 else |
2797 { |
2822 { |
2798 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection Connection failed " ) ) ); |
2823 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection Connection failed " ) ) ); |
2799 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection unset retry flags " ) ) ); |
2824 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection unset retry flags " ) ) ); |
2800 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandUnSetRetryConnectivityFlag + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
2825 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandUnSetRetryConnectivityFlag + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
2801 SetRetryFlag(EFalse); |
2826 SetRetryFlag(EFalse); |
2802 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection clear queued transactions " ) ) ); |
2827 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection clear queued transactions " ) ) ); |
2803 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandClearQuedTransactions + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
|
2804 Display().StopProgressAnimationL(); //Stop Progress animation |
2828 Display().StopProgressAnimationL(); //Stop Progress animation |
2805 if ( Fetching() ) |
2829 if ( Fetching() ) |
2806 { |
2830 { |
2807 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection cancel fetch " ) ) ); |
2831 BROWSER_LOG( ( _L( "CBrowserAppUi::RetryInternetConnection cancel fetch " ) ) ); |
2808 CancelFetch(); |
2832 CancelFetch(); |
2809 } |
2833 } |
2810 iDialogsProvider->UploadProgressNoteL(0, 0, ETrue, (MBrowserDialogsProviderObserver *)this ); //Close the uploading dialog. |
2834 iDialogsProvider->UploadProgressNoteL(0, 0, ETrue, (MBrowserDialogsProviderObserver *)this ); //Close the uploading dialog. |
2811 iDialogsProvider->CancelAll(); //connection has been lost, so cancel the authentication dialog. |
2835 iDialogsProvider->CancelAll(); //connection has been lost, so cancel the authentication dialog. |
|
2836 TRAP_IGNORE( BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandClearQuedTransactions + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
2812 } |
2837 } |
2813 |
2838 |
2814 return err; |
2839 return err; |
2815 } |
2840 } |
2816 |
2841 |