equal
deleted
inserted
replaced
19 */ |
19 */ |
20 |
20 |
21 #include <nifman.h> |
21 #include <nifman.h> |
22 #include <nifvar.h> |
22 #include <nifvar.h> |
23 #include <in_sock.h> |
23 #include <in_sock.h> |
24 |
24 #include <browser_platform_variant.hrh> |
25 #include <connectionobservers.h> |
25 #include <connectionobservers.h> |
26 #include "ConnectionManagerLogger.h" |
26 #include "ConnectionManagerLogger.h" |
27 |
27 |
28 //-------------------------------------------------------------------------- |
28 //-------------------------------------------------------------------------- |
29 //CConnectionStageNotifierWCB::NewL() |
29 //CConnectionStageNotifierWCB::NewL() |
108 CLOG_WRITE_1( "CConnectionStageNotifierWCB Stage: %d", iProgressBuf().iStage ); |
108 CLOG_WRITE_1( "CConnectionStageNotifierWCB Stage: %d", iProgressBuf().iStage ); |
109 CLOG_WRITE_1( "CConnectionStageNotifierWCB Stage Error id: %d", iProgressBuf().iError ); |
109 CLOG_WRITE_1( "CConnectionStageNotifierWCB Stage Error id: %d", iProgressBuf().iError ); |
110 |
110 |
111 if( !iMultiObserver ) |
111 if( !iMultiObserver ) |
112 { |
112 { |
113 if ( iProgressBuf().iStage == iStageToObserve ) |
113 CLOG_WRITE( "CConnectionStageNotifierWCB Browser UI" ); |
|
114 #ifdef BRDO_OCC_ENABLED_FF //This is only for emulator testing. It should be #ifdef |
|
115 if ( iProgressBuf().iStage == iStageToObserve && (iProgressBuf().iError == KErrDisconnected || iProgressBuf().iError == KErrTimedOut) ) |
|
116 #else |
|
117 if ( iProgressBuf().iStage == iStageToObserve ) |
|
118 #endif |
114 { |
119 { |
115 CLOG_WRITE( "Stage achived" ); |
120 CLOG_WRITE( "Stage achived" ); |
116 DoCloseAgent(); |
121 DoCloseAgent(); |
117 iObserver->ConnectionStageAchievedL(); |
122 iObserver->ConnectionStageAchievedL(); |
118 } |
123 } |
123 SetActive(); |
128 SetActive(); |
124 } |
129 } |
125 } |
130 } |
126 else |
131 else |
127 { |
132 { |
|
133 CLOG_WRITE( "CConnectionStageNotifierWCB Connection Manager" ); |
128 if( IsAnyStageReached( iProgressBuf().iStage ) ) |
134 if( IsAnyStageReached( iProgressBuf().iStage ) ) |
129 { |
135 { |
130 iMultiObserver->ConnectionStageAchievedL( iProgressBuf().iStage ); |
136 iMultiObserver->ConnectionStageAchievedL( iProgressBuf().iStage ); |
131 } |
137 } |
132 else{ |
138 else{ |