equal
deleted
inserted
replaced
123 __ASSERT_DEBUG( (aConnectionPtr != NULL), Util::Panic( Util::EUninitializedData ) ); |
123 __ASSERT_DEBUG( (aConnectionPtr != NULL), Util::Panic( Util::EUninitializedData ) ); |
124 __ASSERT_DEBUG( (aSockSvrHandle != NULL), Util::Panic( Util::EUninitializedData ) ); |
124 __ASSERT_DEBUG( (aSockSvrHandle != NULL), Util::Panic( Util::EUninitializedData ) ); |
125 __ASSERT_DEBUG( (aNewConn != NULL), Util::Panic( Util::EUninitializedData ) ); |
125 __ASSERT_DEBUG( (aNewConn != NULL), Util::Panic( Util::EUninitializedData ) ); |
126 __ASSERT_DEBUG( (aBearerType != NULL), Util::Panic( Util::EUninitializedData ) ); |
126 __ASSERT_DEBUG( (aBearerType != NULL), Util::Panic( Util::EUninitializedData ) ); |
127 |
127 |
|
128 #ifdef BRDO_OCC_ENABLED_FF |
|
129 TBool retryFlag = CBrowserAppUi::Static()->GetRetryFlag(); |
|
130 if( retryFlag ) |
|
131 { |
|
132 BROWSER_LOG((_L("Retry is in progress"))); |
|
133 return; |
|
134 } |
|
135 #endif |
|
136 |
128 iApiProvider->SetProgressShown( ETrue ); |
137 iApiProvider->SetProgressShown( ETrue ); |
129 TBool query( EFalse ); |
138 TBool query( EFalse ); |
130 if( iApiProvider->Connection().Connected() ) |
139 if( iApiProvider->Connection().Connected() ) |
131 { |
140 { |
132 TInt a( iWindow->WindowId() ); |
141 TInt a( iWindow->WindowId() ); |
141 BROWSER_LOG((_L("not connected."))); |
150 BROWSER_LOG((_L("not connected."))); |
142 *aNewConn = ETrue; |
151 *aNewConn = ETrue; |
143 TBool isValid( EFalse ); |
152 TBool isValid( EFalse ); |
144 TUint32 ap( 0 ); |
153 TUint32 ap( 0 ); |
145 TInt err( KErrNone ); |
154 TInt err( KErrNone ); |
146 #ifndef BRDO_OCC_ENABLED_FF |
155 |
147 BROWSER_LOG((_L("AP selectionMode: %d."), |
156 BROWSER_LOG((_L("AP selectionMode: %d."), |
148 iApiProvider->Preferences().AccessPointSelectionMode() )); |
157 iApiProvider->Preferences().AccessPointSelectionMode() )); |
149 |
158 |
150 //determine the type of connection |
159 //determine the type of connection |
151 switch (iApiProvider->Preferences().AccessPointSelectionMode() ) |
160 switch (iApiProvider->Preferences().AccessPointSelectionMode() ) |
257 default: |
266 default: |
258 { |
267 { |
259 BROWSER_LOG((_L("wrong type of connection"))); |
268 BROWSER_LOG((_L("wrong type of connection"))); |
260 } |
269 } |
261 } //switch |
270 } //switch |
262 #else //BRDO_OCC_ENABLED_FF |
271 |
263 isValid = ETrue; |
|
264 #endif //BRDO_OCC_ENABLED_FF |
|
265 BROWSER_LOG((_L("isValid 2: %d"), isValid)); |
272 BROWSER_LOG((_L("isValid 2: %d"), isValid)); |
266 if( isValid ) |
273 if( isValid ) |
267 { |
274 { |
268 iConnectionCancelled = EFalse; |
275 iConnectionCancelled = EFalse; |
269 if( !iApiProvider->Connection().Connected() ) |
276 if( !iApiProvider->Connection().Connected() ) |