equal
deleted
inserted
replaced
41 #include "mpmdisconnectdlg.h" |
41 #include "mpmdisconnectdlg.h" |
42 #include "mpmconfirmdlgstarting.h" |
42 #include "mpmconfirmdlgstarting.h" |
43 #include "mpmconfirmdlgroaming.h" |
43 #include "mpmconfirmdlgroaming.h" |
44 #include "mpmlogger.h" |
44 #include "mpmlogger.h" |
45 #include "mpmpropertydef.h" |
45 #include "mpmpropertydef.h" |
46 #include "mpmdefaultconnection.h" |
|
47 #include "mpmiapselection.h" |
46 #include "mpmiapselection.h" |
48 #include "mpmcsidwatcher.h" |
47 #include "mpmcsidwatcher.h" |
49 |
48 |
50 // ============================ MEMBER FUNCTIONS =============================== |
49 // ============================ MEMBER FUNCTIONS =============================== |
51 |
50 |
433 iMyServer.ConnUiUtils() ); |
432 iMyServer.ConnUiUtils() ); |
434 } |
433 } |
435 |
434 |
436 MPMLOGSTRING3( "CMPMServerSession::HandleServerChooseIapL - iap %d \ |
435 MPMLOGSTRING3( "CMPMServerSession::HandleServerChooseIapL - iap %d \ |
437 connType %d", mpmConnPref.IapId(), mpmConnPref.ConnType() ) |
436 connType %d", mpmConnPref.IapId(), mpmConnPref.ConnType() ) |
438 |
437 |
439 iIapSelection->ChooseIapL( mpmConnPref ); |
438 iIapSelection->ChooseIapL( mpmConnPref ); |
440 |
439 |
441 if ( iAppUid == iMyServer.CsIdWatcher()->ConnectScreenId() ) |
440 if ( iAppUid == iMyServer.CsIdWatcher()->ConnectScreenId() ) |
442 { |
441 { |
443 MPMLOGSTRING( "CMPMServerSession::HandleServerChooseIapL -\ |
442 MPMLOGSTRING( "CMPMServerSession::HandleServerChooseIapL -\ |
961 MPMLOGSTRING2( "CMPMServerSession<0x%x>::MigrateCallbackL: State user confirmation", |
960 MPMLOGSTRING2( "CMPMServerSession<0x%x>::MigrateCallbackL: State user confirmation", |
962 iConnId ) |
961 iConnId ) |
963 if( aError == KErrNone ) |
962 if( aError == KErrNone ) |
964 { |
963 { |
965 iMigrateState = EMigrateOfflineConfirmation; |
964 iMigrateState = EMigrateOfflineConfirmation; |
966 if( IapSelectionL()->StartWlanQueryIfNeededL( iMigrateIap, ETrue ) ) |
|
967 { |
|
968 return; |
|
969 } |
|
970 } |
965 } |
971 } |
966 } |
972 else if( iMigrateState == EMigrateOfflineConfirmation ) |
967 else if( iMigrateState == EMigrateOfflineConfirmation ) |
973 { |
968 { |
974 MPMLOGSTRING3( "CMPMServerSession<0x%x>::MigrateCallbackL: State offline confirmation error: %d", |
969 MPMLOGSTRING3( "CMPMServerSession<0x%x>::MigrateCallbackL: State offline confirmation error: %d", |
3312 } |
3307 } |
3313 |
3308 |
3314 // Show error popup if it's allowed per client request |
3309 // Show error popup if it's allowed per client request |
3315 if ( ChooseBestIapCalled() && (!( iIapSelection->MpmConnPref().NoteBehaviour() & |
3310 if ( ChooseBestIapCalled() && (!( iIapSelection->MpmConnPref().NoteBehaviour() & |
3316 TExtendedConnPref::ENoteBehaviourConnDisableNotes )) |
3311 TExtendedConnPref::ENoteBehaviourConnDisableNotes )) |
3317 && ( aError != KErrNone ) ) |
3312 && ( aError != KErrNone ) |
|
3313 && ( iIapSelection->MpmConnPref().SnapId() == 0 ) ) |
3318 { |
3314 { |
3319 // Note: Below function shows the discreet popup only if the error code |
3315 // Note: Below function shows the discreet popup only if the error code |
3320 // belongs to the set of errors that are shown to the user. |
3316 // belongs to the set of errors that are shown to the user. |
3321 // Otherwise the popup is not shown. |
3317 // Otherwise the popup is not shown. |
3322 iMyServer.ConnUiUtils()->ConnectionErrorDiscreetPopup( aError ); |
3318 iMyServer.ConnUiUtils()->ConnectionErrorDiscreetPopup( aError ); |